lesderid
/
buse
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added some error handling.

This commit is contained in:
comatose 2012-12-02 01:08:13 +09:00
parent 44b2f13ad4
commit 408c99ba0b
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
buse.c
View File

@ -31,14 +31,14 @@ u_int64_t ntohll(u_int64_t a) {
#endif #endif
#define htonll ntohll #define htonll ntohll
static int read_all(int fd, void *buf, size_t count) static int read_all(int fd, char* buf, size_t count)
{ {
int bytes_read; int bytes_read;
while (count > 0) { while (count > 0) {
bytes_read = read(fd, buf, count); bytes_read = read(fd, buf, count);
assert(bytes_read > 0); assert(bytes_read > 0);
buf = (char *)buf + bytes_read; buf += bytes_read;
count -= bytes_read; count -= bytes_read;
} }
assert(count == 0); assert(count == 0);
@ -46,14 +46,14 @@ static int read_all(int fd, void *buf, size_t count)
return 0; return 0;
} }
static int write_all(int fd, const void *buf, size_t count) static int write_all(int fd, char* buf, size_t count)
{ {
int bytes_written; int bytes_written;
while (count > 0) { while (count > 0) {
bytes_written = write(fd, buf, count); bytes_written = write(fd, buf, count);
assert(bytes_written > 0); assert(bytes_written > 0);
buf = (char *)buf + bytes_written; buf += bytes_written;
count -= bytes_written; count -= bytes_written;
} }
assert(count == 0); assert(count == 0);
@ -71,7 +71,7 @@ int buse_main(int argc, char *argv[], const struct buse_operations *aop, void *u
char *dev_file; char *dev_file;
struct nbd_request request; struct nbd_request request;
struct nbd_reply reply; struct nbd_reply reply;
void *chunk; char *chunk;
(void) userdata; (void) userdata;
@ -104,8 +104,8 @@ int buse_main(int argc, char *argv[], const struct buse_operations *aop, void *u
fprintf(stderr, "%s\n", strerror(errno)); fprintf(stderr, "%s\n", strerror(errno));
} }
assert(ioctl(nbd, NBD_CLEAR_QUE) != -1); ioctl(nbd, NBD_CLEAR_QUE);
assert(ioctl(nbd, NBD_CLEAR_SOCK) != -1); ioctl(nbd, NBD_CLEAR_SOCK);
exit(0); exit(0);
} }
@ -141,29 +141,31 @@ int buse_main(int argc, char *argv[], const struct buse_operations *aop, void *u
case NBD_CMD_READ: case NBD_CMD_READ:
/* fprintf(stderr, "Request for read of size %d\n", len); */ /* fprintf(stderr, "Request for read of size %d\n", len); */
chunk = malloc(len + sizeof(struct nbd_reply)); chunk = malloc(len + sizeof(struct nbd_reply));
aop->read((char *)chunk + sizeof(struct nbd_reply), len, from); reply.error = aop->read((char *)chunk + sizeof(struct nbd_reply), len, from);
memcpy(chunk, &reply, sizeof(struct nbd_reply)); write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
write_all(sk, chunk, len + sizeof(struct nbd_reply)); if(reply.error == 0)
write_all(sk, (char*)chunk, len);
free(chunk); free(chunk);
break; break;
case NBD_CMD_WRITE: case NBD_CMD_WRITE:
/* fprintf(stderr, "Request for write of size %d\n", len); */ /* fprintf(stderr, "Request for write of size %d\n", len); */
chunk = malloc(len); chunk = malloc(len);
read_all(sk, chunk, len); read_all(sk, chunk, len);
aop->write(chunk, len, from); reply.error = aop->write(chunk, len, from);
free(chunk); free(chunk);
write_all(sk, &reply, sizeof(struct nbd_reply)); write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
break; break;
case NBD_CMD_DISC: case NBD_CMD_DISC:
/* Handle a disconnect request. */ /* Handle a disconnect request. */
aop->disc(); aop->disc();
return 0; return 0;
case NBD_CMD_FLUSH: case NBD_CMD_FLUSH:
aop->flush(); reply.error = aop->flush();
write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
break; break;
case NBD_CMD_TRIM: case NBD_CMD_TRIM:
aop->trim(from, len); reply.error = aop->trim(from, len);
write_all(sk, &reply, sizeof(struct nbd_reply)); write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
break; break;
default: default:
assert(0); assert(0);

2
buse.h
View File

@ -61,7 +61,7 @@ struct nbd_reply {
struct buse_operations { struct buse_operations {
int (*read)(void *buf, u_int32_t len, u_int64_t offset); int (*read)(void *buf, u_int32_t len, u_int64_t offset);
int (*write)(const void *buf, u_int32_t len, u_int64_t offset); int (*write)(const void *buf, u_int32_t len, u_int64_t offset);
int (*disc)(); void (*disc)();
int (*flush)(); int (*flush)();
int (*trim)(u_int64_t from, u_int32_t len); int (*trim)(u_int64_t from, u_int32_t len);

3
busexmp.c
View File

@ -20,10 +20,9 @@ static int xmp_write(const void *buf, u_int32_t len, u_int64_t offset)
return 0; return 0;
} }
static int xmp_disc() static void xmp_disc()
{ {
fprintf(stderr, "Received a disconnect request.\n"); fprintf(stderr, "Received a disconnect request.\n");
return 0;
} }
static int xmp_flush() static int xmp_flush()