Extend test suite and fix named exports

[nbd.git] / nbd-server.c

diff --git a/nbd-server.c b/nbd-server.c
index 4064196..844e416 100644 (file)
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -515,6 +515,8 @@ SERVER* cmdline(int argc, char *argv[]) {
        if(nonspecial<2) {
                g_free(serve);
                serve=NULL;
+       } else {
+               do_oldstyle = TRUE;
        }
        if(do_output) {
                if(!serve) {
@@ -832,6 +834,10 @@ GArray* parse_cfile(gchar* f, GError** e) {
                                g_key_file_free(cfile);
                                return NULL;
                        }
+                       if(s.port && !do_oldstyle) {
+                               g_warning("A port was specified, but oldstyle exports were not requested. This may not do what you expect.");
+                               g_warning("Please read 'man 5 nbd-server' and search for oldstyle for more info");
+                       }
                } else {
                        s.virtstyle=VIRT_IPLIT;
                }
@@ -1226,12 +1232,19 @@ CLIENT* negotiate(int net, CLIENT *client, GArray* servers) {
 
        memset(zeros, '\0', sizeof(zeros));
        if(!client || !client->modern) {
+               /* common */
                if (write(net, INIT_PASSWD, 8) < 0) {
                        err_nonfatal("Negotiation failed: %m");
                        if(client)
                                exit(EXIT_FAILURE);
                }
-               magic = htonll(opts_magic);
+               if(!client || client->modern) {
+                       /* modern */
+                       magic = htonll(opts_magic);
+               } else {
+                       /* oldstyle */
+                       magic = htonll(cliserv_magic);
+               }
                if (write(net, &magic, sizeof(magic)) < 0) {
                        err_nonfatal("Negotiation failed: %m");
                        if(client)
@@ -1239,9 +1252,10 @@ CLIENT* negotiate(int net, CLIENT *client, GArray* servers) {
                }
        }
        if(!client) {
-               uint64_t reserved;
+               /* modern */
+               uint32_t reserved;
                uint32_t opt;
-               uint64_t namelen;
+               uint32_t namelen;
                char* name;
                int i;
 
@@ -1251,7 +1265,7 @@ CLIENT* negotiate(int net, CLIENT *client, GArray* servers) {
                read(net, &reserved, sizeof(reserved));
                read(net, &magic, sizeof(magic));
                magic = ntohll(magic);
-               if(magic != cliserv_magic) {
+               if(magic != opts_magic) {
                        close(net);
                        return NULL;
                }
@@ -1262,9 +1276,9 @@ CLIENT* negotiate(int net, CLIENT *client, GArray* servers) {
                        return NULL;
                }
                read(net, &namelen, sizeof(namelen));
-               namelen = ntohll(namelen);
+               namelen = ntohl(namelen);
                name = malloc(namelen+1);
-               name[namelen+1]=0;
+               name[namelen]=0;
                read(net, name, namelen);
                for(i=0; i<servers->len; i++) {
                        SERVER* serve = &(g_array_index(servers, SERVER, i));
@@ -1277,23 +1291,28 @@ CLIENT* negotiate(int net, CLIENT *client, GArray* servers) {
                                return client;
                        }
                }
+               return NULL;
        }
+       /* common */
        size_host = htonll((u64)(client->exportsize));
        if (write(net, &size_host, 8) < 0)
                err("Negotiation failed: %m");
        if (client->server->flags & F_READONLY)
                flags |= NBD_FLAG_READ_ONLY;
        if (!client->modern) {
+               /* oldstyle */
                flags = htonl(flags);
                if (write(client->net, &flags, 4) < 0)
                        err("Negotiation failed: %m");
        } else {
+               /* modern */
                smallflags = (uint16_t)(flags & ~((uint16_t)0));
                smallflags = htons(smallflags);
                if (write(client->net, &smallflags, sizeof(smallflags)) < 0) {
                        err("Negotiation failed: %m");
                }
        }
+       /* common */
        if (write(client->net, zeros, 124) < 0)
                err("Negotiation failed: %m");
        return NULL;
@@ -1697,6 +1716,7 @@ int serveloop(GArray* servers) {
                                if(!client) {
                                        err_nonfatal("negotiation failed");
                                        close(net);
+                                       net=0;
                                }
                        }
                        for(i=0;i<servers->len && !net;i++) {