r288: Don't forget to kill nbd-server the second time; thanks to Patrice Dumas

[nbd.git] / nbd-client.c

diff --git a/nbd-client.c b/nbd-client.c
index 8771d40..d03b568 100644 (file)
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -140,6 +140,16 @@ void setsizes(int nbd, u64 size64, int blocksize, u32 flags) {
                err("Unable to set read-only attribute for device");
 }
 
+void set_timeout(int nbd, int timeout) {
+#ifdef NBD_SET_TIMEOUT
+       if (timeout) {
+               if (ioctl(nbd, NBD_SET_TIMEOUT, (unsigned long)timeout) < 0)
+                       err("Ioctl NBD_SET_TIMEOUT failed: %m\n");
+               fprintf(stderr, "timeout=%d\n", timeout);
+       }
+#endif
+}
+
 void finish_sock(int sock, int nbd, int swap) {
        if (ioctl(nbd, NBD_SET_SOCK, sock) < 0)
                err("Ioctl NBD_SET_SOCK failed: %m\n");
@@ -169,7 +179,7 @@ int main(int argc, char *argv[]) {
        if (argc < 3) {
        errmsg:
                fprintf(stderr, "nbd-client version %s\n", PACKAGE_VERSION);
-               fprintf(stderr, "Usage: nbd-client [bs=blocksize] host port nbd_device [-swap] [-persist]\n");
+               fprintf(stderr, "Usage: nbd-client [bs=blocksize] [timeout=sec] host port nbd_device [-swap] [-persist]\n");
                fprintf(stderr, "Or   : nbd-client -d nbd_device\n");
                fprintf(stderr, "Default value for blocksize is 1024 (recommended for ethernet)\n");
                fprintf(stderr, "Allowed values for blocksize are 512,1024,2048,4096\n"); /* will be checked in kernel :) */
@@ -207,6 +217,11 @@ int main(int argc, char *argv[]) {
                ++argv; --argc; /* skip blocksize */
        }
 
+       if (strncmp(argv[0], "timeout=", 8)==0) {
+               timeout=atoi(argv[0]+8);
+               ++argv; --argc; /* skip timeout */
+       }
+       
        if (argc==0) goto errmsg;
        hostname=argv[0];
        ++argv; --argc; /* skip hostname */
@@ -223,7 +238,7 @@ int main(int argc, char *argv[]) {
          err("Can not open NBD: %m");
        ++argv; --argc; /* skip device */
 
-       if (argc>3) goto errmsg;
+       if (argc>2) goto errmsg;
        if (argc!=0) {
                if(strncmp(argv[0], "-swap", 5)==0) {
                        swap=1;
@@ -236,21 +251,11 @@ int main(int argc, char *argv[]) {
                        ++argv;--argc;
                }
        }
-       if(argc!=0) {
-               if(strncmp(argv[0], "-timeout", 8)==0) {
-#ifdef NBD_SET_TIMEOUT
-                       timeout=strtol(++argv, NULL, 0);
-                       ++argv;--argc--;
-#else
-                       fprintf(stderr, "This nbd-client does not support -timeout yet; please recompile on a more recent kernel");
-                       exit(EXIT_FAILURE);
-#endif
-               }
-       }
        argv=NULL; argc=0; /* don't use it later suddenly */
 
        negotiate(sock, &size64, &flags);
        setsizes(nbd, size64, blocksize, flags);
+       set_timeout(nbd, timeout);
        finish_sock(sock, nbd, swap);
 
        /* Go daemon */
@@ -261,12 +266,6 @@ int main(int argc, char *argv[]) {
                exit(0);
 #endif
 
-#ifdef NBD_SET_TIMEOUT
-       if(ioctl(nbd, NBD_SET_TIMEOUT, &timeout)<0) {
-               fprintf(stderr, "Setting timeout failed: %m");
-               exit(EXIT_FAILURE);
-       }
-#endif
        do {
                if (ioctl(nbd, NBD_DO_IT) < 0) {
                        fprintf(stderr, "Kernel call returned: %m");
@@ -290,6 +289,7 @@ int main(int argc, char *argv[]) {
                                        setsizes(nbd, size64, blocksize,
                                                                new_flags);
 
+                                       set_timeout(nbd, timeout);
                                        finish_sock(sock,nbd,swap);
                                }
                        }