X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-openflowd.c;h=4ca22e0d8459a12216a9ff98bb5a770858e941d0;hb=a56104575c4db202bfc5db3079ea969820d77867;hp=486eae288e9e56ab3cd2d9823d18cb9d546b8dd4;hpb=8274ae959ac0b158c3e3206b3810af608fb93785;p=openvswitch diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 486eae28..4ca22e0d 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -28,7 +28,6 @@ #include "compiler.h" #include "daemon.h" #include "dirs.h" -#include "dpif.h" #include "dummy.h" #include "leak-checker.h" #include "list.h" @@ -40,7 +39,6 @@ #include "poll-loop.h" #include "rconn.h" #include "stream-ssl.h" -#include "svec.h" #include "timeval.h" #include "unixctl.h" #include "util.h" @@ -63,7 +61,7 @@ struct ofsettings { uint64_t datapath_id; /* Datapath ID. */ char *dp_name; /* Name of local datapath. */ char *dp_type; /* Type of local datapath. */ - struct svec ports; /* Set of ports to add to datapath (if any). */ + struct sset ports; /* Set of ports to add to datapath (if any). */ /* Description strings. */ const char *mfr_desc; /* Manufacturer. */ @@ -73,13 +71,13 @@ struct ofsettings { const char *dp_desc; /* Datapath description. */ /* Related vconns and network devices. */ - struct svec snoops; /* Listen for controller snooping conns. */ + struct sset snoops; /* Listen for controller snooping conns. */ /* Failure behavior. */ int max_idle; /* Idle time for flows in fail-open mode. */ /* NetFlow. */ - struct svec netflow; /* NetFlow targets. */ + struct sset netflow; /* NetFlow targets. */ }; static unixctl_cb_func ovs_openflowd_exit; @@ -94,8 +92,8 @@ main(int argc, char *argv[]) struct ofproto *ofproto; struct ofsettings s; int error; - struct dpif *dpif; struct netflow_options nf_options; + const char *port; bool exiting; proctitle_init(argc, argv); @@ -103,7 +101,6 @@ main(int argc, char *argv[]) parse_options(argc, argv, &s); signal(SIGPIPE, SIG_IGN); - die_if_already_running(); daemonize_start(); /* Start listening for ovs-appctl requests. */ @@ -117,38 +114,32 @@ main(int argc, char *argv[]) VLOG_INFO("Open vSwitch version %s", VERSION BUILDNR); VLOG_INFO("OpenFlow protocol version 0x%02x", OFP_VERSION); - error = dpif_create_and_open(s.dp_name, s.dp_type, &dpif); + error = ofproto_create(s.dp_name, s.dp_type, &ofproto); if (error) { - ovs_fatal(error, "could not create datapath"); + VLOG_FATAL("could not initialize OpenFlow switch (%s)", + strerror(error)); } /* Add ports to the datapath if requested by the user. */ - if (s.ports.n) { - const char *port; - size_t i; + SSET_FOR_EACH (port, &s.ports) { + struct netdev *netdev; - SVEC_FOR_EACH (i, port, &s.ports) { - struct netdev *netdev; - - error = netdev_open_default(port, &netdev); - if (error) { - ovs_fatal(error, "%s: failed to open network device", port); - } - - error = dpif_port_add(dpif, netdev, NULL); - if (error) { - ovs_fatal(error, "failed to add %s as a port", port); - } + error = netdev_open_default(port, &netdev); + if (error) { + VLOG_FATAL("%s: failed to open network device (%s)", + port, strerror(error)); + } - netdev_close(netdev); + error = ofproto_port_add(ofproto, netdev, NULL); + if (error) { + VLOG_FATAL("failed to add %s as a port (%s)", + port, strerror(error)); } - } - /* Start OpenFlow processing. */ - error = ofproto_create(s.dp_name, s.dp_type, NULL, NULL, &ofproto); - if (error) { - ovs_fatal(error, "could not initialize openflow switch"); + netdev_close(netdev); } + + /* Configure OpenFlow switch. */ if (s.datapath_id) { ofproto_set_datapath_id(ofproto, s.datapath_id); } @@ -156,14 +147,15 @@ main(int argc, char *argv[]) s.serial_desc, s.dp_desc); error = ofproto_set_snoops(ofproto, &s.snoops); if (error) { - ovs_fatal(error, - "failed to configure controller snooping connections"); + VLOG_FATAL("failed to configure controller snooping connections (%s)", + strerror(error)); } 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"); + VLOG_FATAL("failed to configure NetFlow collectors (%s)", + strerror(error)); } ofproto_set_controllers(ofproto, s.controllers, s.n_controllers); ofproto_set_fail_mode(ofproto, s.fail_mode); @@ -174,15 +166,13 @@ main(int argc, char *argv[]) while (!exiting && (s.run_forever || ofproto_is_alive(ofproto))) { error = ofproto_run(ofproto); if (error) { - ovs_fatal(error, "unrecoverable datapath error"); + VLOG_FATAL("unrecoverable datapath error (%s)", strerror(error)); } unixctl_server_run(unixctl); - dp_run(); netdev_run(); ofproto_wait(ofproto); unixctl_server_wait(unixctl); - dp_wait(); netdev_wait(); if (exiting) { poll_immediate_wake(); @@ -190,7 +180,7 @@ main(int argc, char *argv[]) poll_block(); } - dpif_close(dpif); + ofproto_destroy(ofproto); return 0; } @@ -206,6 +196,21 @@ ovs_openflowd_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED, /* User interface. */ +/* Breaks 'ports' apart at commas and adds each resulting word to 'ports'. */ +static void +parse_ports(const char *s_, struct sset *ports) +{ + char *s = xstrdup(s_); + char *save_ptr = NULL; + char *token; + + for (token = strtok_r(s, ",", &save_ptr); token != NULL; + token = strtok_r(NULL, ",", &save_ptr)) { + sset_add(ports, token); + } + free(s); +} + static void parse_options(int argc, char *argv[], struct ofsettings *s) { @@ -216,8 +221,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s) OPT_SW_DESC, OPT_SERIAL_DESC, OPT_DP_DESC, - OPT_ACCEPT_VCONN, - OPT_NO_RESOLV_CONF, OPT_BR_NAME, OPT_FAIL_MODE, OPT_INACTIVITY_PROBE, @@ -238,45 +241,42 @@ parse_options(int argc, char *argv[], struct ofsettings *s) DAEMON_OPTION_ENUMS }; static struct option long_options[] = { - {"datapath-id", required_argument, 0, OPT_DATAPATH_ID}, - {"mfr-desc", required_argument, 0, OPT_MFR_DESC}, - {"hw-desc", required_argument, 0, OPT_HW_DESC}, - {"sw-desc", required_argument, 0, OPT_SW_DESC}, - {"serial-desc", required_argument, 0, OPT_SERIAL_DESC}, - {"dp-desc", required_argument, 0, OPT_DP_DESC}, - {"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN}, - {"no-resolv-conf", no_argument, 0, OPT_NO_RESOLV_CONF}, - {"config", required_argument, 0, 'F'}, - {"br-name", required_argument, 0, OPT_BR_NAME}, - {"fail", required_argument, 0, OPT_FAIL_MODE}, - {"inactivity-probe", required_argument, 0, OPT_INACTIVITY_PROBE}, - {"max-idle", required_argument, 0, OPT_MAX_IDLE}, - {"max-backoff", required_argument, 0, OPT_MAX_BACKOFF}, - {"listen", required_argument, 0, 'l'}, - {"snoop", required_argument, 0, OPT_SNOOP}, - {"rate-limit", optional_argument, 0, OPT_RATE_LIMIT}, - {"burst-limit", required_argument, 0, OPT_BURST_LIMIT}, - {"out-of-band", no_argument, 0, OPT_OUT_OF_BAND}, - {"in-band", no_argument, 0, OPT_IN_BAND}, - {"netflow", required_argument, 0, OPT_NETFLOW}, - {"ports", required_argument, 0, OPT_PORTS}, - {"unixctl", required_argument, 0, OPT_UNIXCTL}, - {"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY}, - {"verbose", optional_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"datapath-id", required_argument, NULL, OPT_DATAPATH_ID}, + {"mfr-desc", required_argument, NULL, OPT_MFR_DESC}, + {"hw-desc", required_argument, NULL, OPT_HW_DESC}, + {"sw-desc", required_argument, NULL, OPT_SW_DESC}, + {"serial-desc", required_argument, NULL, OPT_SERIAL_DESC}, + {"dp-desc", required_argument, NULL, OPT_DP_DESC}, + {"config", required_argument, NULL, 'F'}, + {"br-name", required_argument, NULL, OPT_BR_NAME}, + {"fail", required_argument, NULL, OPT_FAIL_MODE}, + {"inactivity-probe", required_argument, NULL, OPT_INACTIVITY_PROBE}, + {"max-idle", required_argument, NULL, OPT_MAX_IDLE}, + {"max-backoff", required_argument, NULL, OPT_MAX_BACKOFF}, + {"listen", required_argument, NULL, 'l'}, + {"snoop", required_argument, NULL, OPT_SNOOP}, + {"rate-limit", optional_argument, NULL, OPT_RATE_LIMIT}, + {"burst-limit", required_argument, NULL, OPT_BURST_LIMIT}, + {"out-of-band", no_argument, NULL, OPT_OUT_OF_BAND}, + {"in-band", no_argument, NULL, OPT_IN_BAND}, + {"netflow", required_argument, NULL, OPT_NETFLOW}, + {"ports", required_argument, NULL, OPT_PORTS}, + {"unixctl", required_argument, NULL, OPT_UNIXCTL}, + {"enable-dummy", no_argument, NULL, OPT_ENABLE_DUMMY}, + {"verbose", optional_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, -#ifdef HAVE_OPENSSL - STREAM_SSL_LONG_OPTIONS - {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, -#endif - {0, 0, 0, 0}, + STREAM_SSL_LONG_OPTIONS, + {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); struct ofproto_controller controller_opts; - struct svec controllers; + struct sset controllers; + const char *name; int i; /* Set defaults that we can figure out before parsing options. */ @@ -284,8 +284,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s) controller_opts.max_backoff = 8; controller_opts.probe_interval = 5; controller_opts.band = OFPROTO_IN_BAND; - controller_opts.accept_re = NULL; - controller_opts.update_resolv_conf = true; controller_opts.rate_limit = 0; controller_opts.burst_limit = 0; s->unixctl_path = NULL; @@ -296,11 +294,11 @@ parse_options(int argc, char *argv[], struct ofsettings *s) s->sw_desc = NULL; s->serial_desc = NULL; s->dp_desc = NULL; - svec_init(&controllers); - svec_init(&s->snoops); + sset_init(&controllers); + sset_init(&s->snoops); s->max_idle = 0; - svec_init(&s->netflow); - svec_init(&s->ports); + sset_init(&s->netflow); + sset_init(&s->ports); for (;;) { int c; @@ -312,8 +310,8 @@ parse_options(int argc, char *argv[], struct ofsettings *s) switch (c) { case OPT_DATAPATH_ID: if (!dpid_from_string(optarg, &s->datapath_id)) { - ovs_fatal(0, "argument to --datapath-id must be " - "exactly 16 hex digits and may not be all-zero"); + VLOG_FATAL("argument to --datapath-id must be exactly 16 hex " + "digits and may not be all-zero"); } break; @@ -337,14 +335,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s) s->dp_desc = optarg; break; - case OPT_ACCEPT_VCONN: - controller_opts.accept_re = optarg; - break; - - case OPT_NO_RESOLV_CONF: - controller_opts.update_resolv_conf = false; - break; - case OPT_FAIL_MODE: if (!strcmp(optarg, "open") || !strcmp(optarg, "standalone")) { s->fail_mode = OFPROTO_FAIL_STANDALONE; @@ -352,15 +342,15 @@ parse_options(int argc, char *argv[], struct ofsettings *s) || !strcmp(optarg, "secure")) { s->fail_mode = OFPROTO_FAIL_SECURE; } else { - ovs_fatal(0, "--fail argument must be \"standalone\" " - "or \"secure\""); + VLOG_FATAL("--fail argument must be \"standalone\" " + "or \"secure\""); } break; case OPT_INACTIVITY_PROBE: controller_opts.probe_interval = atoi(optarg); if (controller_opts.probe_interval < 5) { - ovs_fatal(0, "--inactivity-probe argument must be at least 5"); + VLOG_FATAL("--inactivity-probe argument must be at least 5"); } break; @@ -370,8 +360,8 @@ parse_options(int argc, char *argv[], struct ofsettings *s) } else { s->max_idle = atoi(optarg); if (s->max_idle < 1 || s->max_idle > 65535) { - ovs_fatal(0, "--max-idle argument must be between 1 and " - "65535 or the word 'permanent'"); + VLOG_FATAL("--max-idle argument must be between 1 and " + "65535 or the word 'permanent'"); } } break; @@ -379,7 +369,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) case OPT_MAX_BACKOFF: controller_opts.max_backoff = atoi(optarg); if (controller_opts.max_backoff < 1) { - ovs_fatal(0, "--max-backoff argument must be at least 1"); + VLOG_FATAL("--max-backoff argument must be at least 1"); } else if (controller_opts.max_backoff > 3600) { controller_opts.max_backoff = 3600; } @@ -389,7 +379,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) if (optarg) { controller_opts.rate_limit = atoi(optarg); if (controller_opts.rate_limit < 1) { - ovs_fatal(0, "--rate-limit argument must be at least 1"); + VLOG_FATAL("--rate-limit argument must be at least 1"); } } else { controller_opts.rate_limit = 1000; @@ -399,7 +389,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) case OPT_BURST_LIMIT: controller_opts.burst_limit = atoi(optarg); if (controller_opts.burst_limit < 1) { - ovs_fatal(0, "--burst-limit argument must be at least 1"); + VLOG_FATAL("--burst-limit argument must be at least 1"); } break; @@ -412,19 +402,19 @@ parse_options(int argc, char *argv[], struct ofsettings *s) break; case OPT_NETFLOW: - svec_add(&s->netflow, optarg); + sset_add(&s->netflow, optarg); break; case 'l': - svec_add(&controllers, optarg); + sset_add(&controllers, optarg); break; case OPT_SNOOP: - svec_add(&s->snoops, optarg); + sset_add(&s->snoops, optarg); break; case OPT_PORTS: - svec_split(&s->ports, optarg, ","); + parse_ports(optarg, &s->ports); break; case OPT_UNIXCTL: @@ -448,13 +438,11 @@ parse_options(int argc, char *argv[], struct ofsettings *s) LEAK_CHECKER_OPTION_HANDLERS -#ifdef HAVE_OPENSSL STREAM_SSL_OPTION_HANDLERS case OPT_BOOTSTRAP_CA_CERT: stream_ssl_set_ca_cert_file(optarg, true); break; -#endif case '?': exit(EXIT_FAILURE); @@ -467,15 +455,9 @@ parse_options(int argc, char *argv[], struct ofsettings *s) argc -= optind; argv += optind; - if (argc < 1) { - ovs_fatal(0, "need at least one non-option arguments; " - "use --help for usage"); - } - - /* Set accept_controller_regex. */ - if (!controller_opts.accept_re) { - controller_opts.accept_re - = stream_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*"; + if (argc < 2) { + VLOG_FATAL("need at least two non-option arguments; " + "use --help for usage"); } /* Rate limiting. */ @@ -485,53 +467,42 @@ parse_options(int argc, char *argv[], struct ofsettings *s) } /* Local vconns. */ - dp_parse_name(argv[0], &s->dp_name, &s->dp_type); + ofproto_parse_name(argv[0], &s->dp_name, &s->dp_type); /* Figure out controller names. */ s->run_forever = false; - if (!controllers.n) { - svec_add_nocopy(&controllers, xasprintf("punix:%s/%s.mgmt", - ovs_rundir(), s->dp_name)); + if (sset_is_empty(&controllers)) { + sset_add_and_free(&controllers, xasprintf("punix:%s/%s.mgmt", + ovs_rundir(), s->dp_name)); } for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "none")) { s->run_forever = true; } else { - svec_add(&controllers, argv[i]); + sset_add(&controllers, argv[i]); } } - if (argc < 2) { - svec_add(&controllers, "discover"); - } /* Set up controllers. */ - s->n_controllers = controllers.n; + s->n_controllers = sset_count(&controllers); s->controllers = xmalloc(s->n_controllers * sizeof *s->controllers); - for (i = 0; i < s->n_controllers; i++) { + i = 0; + SSET_FOR_EACH (name, &controllers) { s->controllers[i] = controller_opts; - s->controllers[i].target = controllers.names[i]; - } - - /* Sanity check. */ - if (controller_opts.band == OFPROTO_OUT_OF_BAND) { - for (i = 0; i < s->n_controllers; i++) { - if (!strcmp(s->controllers[i].target, "discover")) { - ovs_fatal(0, "Cannot perform discovery with out-of-band " - "control"); - } - } + s->controllers[i].target = xstrdup(name); + i++; } + sset_destroy(&controllers); } static void usage(void) { printf("%s: an OpenFlow switch implementation.\n" - "usage: %s [OPTIONS] [TYPE@]DATAPATH [CONTROLLER...]\n" + "usage: %s [OPTIONS] [TYPE@]DATAPATH CONTROLLER...\n" "where DATAPATH is a local datapath (e.g. \"dp0\")\n" "optionally with an explicit TYPE (default: \"system\").\n" - "Each CONTROLLER is an active OpenFlow connection method. If\n" - "none is given, ovs-openflowd performs controller discovery.\n", + "Each CONTROLLER is an active OpenFlow connection method.\n", program_name, program_name); vconn_usage(true, true, true); printf("\nOpenFlow options:\n" @@ -542,9 +513,6 @@ usage(void) " --sw-desc=SW Identify software as SW\n" " --serial-desc=SERIAL Identify serial number as SERIAL\n" " --dp-desc=DP_DESC Identify dp description as DP_DESC\n" - "\nController discovery options:\n" - " --accept-vconn=REGEX accept matching discovered controllers\n" - " --no-resolv-conf do not update /etc/resolv.conf\n" "\nNetworking options:\n" " --fail=open|closed when controller connection fails:\n" " closed: drop all packets\n"