r337: Check multi-file export in 'make check', too; and tell automake that we have...

[nbd.git] / nbd-server.c

diff --git a/nbd-server.c b/nbd-server.c
index b367420..a683f8c 100644 (file)
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -170,6 +170,7 @@ typedef enum {
  **/
 typedef struct {
        gchar* exportname;    /**< (unprocessed) filename of the file we're exporting */
+       gchar* cowname;      /**< template for the filename of the copy-on-write file */
        off_t expected_size; /**< size of the exported file as it was told to
                               us through configuration */
        gchar* listenaddr;   /**< The IP address we're listening on */
@@ -404,7 +405,7 @@ SERVER* cmdline(int argc, char *argv[]) {
        size_t last;
        char suffix;
        gboolean do_output=FALSE;
-       gchar* section_header;
+       gchar* section_header="";
        gchar** addr_port;
 
        if(argc==1) {
@@ -422,9 +423,9 @@ SERVER* cmdline(int argc, char *argv[]) {
                                addr_port=g_strsplit(optarg, ":", 2);
                                if(addr_port[1]) {
                                        serve->port=strtol(addr_port[1], NULL, 0);
-                                       serve->host=g_strdup(addr_port[0]);
+                                       serve->listenaddr=g_strdup(addr_port[0]);
                                } else {
-                                       serve->host=g_strdup("0.0.0.0");
+                                       serve->listenaddr=g_strdup("0.0.0.0");
                                        serve->port=strtol(addr_port[0], NULL, 0);
                                }
                                g_strfreev(addr_port);
@@ -555,18 +556,18 @@ GArray* parse_cfile(gchar* f, GError** e) {
                { "readonly",   FALSE,  PARAM_BOOL,     NULL, F_READONLY },
                { "multifile",  FALSE,  PARAM_BOOL,     NULL, F_MULTIFILE },
                { "copyonwrite", FALSE, PARAM_BOOL,     NULL, F_COPYONWRITE },
-               { "autoreadonly", FALSE, PARAM_BOOL,    NULL, F_AUTOREADONLY },
                { "sparse_cow", FALSE,  PARAM_BOOL,     NULL, F_SPARSE },
                { "sdp",        FALSE,  PARAM_BOOL,     NULL, F_SDP },
                { "listenaddr", FALSE,  PARAM_STRING,   NULL, 0 },
+               { "cowname",    FALSE,  PARAM_STRING,   NULL, 0 },
        };
-       const int lp_size=15;
+       const int lp_size=sizeof(lp)/sizeof(PARAM);
        PARAM gp[] = {
                { "user",       FALSE, PARAM_STRING,    &runuser,       0 },
                { "group",      FALSE, PARAM_STRING,    &rungroup,      0 },
        };
        PARAM* p=gp;
-       int p_size=2;
+       int p_size=sizeof(gp)/sizeof(PARAM);
        GKeyFile *cfile;
        GError *err = NULL;
        const char *err_msg=NULL;
@@ -603,9 +604,11 @@ GArray* parse_cfile(gchar* f, GError** e) {
                lp[6].target=&(s.prerun);
                lp[7].target=&(s.postrun);
                lp[8].target=lp[9].target=lp[10].target=
-                               lp[11].target=lp[12].target=
-                               lp[13].target=&(s.flags);
-               lp[14].target=&(s.listnaddr);
+                               lp[11].target=lp[12].target=&(s.flags);
+               lp[13].target=&(s.listenaddr);
+               lp[14].target=&(s.cowname);
+
+               s.cowname = "$F-$I-$P.diff";
 
                /* After the [generic] group, start parsing exports */
                if(i==1) {
@@ -691,6 +694,9 @@ GArray* parse_cfile(gchar* f, GError** e) {
                virtstyle=NULL;
                /* Don't append values for the [generic] group */
                if(i>0) {
+                       if(!s.listenaddr) {
+                               s.listenaddr = g_strdup("0.0.0.0");
+                       }
                        g_array_append_val(retval, s);
                }
 #ifndef WITH_SDP
@@ -759,7 +765,7 @@ void sigterm_handler(int s) {
                unlink(pidfname);
        }
 
-       exit(0);
+       exit(EXIT_SUCCESS);
 }
 
 /**
@@ -902,7 +908,7 @@ ssize_t rawexpwrite(off_t a, char *buf, size_t len, CLIENT *client) {
  * @return 0 on success, nonzero on failure
  **/
 int rawexpwrite_fully(off_t a, char *buf, size_t len, CLIENT *client) {
-       ssize_t ret;
+       ssize_t ret=0;
 
        while(len > 0 && (ret=rawexpwrite(a, buf, len, client)) > 0 ) {
                a += ret;
@@ -944,7 +950,7 @@ ssize_t rawexpread(off_t a, char *buf, size_t len, CLIENT *client) {
  * @return 0 on success, nonzero on failure
  **/
 int rawexpread_fully(off_t a, char *buf, size_t len, CLIENT *client) {
-       ssize_t ret;
+       ssize_t ret=0;
 
        while(len > 0 && (ret=rawexpread(a, buf, len, client)) > 0 ) {
                a += ret;
@@ -1217,8 +1223,12 @@ void setupexport(CLIENT* client) {
                        /* Try again because maybe media was read-only */
                        fi.fhandle = open(tmpname, O_RDONLY);
                        if(fi.fhandle != -1) {
-                               client->server->flags |= F_AUTOREADONLY;
-                               client->server->flags |= F_READONLY;
+                               /* Opening the base file in copyonwrite mode is
+                                * okay */
+                               if(!(client->server->flags & F_COPYONWRITE)) {
+                                       client->server->flags |= F_AUTOREADONLY;
+                                       client->server->flags |= F_READONLY;
+                               }
                        }
                }
                if(fi.fhandle == -1) {
@@ -1381,7 +1391,7 @@ void destroy_pid_t(gpointer data) {
 /**
  * Loop through the available servers, and serve them. Never returns.
  **/
-int serveloop(GArray* servers) G_GNUC_NORETURN {
+int serveloop(GArray* servers) {
        struct sockaddr_in addrin;
        socklen_t addrinlen=sizeof(addrin);
        SERVER *serve;
@@ -1390,7 +1400,6 @@ int serveloop(GArray* servers) G_GNUC_NORETURN {
        int sock;
        fd_set mset;
        fd_set rset;
-       struct timeval tv;
 
        /* 
         * Set up the master fd_set. The set of descriptors we need
@@ -1412,9 +1421,7 @@ int serveloop(GArray* servers) G_GNUC_NORETURN {
                pid_t *pid;
 
                memcpy(&rset, &mset, sizeof(fd_set));
-               tv.tv_sec=0;
-               tv.tv_usec=500;
-               if(select(max+1, &rset, NULL, NULL, &tv)>0) {
+               if(select(max+1, &rset, NULL, NULL, NULL)>0) {
                        DEBUG("accept, ");
                        for(i=0;i<servers->len;i++) {
                                serve=&(g_array_index(servers, SERVER, i));
@@ -1448,7 +1455,7 @@ int serveloop(GArray* servers) G_GNUC_NORETURN {
                                        /* child */
                                        g_hash_table_destroy(children);
                                        for(i=0;i<servers->len;i++) {
-                                               serve=g_array_index(servers, SERVER*, i);
+                                               serve=&g_array_index(servers, SERVER, i);
                                                close(serve->socket);
                                        }
                                        /* FALSE does not free the
@@ -1518,7 +1525,7 @@ void setup_serve(SERVER *serve) {
        }
 #endif
        addrin.sin_port = htons(serve->port);
-       if(!inet_aton(serve->listenaddr, &(addrin.sin_addr.s_addr)))
+       if(!inet_aton(serve->listenaddr, &(addrin.sin_addr)))
                err("could not parse listen address");
        if (bind(serve->socket, (struct sockaddr *) &addrin, addrinlen) < 0)
                err("bind: %m");
@@ -1568,9 +1575,9 @@ void daemonize(SERVER* serve) {
        }
        if(!*pidftemplate) {
                if(serve) {
-                       strncpy(pidftemplate, "/var/run/server.%d.pid", 255);
+                       strncpy(pidftemplate, "/var/run/nbd-server.%d.pid", 255);
                } else {
-                       strncpy(pidftemplate, "/var/run/server.pid", 255);
+                       strncpy(pidftemplate, "/var/run/nbd-server.pid", 255);
                }
        }
        snprintf(pidfname, 255, pidftemplate, serve ? serve->port : 0);
@@ -1592,7 +1599,9 @@ void daemonize(SERVER* serve) {
  * The stuff above daemonize() isn't.
  */
 
-void serve_err(SERVER* serve, const char* msg) G_GNUC_NORETURN {
+void serve_err(SERVER* serve, const char* msg) G_GNUC_NORETURN;
+
+void serve_err(SERVER* serve, const char* msg) {
        g_message("Export of %s on port %d failed:", serve->exportname,
                        serve->port);
        err(msg);
@@ -1622,7 +1631,7 @@ void dousers(void) {
                        exit(EXIT_FAILURE);
                }
                if(setuid(pw->pw_uid)<0) {
-                       g_message(LOG_DEBUG, "Could not set UID: %s", strerror(errno));
+                       g_message("Could not set UID: %s", strerror(errno));
                        exit(EXIT_FAILURE);
                }
        }
@@ -1638,7 +1647,7 @@ int main(int argc, char *argv[]) {
 
        if (sizeof( struct nbd_request )!=28) {
                fprintf(stderr,"Bad size of structure. Alignment problems?\n");
-               exit(-1) ;
+               exit(EXIT_FAILURE) ;
        }
 
        memset(pidftemplate, '\0', 256);