X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-openflowd.c;h=5f4b24bd0714d873d8d32116c809f54dfe9978ea;hb=d35a4ea82fb76398025d833d30d11d0d68050e56;hp=d6b2c51f3b032fa9e637f9fb63f2f6b797b7f668;hpb=436cf33bb74f422ef3fe02527eeebf6b0817fa04;p=openvswitch diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index d6b2c51f..5f4b24bd 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.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. @@ -29,7 +29,6 @@ #include "daemon.h" #include "dirs.h" #include "dpif.h" -#include "fault.h" #include "leak-checker.h" #include "list.h" #include "netdev.h" @@ -39,11 +38,11 @@ #include "packets.h" #include "poll-loop.h" #include "rconn.h" +#include "stream-ssl.h" #include "svec.h" #include "timeval.h" #include "unixctl.h" #include "util.h" -#include "vconn-ssl.h" #include "vconn.h" #include "vlog.h" @@ -64,6 +63,7 @@ struct ofsettings { /* Datapath. */ uint64_t datapath_id; /* Datapath ID. */ const char *dp_name; /* Name of local datapath. */ + struct svec ports; /* Set of ports to add to datapath (if any). */ /* Description strings. */ const char *mfr_desc; /* Manufacturer. */ @@ -93,10 +93,6 @@ struct ofsettings { /* Spanning tree protocol. */ bool enable_stp; - /* Remote command execution. */ - char *command_acl; /* Command white/blacklist, as shell globs. */ - char *command_dir; /* Directory that contains commands. */ - /* Management. */ uint64_t mgmt_id; /* Management ID. */ @@ -117,14 +113,13 @@ main(int argc, char *argv[]) struct netflow_options nf_options; set_program_name(argv[0]); - register_fault_handlers(); time_init(); vlog_init(); parse_options(argc, argv, &s); signal(SIGPIPE, SIG_IGN); die_if_already_running(); - daemonize(); + daemonize_start(); /* Start listening for ovs-appctl requests. */ error = unixctl_server_create(NULL, &unixctl); @@ -135,6 +130,26 @@ main(int argc, char *argv[]) VLOG_INFO("Open vSwitch version %s", VERSION BUILDNR); VLOG_INFO("OpenFlow protocol version 0x%02x", OFP_VERSION); + /* Create the datapath and add ports to it, if requested by the user. */ + if (s.ports.n) { + struct dpif *dpif; + const char *port; + size_t i; + + error = dpif_create_and_open(s.dp_name, &dpif); + if (error) { + ovs_fatal(error, "could not create datapath"); + } + + SVEC_FOR_EACH (i, port, &s.ports) { + error = dpif_port_add(dpif, port, 0, NULL); + if (error) { + ovs_fatal(error, "failed to add %s as a port", port); + } + } + dpif_close(dpif); + } + /* Start OpenFlow processing. */ error = ofproto_create(s.dp_name, NULL, NULL, &ofproto); if (error) { @@ -185,11 +200,6 @@ main(int argc, char *argv[]) if (error) { ovs_fatal(error, "failed to configure STP"); } - error = ofproto_set_remote_execution(ofproto, s.command_acl, - s.command_dir); - if (error) { - ovs_fatal(error, "failed to configure remote command execution"); - } if (!s.discovery) { error = ofproto_set_controller(ofproto, s.controller_name); if (error) { @@ -197,6 +207,8 @@ main(int argc, char *argv[]) } } + daemonize_complete(); + while (ofproto_is_alive(ofproto)) { error = ofproto_run(ofproto); if (error) { @@ -242,10 +254,9 @@ parse_options(int argc, char *argv[], struct ofsettings *s) OPT_NO_STP, OPT_OUT_OF_BAND, OPT_IN_BAND, - OPT_COMMAND_ACL, - OPT_COMMAND_DIR, OPT_NETFLOW, OPT_MGMT_ID, + OPT_PORTS, VLOG_OPTION_ENUMS, LEAK_CHECKER_OPTION_ENUMS }; @@ -271,10 +282,9 @@ parse_options(int argc, char *argv[], struct ofsettings *s) {"no-stp", no_argument, 0, OPT_NO_STP}, {"out-of-band", no_argument, 0, OPT_OUT_OF_BAND}, {"in-band", no_argument, 0, OPT_IN_BAND}, - {"command-acl", required_argument, 0, OPT_COMMAND_ACL}, - {"command-dir", required_argument, 0, OPT_COMMAND_DIR}, {"netflow", required_argument, 0, OPT_NETFLOW}, {"mgmt-id", required_argument, 0, OPT_MGMT_ID}, + {"ports", required_argument, 0, OPT_PORTS}, {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, @@ -282,7 +292,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, #ifdef HAVE_OPENSSL - VCONN_SSL_LONG_OPTIONS + STREAM_SSL_LONG_OPTIONS {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, #endif {0, 0, 0, 0}, @@ -307,10 +317,9 @@ parse_options(int argc, char *argv[], struct ofsettings *s) s->accept_controller_re = NULL; s->enable_stp = false; s->in_band = true; - s->command_acl = ""; - s->command_dir = NULL; svec_init(&s->netflow); s->mgmt_id = 0; + svec_init(&s->ports); for (;;) { int c; @@ -321,14 +330,9 @@ parse_options(int argc, char *argv[], struct ofsettings *s) switch (c) { case OPT_DATAPATH_ID: - if (strlen(optarg) != 12 - || strspn(optarg, "0123456789abcdefABCDEF") != 12) { + if (!dpid_from_string(optarg, &s->datapath_id)) { ovs_fatal(0, "argument to --datapath-id must be " - "exactly 12 hex digits"); - } - s->datapath_id = strtoll(optarg, NULL, 16); - if (!s->datapath_id) { - ovs_fatal(0, "argument to --datapath-id must be nonzero"); + "exactly 12 hex digits and may not be all-zero"); } break; @@ -428,16 +432,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s) s->in_band = true; break; - case OPT_COMMAND_ACL: - s->command_acl = (s->command_acl[0] - ? xasprintf("%s,%s", s->command_acl, optarg) - : optarg); - break; - - case OPT_COMMAND_DIR: - s->command_dir = optarg; - break; - case OPT_NETFLOW: svec_add(&s->netflow, optarg); break; @@ -462,6 +456,10 @@ parse_options(int argc, char *argv[], struct ofsettings *s) svec_add(&s->snoops, optarg); break; + case OPT_PORTS: + svec_split(&s->ports, optarg, ","); + break; + case 'h': usage(); @@ -476,10 +474,10 @@ parse_options(int argc, char *argv[], struct ofsettings *s) LEAK_CHECKER_OPTION_HANDLERS #ifdef HAVE_OPENSSL - VCONN_SSL_OPTION_HANDLERS + STREAM_SSL_OPTION_HANDLERS case OPT_BOOTSTRAP_CA_CERT: - vconn_ssl_set_ca_cert_file(optarg, true); + stream_ssl_set_ca_cert_file(optarg, true); break; #endif @@ -506,7 +504,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) /* Set accept_controller_regex. */ if (!s->accept_controller_re) { s->accept_controller_re - = vconn_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*"; + = stream_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*"; } /* Mode of operation. */ @@ -559,11 +557,7 @@ usage(void) " --netflow=HOST:PORT configure NetFlow output target\n" "\nRate-limiting of \"packet-in\" messages to the controller:\n" " --rate-limit[=PACKETS] max rate, in packets/s (default: 1000)\n" - " --burst-limit=BURST limit on packet credit for idle time\n" - "\nRemote command execution options:\n" - " --command-acl=[!]GLOB[,[!]GLOB...] set allowed/denied commands\n" - " --command-dir=DIR set command dir (default: %s/commands)\n", - ovs_pkgdatadir); + " --burst-limit=BURST limit on packet credit for idle time\n"); daemon_usage(); vlog_usage(); printf("\nOther options:\n"