Break passive vconns out into separate pvconn routines and data structures.

[openvswitch] / switch / switch.c

diff --git a/switch/switch.c b/switch/switch.c
index 28a6b427773f2796a3970db4fdcaa226061395d8..1f85b37b83357253c653a67c7ea3f324ab85754e 100644 (file)
--- a/switch/switch.c
+++ b/switch/switch.c
@@ -59,15 +59,16 @@
 
 
 /* Strings to describe the manufacturer, hardware, and software.  This data 
- * is queriable through the version stats message. */
-char mfr_desc[VERSION_STR_LEN] = "Nicira Networks";
-char hw_desc[VERSION_STR_LEN] = "Reference User-Space Switch";
-char sw_desc[VERSION_STR_LEN] = VERSION;
+ * is queriable through the switch description stats message. */
+char mfr_desc[DESC_STR_LEN] = "Nicira Networks";
+char hw_desc[DESC_STR_LEN] = "Reference User-Space Switch";
+char sw_desc[DESC_STR_LEN] = VERSION;
+char serial_num[SERIAL_NUM_LEN] = "None";
 
 static void parse_options(int argc, char *argv[]);
 static void usage(void) NO_RETURN;
 
-static const char *listen_vconn_name;
+static const char *listen_pvconn_name;
 static struct datapath *dp;
 static uint64_t dpid = UINT64_MAX;
 static char *port_list;
@@ -101,18 +102,15 @@ main(int argc, char *argv[])
         fatal(0, "no support for %s vconn", argv[optind]);
     }
     error = dp_new(&dp, dpid, rconn);
-    if (listen_vconn_name) {
-        struct vconn *listen_vconn;
+    if (listen_pvconn_name) {
+        struct pvconn *listen_pvconn;
         int retval;
-        
-        retval = vconn_open(listen_vconn_name, &listen_vconn);
+
+        retval = pvconn_open(listen_pvconn_name, &listen_pvconn);
         if (retval && retval != EAGAIN) {
-            fatal(retval, "opening %s", listen_vconn_name);
-        }
-        if (!vconn_is_passive(listen_vconn)) {
-            fatal(0, "%s is not a passive vconn", listen_vconn_name);
+            fatal(retval, "opening %s", listen_pvconn_name);
         }
-        dp_add_listen_vconn(dp, listen_vconn);
+        dp_add_listen_pvconn(dp, listen_pvconn);
     }
     if (error) {
         fatal(error, "could not create datapath");
@@ -163,7 +161,8 @@ parse_options(int argc, char *argv[])
         OPT_MAX_BACKOFF = UCHAR_MAX + 1,
         OPT_MFR_DESC,
         OPT_HW_DESC,
-        OPT_SW_DESC
+        OPT_SW_DESC,
+        OPT_SERIAL_NUM
     };
 
     static struct option long_options[] = {
@@ -180,6 +179,7 @@ parse_options(int argc, char *argv[])
         {"mfr-desc",    required_argument, 0, OPT_MFR_DESC},
         {"hw-desc",     required_argument, 0, OPT_HW_DESC},
         {"sw-desc",     required_argument, 0, OPT_SW_DESC},
+        {"serial_num",  required_argument, 0, OPT_SERIAL_NUM},
         VCONN_SSL_LONG_OPTIONS
         {0, 0, 0, 0},
     };
@@ -259,11 +259,15 @@ parse_options(int argc, char *argv[])
             strncpy(sw_desc, optarg, sizeof sw_desc);
             break;
 
+        case OPT_SERIAL_NUM:
+            strncpy(serial_num, optarg, sizeof serial_num);
+            break;
+
         case 'l':
-            if (listen_vconn_name) {
+            if (listen_pvconn_name) {
                 fatal(0, "-l or --listen may be only specified once");
             }
-            listen_vconn_name = optarg;
+            listen_pvconn_name = optarg;
             break;
 
         VCONN_SSL_OPTION_HANDLERS