projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Avoid __copy_to/from_user(), __get/put_user() functions.
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 1d1fa291f1e6ce91ea5a5cf5bc2d91b1b8a16837..6478156031e4d431a3f1942c994b8faea170bd1d 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"
@@
-48,6
+50,8
@@
#include "vlog.h"
#define THIS_MODULE VLM_vswitchd
#include "vlog.h"
#define THIS_MODULE VLM_vswitchd
+static unixctl_cb_func ovs_vswitchd_exit;
+
static const char *parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
static const char *parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
@@
-59,26
+63,28
@@
main(int argc, char *argv[])
struct ovsdb_idl *idl;
const char *remote;
bool need_reconfigure;
struct ovsdb_idl *idl;
const char *remote;
bool need_reconfigure;
- bool inited;
+ bool inited
, exiting
;
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();
daemonize_start();
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
die_if_already_running();
daemonize_start();
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
-
ovs_fatal(retval, "could not listen for control connections"
);
+
exit(EXIT_FAILURE
);
}
}
+ unixctl_command_register("exit", ovs_vswitchd_exit, &exiting);
daemonize_complete();
daemonize_complete();
@@
-87,7
+93,8
@@
main(int argc, char *argv[])
need_reconfigure = false;
inited = false;
need_reconfigure = false;
inited = false;
- for (;;) {
+ exiting = false;
+ while (!exiting) {
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
@@
-136,13
+143,16
@@
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,
{"fake-proc-net", no_argument, 0, OPT_FAKE_PROC_NET},
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
@@
-150,6
+160,7
@@
parse_options(int argc, char *argv[])
#ifdef HAVE_OPENSSL
STREAM_SSL_LONG_OPTIONS
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#ifdef HAVE_OPENSSL
STREAM_SSL_LONG_OPTIONS
{"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},
};
@@
-173,6
+184,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) {
@@
-191,6
+212,10
@@
parse_options(int argc, char *argv[])
case OPT_PEER_CA_CERT:
stream_ssl_set_peer_ca_cert_file(optarg);
break;
case OPT_PEER_CA_CERT:
stream_ssl_set_peer_ca_cert_file(optarg);
break;
+
+ case OPT_BOOTSTRAP_CA_CERT:
+ stream_ssl_set_ca_cert_file(optarg, true);
+ break;
#endif
case '?':
#endif
case '?':
@@
-231,3
+256,12
@@
usage(void)
leak_checker_usage();
exit(EXIT_SUCCESS);
}
leak_checker_usage();
exit(EXIT_SUCCESS);
}
+
+static void
+ovs_vswitchd_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED,
+ void *exiting_)
+{
+ bool *exiting = exiting_;
+ *exiting = true;
+ unixctl_command_reply(conn, 200, NULL);
+}