X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=c1acfc414e03e1241a48af7e5bbc2ea9c03062bc;hb=a0bc29a541fc7dc6e20137d5558e2094d614e6ab;hp=3309c080d0793ec8bf1347b52c18085467ac1e08;hpb=347401f756e6678fced43ecee27f5107c803fda2;p=sliver-openvswitch.git diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 3309c080d..c1acfc414 100644 --- 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. @@ -27,126 +27,114 @@ #endif #include "bridge.h" -#include "cfg.h" #include "command-line.h" #include "compiler.h" #include "daemon.h" -#include "fault.h" +#include "dpif.h" #include "leak-checker.h" -#include "mgmt.h" -#include "ovs-vswitchd.h" +#include "netdev.h" +#include "ovsdb-idl.h" #include "poll-loop.h" -#include "port.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 "vconn-ssl.h" #include "vconn.h" +#include "vswitchd/vswitch-idl.h" #include "vlog.h" #define THIS_MODULE VLM_vswitchd -static void parse_options(int argc, char *argv[]); +static const char *parse_options(int argc, char *argv[]); static void usage(void) NO_RETURN; -static void reload(struct unixctl_conn *, const char *args); - -static bool need_reconfigure; -static struct unixctl_conn **conns; -static size_t n_conns; int main(int argc, char *argv[]) { struct unixctl_server *unixctl; struct signal *sighup; + struct ovsdb_idl *idl; + const char *remote; + bool need_reconfigure; + bool inited; + unsigned int idl_seqno; int retval; + proctitle_init(argc, argv); set_program_name(argv[0]); - register_fault_handlers(); time_init(); vlog_init(); - parse_options(argc, argv); + remote = parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); sighup = signal_register(SIGHUP); process_init(); + ovsrec_init(); die_if_already_running(); - daemonize(); + 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("vswitchd/reload", reload); - retval = cfg_read(); - if (retval) { - ovs_fatal(retval, "could not read config file"); - } - mgmt_init(); - bridge_init(); - port_init(); - mgmt_reconfigure(); + daemonize_complete(); + + idl = ovsdb_idl_create(remote, &ovsrec_idl_class); + idl_seqno = ovsdb_idl_get_seqno(idl); need_reconfigure = false; + inited = false; for (;;) { - if (need_reconfigure || signal_poll(sighup)) { - need_reconfigure = false; + if (signal_poll(sighup)) { vlog_reopen_log_file(); - reconfigure(); } - if (mgmt_run()) { + if (inited && bridge_run()) { need_reconfigure = true; } - if (bridge_run()) { + ovsdb_idl_run(idl); + if (idl_seqno != ovsdb_idl_get_seqno(idl)) { + idl_seqno = ovsdb_idl_get_seqno(idl); need_reconfigure = true; } - unixctl_server_run(unixctl); - if (need_reconfigure) { - poll_immediate_wake(); + const struct ovsrec_open_vswitch *cfg; + + need_reconfigure = false; + cfg = ovsrec_open_vswitch_first(idl); + if (cfg) { + if (inited) { + bridge_reconfigure(cfg); + } else { + bridge_init(cfg); + inited = true; + } + } } + unixctl_server_run(unixctl); + dp_run(); + netdev_run(); + signal_wait(sighup); - mgmt_wait(); - bridge_wait(); + if (inited) { + bridge_wait(); + } + ovsdb_idl_wait(idl); unixctl_server_wait(unixctl); + dp_wait(); + netdev_wait(); poll_block(); } return 0; } -static void -reload(struct unixctl_conn *conn, const char *args UNUSED) -{ - need_reconfigure = true; - conns = xrealloc(conns, sizeof *conns * (n_conns + 1)); - conns[n_conns++] = conn; -} - -void -reconfigure(void) -{ - size_t i; - - cfg_read(); - bridge_reconfigure(); - mgmt_reconfigure(); - port_reconfigure(); - - for (i = 0; i < n_conns; i++) { - unixctl_command_reply(conns[i], 202, NULL); - } - free(conns); - conns = NULL; - n_conns = 0; -} - -static void +static const char * parse_options(int argc, char *argv[]) { enum { @@ -154,7 +142,8 @@ parse_options(int argc, char *argv[]) OPT_MLOCKALL, 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'}, @@ -165,13 +154,13 @@ parse_options(int argc, char *argv[]) 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}, + {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, #endif {0, 0, 0, 0}, }; char *short_options = long_options_to_short_options(long_options); - const char *config_file; int error; for (;;) { @@ -211,12 +200,17 @@ parse_options(int argc, char *argv[]) VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS - VCONN_SSL_OPTION_HANDLERS LEAK_CHECKER_OPTION_HANDLERS #ifdef HAVE_OPENSSL + 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; + + case OPT_BOOTSTRAP_CA_CERT: + stream_ssl_set_ca_cert_file(optarg, true); break; #endif @@ -233,26 +227,21 @@ parse_options(int argc, char *argv[]) argv += optind; if (argc != 1) { - ovs_fatal(0, "config file is only non-option argument; " + ovs_fatal(0, "database socket is only non-option argument; " "use --help for usage"); } - cfg_init(); - config_file = argv[0]; - error = cfg_set_file(config_file); - if (error) { - ovs_fatal(error, "failed to add configuration file \"%s\"", - config_file); - } + return argv[0]; } static void usage(void) { - printf("%s: virtual switch daemon\n" - "usage: %s [OPTIONS] CONFIG\n" - "CONFIG is a configuration file in ovs-vswitchd.conf(5) format.\n", + 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); + stream_usage("DATABASE", true, false, true); daemon_usage(); vlog_usage(); printf("\nLegacy compatibility options:\n"