Allow varying the port for new-style handshakes

[nbd.git] / nbd-client.c

diff --git a/nbd-client.c b/nbd-client.c
index b1e2a3c..2456c59 100644 (file)
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -278,7 +278,8 @@ void usage(char* errmsg, ...) {
        } else {
                fprintf(stderr, "nbd-client version %s\n", PACKAGE_VERSION);
        }
-       fprintf(stderr, "Usage: nbd-client host port nbd_device [-block-size|-b block size] [-timeout|-t timeout] [-swap|-s] [-sdp|-S] [-persist|-p] [-nofork|-n] [-name|-N name]\n");
+       fprintf(stderr, "Usage: nbd-client host port nbd_device [-block-size|-b block size] [-timeout|-t timeout] [-swap|-s] [-sdp|-S] [-persist|-p] [-nofork|-n]\n");
+       fprintf(stderr, "Or   : nbd-client -name|-N name host [port] nbd_device [-block-size|-b block size] [-timeout|-t timeout] [-swap|-s] [-sdp|-S] [-persist|-p] [-nofork|-n]\n");
        fprintf(stderr, "Or   : nbd-client -d nbd_device\n");
        fprintf(stderr, "Or   : nbd-client -c nbd_device\n");
        fprintf(stderr, "Or   : nbd-client -h|--help\n");
@@ -286,6 +287,7 @@ void usage(char* errmsg, ...) {
        fprintf(stderr, "Allowed values for blocksize are 512,1024,2048,4096\n"); /* will be checked in kernel :) */
        fprintf(stderr, "Note, that kernel 2.4.2 and older ones do not work correctly with\n");
        fprintf(stderr, "blocksizes other than 1024 without patches\n");
+       fprintf(stderr, "Default value for port with -N is 10809. Note that port must always be numeric\n");
 }
 
 void disconnect(char* device) {
@@ -374,10 +376,6 @@ int main(int argc, char *argv[]) {
                                                nonspecial++;
                                        } else {
                                                port = optarg;
-                                               if(name) {
-                                                       usage("port and name specified at the same time. This is not supported.");
-                                                       exit(EXIT_FAILURE);
-                                               }
                                        }
                                        break;
                                case 2:
@@ -406,11 +404,9 @@ int main(int argc, char *argv[]) {
                        break;
                case 'N':
                        name=optarg;
-                       if(port) {
-                               usage("port and name specified at the same time. This is not supported.");
-                               exit(EXIT_FAILURE);
+                       if(!port) {
+                               port = NBD_DEFAULT_PORT;
                        }
-                       port = NBD_DEFAULT_PORT;
                        break;
                case 'p':
                        cont=1;