X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=56a530730f50b665fae95f91509ed0f26b7e84d2;hb=5ff22a0642fb299140e7b3e62588be692386c0b8;hp=bb55c7fefcfecb1416d058520b72e2051fcc629e;hpb=9af9e2e8cff919c6053d862703ac228ce1a15bdd;p=openvswitch

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index bb55c7fe..56a53073 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -26,16 +26,15 @@
 #include "command-line.h"
 #include "compiler.h"
 #include "daemon.h"
-#include "fault.h"
 #include "learning-switch.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
 #include "poll-loop.h"
 #include "rconn.h"
+#include "stream-ssl.h"
 #include "timeval.h"
 #include "unixctl.h"
 #include "util.h"
-#include "vconn-ssl.h"
 #include "vconn.h"
 
 #include "vlog.h"
@@ -84,7 +83,6 @@ main(int argc, char *argv[])
     int i;
 
     set_program_name(argv[0]);
-    register_fault_handlers();
     time_init();
     vlog_init();
     parse_options(argc, argv);
@@ -127,13 +125,15 @@ main(int argc, char *argv[])
     }
 
     die_if_already_running();
-    daemonize();
+    daemonize_start();
 
     retval = unixctl_server_create(NULL, &unixctl);
     if (retval) {
         ovs_fatal(retval, "Could not listen for unixctl connections");
     }
 
+    daemonize_complete();
+
     while (n_switches > 0 || n_listeners > 0) {
         int iteration;
         int i;
@@ -255,7 +255,7 @@ parse_options(int argc, char *argv[])
         DAEMON_LONG_OPTIONS,
         VLOG_LONG_OPTIONS,
 #ifdef HAVE_OPENSSL
-        VCONN_SSL_LONG_OPTIONS
+        STREAM_SSL_LONG_OPTIONS
         {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
 #endif
         {0, 0, 0, 0},
@@ -315,10 +315,10 @@ parse_options(int argc, char *argv[])
         DAEMON_OPTION_HANDLERS
 
 #ifdef HAVE_OPENSSL
-        VCONN_SSL_OPTION_HANDLERS
+        STREAM_SSL_OPTION_HANDLERS
 
         case OPT_PEER_CA_CERT:
-            vconn_ssl_set_peer_ca_cert_file(optarg);
+            stream_ssl_set_peer_ca_cert_file(optarg);
             break;
 #endif