Extend test suite and fix named exports

[nbd.git] / nbd-server.c

diff --git a/nbd-server.c b/nbd-server.c
index b92170a..844e416 100644 (file)
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -109,6 +109,8 @@ gchar* config_file_pos;
 gchar* runuser=NULL;
 /** What group we're running as */
 gchar* rungroup=NULL;
+/** whether to export using the old negotiation protocol (port-based) */
+gboolean do_oldstyle=FALSE;
 
 /** Logging macros, now nothing goes to syslog unless you say ISSERVER */
 #ifdef ISSERVER
@@ -513,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) {
@@ -568,20 +572,20 @@ SERVER* dup_serve(SERVER *s) {
        SERVER *serve = NULL;
 
        serve=g_new0(SERVER, 1);
-       if (serve == NULL)
+       if(serve == NULL)
                return NULL;
 
-       if (s->exportname)
+       if(s->exportname)
                serve->exportname = g_strdup(s->exportname);
 
        serve->expected_size = s->expected_size;
 
-       if (s->listenaddr)
+       if(s->listenaddr)
                serve->listenaddr = g_strdup(s->listenaddr);
 
        serve->port = s->port;
 
-       if (s->authname)
+       if(s->authname)
                serve->authname = strdup(s->authname);
 
        serve->flags = s->flags;
@@ -589,11 +593,14 @@ SERVER* dup_serve(SERVER *s) {
        serve->socket_family = serve->socket_family;
        serve->cidrlen = s->cidrlen;
 
-       if (s->prerun)
+       if(s->prerun)
                serve->prerun = g_strdup(s->prerun);
 
-       if (s->postrun)
+       if(s->postrun)
                serve->postrun = g_strdup(s->postrun);
+       
+       if(s->servename)
+               serve->servename = g_strdup(s->servename);
 
        return serve;
 }
@@ -696,7 +703,6 @@ GArray* parse_cfile(gchar* f, GError** e) {
                { "listenaddr", FALSE,  PARAM_STRING,   NULL, 0 },
        };
        const int lp_size=sizeof(lp)/sizeof(PARAM);
-       int do_oldstyle;
        PARAM gp[] = {
                { "user",       FALSE, PARAM_STRING,    &runuser,       0 },
                { "group",      FALSE, PARAM_STRING,    &rungroup,      0 },
@@ -828,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;
                }
@@ -1222,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)
@@ -1235,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;
 
@@ -1247,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;
                }
@@ -1258,10 +1276,10 @@ 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;
-               read(net, &name, namelen);
+               name[namelen]=0;
+               read(net, name, namelen);
                for(i=0; i<servers->len; i++) {
                        SERVER* serve = &(g_array_index(servers, SERVER, i));
                        if(!strcmp(serve->servename, name)) {
@@ -1273,15 +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;
-       flags = htonl(flags);
-       if (write(client->net, &flags, 4) < 0)
-               err("Negotiation failed: %m");
+       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;
@@ -1659,13 +1690,14 @@ int serveloop(GArray* servers) {
        max=0;
        FD_ZERO(&mset);
        for(i=0;i<servers->len;i++) {
-               sock=(g_array_index(servers, SERVER, i)).socket;
-               FD_SET(sock, &mset);
-               max=sock>max?sock:max;
+               if((sock=(g_array_index(servers, SERVER, i)).socket)) {
+                       FD_SET(sock, &mset);
+                       max=sock>max?sock:max;
+               }
        }
        if(modernsock) {
                FD_SET(modernsock, &mset);
-               max=modernsock>max?sock:max;
+               max=modernsock>max?modernsock:max;
        }
        for(;;) {
                CLIENT *client = NULL;
@@ -1684,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++) {
@@ -1785,6 +1818,9 @@ int setup_serve(SERVER *serve) {
        gchar *port = NULL;
        int e;
 
+       if(!do_oldstyle) {
+               return serve->servename ? 1 : 0;
+       }
        memset(&hints,'\0',sizeof(hints));
        hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG | AI_NUMERICSERV;
        hints.ai_socktype = SOCK_STREAM;