projects
/
nbd.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
076010d
)
Fix a host/network order bug
author
Wouter Verhelst <w@uter.be>
Tue, 27 Jul 2010 18:52:15 +0000
(14:52 -0400)
committer
Wouter Verhelst <w@uter.be>
Tue, 27 Jul 2010 18:52:15 +0000
(14:52 -0400)
nbd-server.c
patch
|
blob
|
history
diff --git
a/nbd-server.c
b/nbd-server.c
index
1b665b9
..
4064196
100644
(file)
--- a/
nbd-server.c
+++ b/
nbd-server.c
@@
-1284,11
+1284,12
@@
CLIENT* negotiate(int net, CLIENT *client, GArray* servers) {
if (client->server->flags & F_READONLY)
flags |= NBD_FLAG_READ_ONLY;
if (!client->modern) {
if (client->server->flags & F_READONLY)
flags |= NBD_FLAG_READ_ONLY;
if (!client->modern) {
- flags = htonl(flags);
+ flags = htonl(flags);
if (write(client->net, &flags, 4) < 0)
err("Negotiation failed: %m");
} else {
smallflags = (uint16_t)(flags & ~((uint16_t)0));
if (write(client->net, &flags, 4) < 0)
err("Negotiation failed: %m");
} else {
smallflags = (uint16_t)(flags & ~((uint16_t)0));
+ smallflags = htons(smallflags);
if (write(client->net, &smallflags, sizeof(smallflags)) < 0) {
err("Negotiation failed: %m");
}
if (write(client->net, &smallflags, sizeof(smallflags)) < 0) {
err("Negotiation failed: %m");
}