X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=875da6985fd6cfdd903424e532db5ba5e70bbff3;hb=45c8d3a189843f0f45398caa420b952d5acd1f19;hp=cd30c96d309762f96b4afb9c90bff079316181a7;hpb=ee45ad81ab7e9ff6034352b6743985e28fedd649;p=sliver-openvswitch.git diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index cd30c96d3..875da6985 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010 Nicira Networks +/* Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,13 +30,12 @@ #include "command-line.h" #include "compiler.h" #include "daemon.h" -#include "dpif.h" +#include "dirs.h" #include "dummy.h" #include "leak-checker.h" #include "netdev.h" #include "ovsdb-idl.h" #include "poll-loop.h" -#include "proc-net-compat.h" #include "process.h" #include "signals.h" #include "stream-ssl.h" @@ -54,7 +53,7 @@ VLOG_DEFINE_THIS_MODULE(vswitchd); static unixctl_cb_func ovs_vswitchd_exit; -static const char *parse_options(int argc, char *argv[]); +static char *parse_options(int argc, char *argv[]); static void usage(void) NO_RETURN; int @@ -62,7 +61,7 @@ main(int argc, char *argv[]) { struct unixctl_server *unixctl; struct signal *sighup; - const char *remote; + char *remote; bool exiting; int retval; @@ -75,7 +74,6 @@ main(int argc, char *argv[]) process_init(); ovsrec_init(); - die_if_already_running(); daemonize_start(); retval = unixctl_server_create(NULL, &unixctl); @@ -84,9 +82,9 @@ main(int argc, char *argv[]) } unixctl_command_register("exit", ovs_vswitchd_exit, &exiting); - daemonize_complete(); - bridge_init(remote); + free(remote); + exiting = false; while (!exiting) { if (signal_poll(sighup)) { @@ -94,13 +92,11 @@ main(int argc, char *argv[]) } bridge_run(); unixctl_server_run(unixctl); - dp_run(); netdev_run(); signal_wait(sighup); bridge_wait(); unixctl_server_wait(unixctl); - dp_wait(); netdev_wait(); if (exiting) { poll_immediate_wake(); @@ -109,40 +105,37 @@ main(int argc, char *argv[]) } bridge_exit(); unixctl_server_destroy(unixctl); + signal_unregister(sighup); return 0; } -static const char * +static char * parse_options(int argc, char *argv[]) { enum { OPT_PEER_CA_CERT = UCHAR_MAX + 1, OPT_MLOCKALL, - OPT_FAKE_PROC_NET, VLOG_OPTION_ENUMS, LEAK_CHECKER_OPTION_ENUMS, OPT_BOOTSTRAP_CA_CERT, - OPT_ENABLE_DUMMY + OPT_ENABLE_DUMMY, + DAEMON_OPTION_ENUMS }; 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}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, + {"mlockall", no_argument, NULL, OPT_MLOCKALL}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, -#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 - {"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY}, - {0, 0, 0, 0}, + STREAM_SSL_LONG_OPTIONS, + {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT}, + {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, + {"enable-dummy", no_argument, NULL, OPT_ENABLE_DUMMY}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); - int error; for (;;) { int c; @@ -153,12 +146,11 @@ parse_options(int argc, char *argv[]) } switch (c) { - case 'H': case 'h': usage(); case 'V': - OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION); + ovs_print_version(OFP_VERSION, OFP_VERSION); exit(EXIT_SUCCESS); case OPT_MLOCKALL: @@ -171,19 +163,9 @@ parse_options(int argc, char *argv[]) #endif break; - case OPT_FAKE_PROC_NET: - error = proc_net_compat_init(); - if (error) { - ovs_fatal(error, "failed to initialize /proc/net " - "compatibility"); - } - break; - VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS LEAK_CHECKER_OPTION_HANDLERS - -#ifdef HAVE_OPENSSL STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: @@ -193,7 +175,6 @@ parse_options(int argc, char *argv[]) case OPT_BOOTSTRAP_CA_CERT: stream_ssl_set_ca_cert_file(optarg, true); break; -#endif case OPT_ENABLE_DUMMY: dummy_enable(); @@ -211,27 +192,31 @@ parse_options(int argc, char *argv[]) argc -= optind; argv += optind; - if (argc != 1) { - ovs_fatal(0, "database socket is only non-option argument; " - "use --help for usage"); - } + switch (argc) { + case 0: + return xasprintf("unix:%s/db.sock", ovs_rundir()); - return argv[0]; + case 1: + return xstrdup(argv[0]); + + default: + VLOG_FATAL("at most one non-option argument accepted; " + "use --help for usage"); + } } static void usage(void) { printf("%s: Open vSwitch daemon\n" - "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" + " (default: \"unix:%s/db.sock\").\n", + program_name, program_name, ovs_rundir()); stream_usage("DATABASE", true, false, true); daemon_usage(); vlog_usage(); - printf("\nLegacy compatibility options:\n" - " --fake-proc-net simulate some files in /proc/net\n" - "\nOther options:\n" + printf("\nOther options:\n" " -h, --help display this help message\n" " -V, --version display version information\n"); leak_checker_usage();