Factor out printing the list of available vconns.

[openvswitch] / switch / switch.c

diff --git a/switch/switch.c b/switch/switch.c
index cbdc9654b22e15ac6bcfc5ae7b99e218ed09cc36..d8ccc80c3de7f3558b5bbc9b3dbd4d30fb77c8d8 100644 (file)
--- a/switch/switch.c
+++ b/switch/switch.c
@@ -38,14 +38,13 @@
 #include <string.h>
 
 #include "command-line.h"
-#include "controller.h"
 #include "datapath.h"
 #include "fault.h"
-#include "forward.h"
 #include "openflow.h"
 #include "poll-loop.h"
 #include "queue.h"
 #include "util.h"
+#include "rconn.h"
 #include "vconn.h"
 #include "vconn-ssl.h"
 #include "vlog-socket.h"
@@ -56,7 +55,6 @@
 static void parse_options(int argc, char *argv[]);
 static void usage(void) NO_RETURN;
 
-static bool reliable = true;
 static struct datapath *dp;
 static uint64_t dpid = UINT64_MAX;
 static char *port_list;
@@ -66,7 +64,6 @@ static void add_ports(struct datapath *dp, char *port_list);
 int
 main(int argc, char *argv[])
 {
-    struct controller_connection cc;
     int error;
 
     set_program_name(argv[0]);
@@ -78,8 +75,7 @@ main(int argc, char *argv[])
         fatal(0, "missing controller argument; use --help for usage");
     }
 
-    controller_init(&cc, argv[optind], reliable);
-    error = dp_new(&dp, dpid, &cc);
+    error = dp_new(&dp, dpid, rconn_new(argv[optind], 128));
     if (error) {
         fatal(error, "could not create datapath");
     }
@@ -94,12 +90,7 @@ main(int argc, char *argv[])
 
     for (;;) {
         dp_run(dp);
-        fwd_run(dp);
-        controller_run(&cc);
-        
         dp_wait(dp);
-        fwd_run_wait(dp);
-        controller_run_wait(&cc);
         poll_block();
     }
 
@@ -129,7 +120,6 @@ parse_options(int argc, char *argv[])
 {
     static struct option long_options[] = {
         {"interfaces",  required_argument, 0, 'i'},
-        {"unreliable",  no_argument, 0, 'u'},
         {"datapath-id", required_argument, 0, 'd'},
         {"verbose",     optional_argument, 0, 'v'},
         {"help",        no_argument, 0, 'h'},
@@ -153,10 +143,6 @@ parse_options(int argc, char *argv[])
         }
 
         switch (c) {
-        case 'u':
-            reliable = false;
-            break;
-
         case 'd':
             if (strlen(optarg) != 12
                 || strspn(optarg, "0123456789abcdefABCDEF") != 12) {
@@ -217,23 +203,14 @@ usage(void)
 {
     printf("%s: userspace OpenFlow switch\n"
            "usage: %s [OPTIONS] CONTROLLER\n"
-           "CONTROLLER must be one of the following:\n"
-           "  tcp:HOST[:PORT]         PORT (default: %d) on remote TCP HOST\n",
-           program_name, program_name, OFP_TCP_PORT);
-#ifdef HAVE_OPENSSL
-    printf("  ssl:HOST[:PORT]         SSL PORT (default: %d) on remote HOST\n"
-           "\nPKI configuration (required to use SSL):\n"
-           "  -p, --private-key=FILE  file with private key\n"
-           "  -c, --certificate=FILE  file with certificate for private key\n"
-           "  -C, --ca-cert=FILE      file with peer CA certificate\n",
-           OFP_SSL_PORT);
-#endif
-    printf("Options:\n"
+           "where CONTROLLER is an active OpenFlow connection method.\n",
+           program_name, program_name);
+    vconn_usage(true, false);
+    printf("\nOptions:\n"
            "  -i, --interfaces=NETDEV[,NETDEV]...\n"
            "                          add specified initial switch ports\n"
            "  -d, --datapath-id=ID    Use ID as the OpenFlow switch ID\n"
            "                          (ID must consist of 12 hex digits)\n"
-           "  -u, --unreliable        do not reconnect to controller\n"
            "  -v, --verbose           set maximum verbosity level\n"
            "  -h, --help              display this help message\n"
            "  -V, --version           display version information\n");