projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
print: Print mod_vlan_vid action in decimal
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index bb55c7fefcfecb1416d058520b72e2051fcc629e..0497d9a48154ea1cd1c34500b84cabf9db91210b 100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,16
+26,15
@@
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
#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 "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 "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn-ssl.h"
#include "vconn.h"
#include "vlog.h"
#include "vconn.h"
#include "vlog.h"
@@
-83,8
+82,8
@@
main(int argc, char *argv[])
int retval;
int i;
int retval;
int i;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
set_program_name(argv[0]);
- register_fault_handlers();
time_init();
vlog_init();
parse_options(argc, argv);
time_init();
vlog_init();
parse_options(argc, argv);
@@
-127,13
+126,15
@@
main(int argc, char *argv[])
}
die_if_already_running();
}
die_if_already_running();
- daemonize();
+ daemonize
_start
();
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
-
ovs_fatal(retval, "Could not listen for unixctl connections"
);
+
exit(EXIT_FAILURE
);
}
}
+ daemonize_complete();
+
while (n_switches > 0 || n_listeners > 0) {
int iteration;
int i;
while (n_switches > 0 || n_listeners > 0) {
int iteration;
int i;
@@
-255,7
+256,7
@@
parse_options(int argc, char *argv[])
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
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},
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#endif
{0, 0, 0, 0},
@@
-315,10
+316,10
@@
parse_options(int argc, char *argv[])
DAEMON_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
DAEMON_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_OPTION_HANDLERS
+
STREAM
_SSL_OPTION_HANDLERS
case OPT_PEER_CA_CERT:
case OPT_PEER_CA_CERT:
-
vconn
_ssl_set_peer_ca_cert_file(optarg);
+
stream
_ssl_set_peer_ca_cert_file(optarg);
break;
#endif
break;
#endif