r289: Add experimental support for the SDP protocol

[nbd.git] / nbd-client.c

diff --git a/nbd-client.c b/nbd-client.c
index f4836c5..d98f36e 100644 (file)
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -37,20 +37,29 @@
 #define MY_NAME "nbd_client"
 #include "cliserv.h"
 
-int opennet(char *name, int port) {
+int opennet(char *name, int port, int sdp) {
        int sock;
        struct sockaddr_in xaddrin;
        int xaddrinlen = sizeof(xaddrin);
        struct hostent *hostn;
+       int af;
 
        hostn = gethostbyname(name);
        if (!hostn)
                err("Gethostname failed: %h\n");
 
-       if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+       af = AF_INET;
+       if(sdp) {
+#ifdef WITH_SDP
+               af = AF_INET_SDP;
+#else
+               err("Can't do SDP: I was not compiled with SDP support!");
+#endif
+       }
+       if ((sock = socket(af, SOCK_STREAM, IPPROTO_TCP)) < 0)
                err("Socket failed: %m");
 
-       xaddrin.sin_family = AF_INET;
+       xaddrin.sin_family = af;
        xaddrin.sin_port = htons(port);
        xaddrin.sin_addr.s_addr = *((int *) hostn->h_addr);
        if ((connect(sock, (struct sockaddr *) &xaddrin, xaddrinlen) < 0))
@@ -140,6 +149,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");
@@ -160,6 +179,8 @@ int main(int argc, char *argv[]) {
        char *hostname, *nbddev;
        int swap=0;
        int cont=0;
+       int timeout=0;
+       int sdp=0;
        u64 size64;
        u32 flags;
 
@@ -168,7 +189,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 :) */
@@ -206,6 +227,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 */
@@ -222,23 +248,31 @@ int main(int argc, char *argv[]) {
          err("Can not open NBD: %m");
        ++argv; --argc; /* skip device */
 
-       if (argc>2) goto errmsg;
-       if (argc!=0) {
+       if (argc>3) goto errmsg;
+       if (argc) {
                if(strncmp(argv[0], "-swap", 5)==0) {
                        swap=1;
                        ++argv;--argc;
                }
        }
-       if (argc!=0) {
+       if (argc) {
                if(strncmp(argv[0], "-persist", 8)==0) {
                        cont=1;
                        ++argv;--argc;
                }
        }
+       if (argc) {
+               if(strncmp(argv[0], "-sdp", 4)==0) {
+                       sdp=1;
+                       ++argv;--argc;
+               }
+       }
+       if(argc) goto errmsg;
        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 */
@@ -272,6 +306,7 @@ int main(int argc, char *argv[]) {
                                        setsizes(nbd, size64, blocksize,
                                                                new_flags);
 
+                                       set_timeout(nbd, timeout);
                                        finish_sock(sock,nbd,swap);
                                }
                        }