/* 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. */
/* 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. */
struct ofproto *ofproto;
struct ofsettings s;
int error;
+ struct netflow_options nf_options;
set_program_name(argv[0]);
register_fault_handlers();
signal(SIGPIPE, SIG_IGN);
die_if_already_running();
- daemonize();
+ daemonize_start();
/* Start listening for ovs-appctl requests. */
error = unixctl_server_create(NULL, &unixctl);
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) {
ofproto_set_mgmt_id(ofproto, s.mgmt_id);
}
ofproto_set_desc(ofproto, s.mfr_desc, s.hw_desc, s.sw_desc, s.serial_desc);
+ if (!s.listeners.n) {
+ svec_add_nocopy(&s.listeners, xasprintf("punix:%s/%s.mgmt",
+ ovs_rundir, s.dp_name));
+ } else if (s.listeners.n == 1 && !strcmp(s.listeners.names[0], "none")) {
+ svec_clear(&s.listeners);
+ }
error = ofproto_set_listeners(ofproto, &s.listeners);
if (error) {
ovs_fatal(error, "failed to configure management connections");
ovs_fatal(error,
"failed to configure controller snooping connections");
}
- error = ofproto_set_netflow(ofproto, &s.netflow, 0, 0, false);
+ memset(&nf_options, 0, sizeof nf_options);
+ nf_options.collectors = s.netflow;
+ error = ofproto_set_netflow(ofproto, &nf_options);
if (error) {
ovs_fatal(error, "failed to configure NetFlow collectors");
}
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) {
}
}
+ daemonize_complete();
+
while (ofproto_is_alive(ofproto)) {
error = ofproto_run(ofproto);
if (error) {
}
unixctl_server_run(unixctl);
dp_run();
+ netdev_run();
ofproto_wait(ofproto);
unixctl_server_wait(unixctl);
dp_wait();
+ netdev_wait();
poll_block();
}
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
};
{"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'},
s->fail_mode = FAIL_OPEN;
s->max_idle = 0;
s->probe_interval = 0;
- s->max_backoff = 15;
+ s->max_backoff = 8;
s->update_resolv_conf = true;
s->rate_limit = 0;
s->burst_limit = 0;
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;
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;
} else if (!strcmp(optarg, "closed")) {
s->fail_mode = FAIL_CLOSED;
} else {
- ovs_fatal(0, "-f or --fail argument must be \"open\" "
- "or \"closed\"");
+ ovs_fatal(0, "--fail argument must be \"open\" or \"closed\"");
}
break;
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;
svec_add(&s->snoops, optarg);
break;
+ case OPT_PORTS:
+ svec_split(&s->ports, optarg, ",");
+ break;
+
case 'h':
usage();
" --inactivity-probe=SECS time between inactivity probes\n"
" --max-idle=SECS max idle for flows set up by switch\n"
" --max-backoff=SECS max time between controller connection\n"
- " attempts (default: 15 seconds)\n"
+ " attempts (default: 8 seconds)\n"
" -l, --listen=METHOD allow management connections on METHOD\n"
" (a passive OpenFlow connection method)\n"
" --snoop=METHOD allow controller snooping on METHOD\n"
" --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",
+ " --burst-limit=BURST limit on packet credit for idle time\n",
ovs_pkgdatadir);
daemon_usage();
vlog_usage();