projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sflow: Always add poller and sampler together.
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 52a80e090d0577623dbbd531a2f4ed018f5dac64..c1acfc414e03e1241a48af7e5bbc2ea9c03062bc 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-1,4
+1,4
@@
-/* 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.
@@
-22,13
+22,15
@@
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_MLOCKALL
+#include <sys/mman.h>
+#endif
#include "bridge.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
#include "dpif.h"
#include "bridge.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
#include "dpif.h"
-#include "fault.h"
#include "leak-checker.h"
#include "netdev.h"
#include "ovsdb-idl.h"
#include "leak-checker.h"
#include "netdev.h"
#include "ovsdb-idl.h"
@@
-36,12
+38,12
@@
#include "proc-net-compat.h"
#include "process.h"
#include "signals.h"
#include "proc-net-compat.h"
#include "process.h"
#include "signals.h"
+#include "stream-ssl.h"
#include "stream.h"
#include "svec.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "stream.h"
#include "svec.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn-ssl.h"
#include "vconn.h"
#include "vswitchd/vswitch-idl.h"
#include "vconn.h"
#include "vswitchd/vswitch-idl.h"
@@
-63,23
+65,26
@@
main(int argc, char *argv[])
unsigned int idl_seqno;
int retval;
unsigned int idl_seqno;
int retval;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
set_program_name(argv[0]);
- register_fault_handlers();
time_init();
vlog_init();
remote = parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
process_init();
time_init();
vlog_init();
remote = parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
process_init();
+ ovsrec_init();
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 control connections"
);
+
exit(EXIT_FAILURE
);
}
}
+ daemonize_complete();
+
idl = ovsdb_idl_create(remote, &ovsrec_idl_class);
idl_seqno = ovsdb_idl_get_seqno(idl);
idl = ovsdb_idl_create(remote, &ovsrec_idl_class);
idl_seqno = ovsdb_idl_get_seqno(idl);
@@
-134,20
+139,24
@@
parse_options(int argc, char *argv[])
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
+ OPT_MLOCKALL,
OPT_FAKE_PROC_NET,
VLOG_OPTION_ENUMS,
OPT_FAKE_PROC_NET,
VLOG_OPTION_ENUMS,
- LEAK_CHECKER_OPTION_ENUMS
+ LEAK_CHECKER_OPTION_ENUMS,
+ OPT_BOOTSTRAP_CA_CERT
};
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
};
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
+ {"mlockall", no_argument, 0, OPT_MLOCKALL},
{"fake-proc-net", no_argument, 0, OPT_FAKE_PROC_NET},
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
{"fake-proc-net", no_argument, 0, OPT_FAKE_PROC_NET},
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_LONG_OPTIONS
+
STREAM
_SSL_LONG_OPTIONS
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
+ {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
#endif
{0, 0, 0, 0},
};
#endif
{0, 0, 0, 0},
};
@@
-171,6
+180,16
@@
parse_options(int argc, char *argv[])
OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION);
exit(EXIT_SUCCESS);
OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION);
exit(EXIT_SUCCESS);
+ case OPT_MLOCKALL:
+#ifdef HAVE_MLOCKALL
+ if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
+ VLOG_ERR("mlockall failed: %s", strerror(errno));
+ }
+#else
+ VLOG_ERR("mlockall not supported on this system");
+#endif
+ break;
+
case OPT_FAKE_PROC_NET:
error = proc_net_compat_init();
if (error) {
case OPT_FAKE_PROC_NET:
error = proc_net_compat_init();
if (error) {
@@
-181,12
+200,17
@@
parse_options(int argc, char *argv[])
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
- VCONN_SSL_OPTION_HANDLERS
LEAK_CHECKER_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
LEAK_CHECKER_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
+ 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;
+
+ case OPT_BOOTSTRAP_CA_CERT:
+ stream_ssl_set_ca_cert_file(optarg, true);
break;
#endif
break;
#endif
@@
-217,7
+241,7
@@
usage(void)
"usage: %s [OPTIONS] DATABASE\n"
"where DATABASE is a socket on which ovsdb-server is listening.\n",
program_name, program_name);
"usage: %s [OPTIONS] DATABASE\n"
"where DATABASE is a socket on which ovsdb-server is listening.\n",
program_name, program_name);
- stream_usage("DATABASE", true, false);
+ stream_usage("DATABASE", true, false
, true
);
daemon_usage();
vlog_usage();
printf("\nLegacy compatibility options:\n"
daemon_usage();
vlog_usage();
printf("\nLegacy compatibility options:\n"