bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to use nbd_r2h_reply in read_reply()

Browse Source 
Use a wrapper function to simplify the reply field reading.
This commit is contained in:
Alex Young
2012-07-13 12:13:55 +01:00
parent 40101e49f3
commit 9f4da5def0
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/readwrite.c
View File

@@ -68,14 +68,18 @@ void fill_request(struct nbd_request *request, int type, off64_t from, int len)
void read_reply(int fd, struct nbd_request *request, struct nbd_reply *reply) void read_reply(int fd, struct nbd_request *request, struct nbd_reply *reply)
{ {
ERROR_IF_NEGATIVE(readloop(fd, reply, sizeof(*reply)), struct nbd_reply_raw reply_raw;
ERROR_IF_NEGATIVE(readloop(fd, &reply_raw, sizeof(struct nbd_reply_raw)),
"Couldn't read reply"); "Couldn't read reply");
if (be32toh(reply->magic) != REPLY_MAGIC) { nbd_r2h_reply( &reply_raw, reply );
error("Reply magic incorrect (%p)", be32toh(reply->magic));
if (reply->magic != REPLY_MAGIC) {
error("Reply magic incorrect (%x)", reply->magic);
} }
if (be32toh(reply->error) != 0) { if (reply->error != 0) {
error("Server replied with error %d", be32toh(reply->error)); error("Server replied with error %d", reply->error);
} }
if (strncmp(request->handle, reply->handle, 8) != 0) { if (strncmp(request->handle, reply->handle, 8) != 0) {
error("Did not reply with correct handle"); error("Did not reply with correct handle");