X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=secchan%2Fsecchan.c;h=0f55cde969111a0a44b65f5101b481c9a51e1542;hb=bf3e7788448e29623478687651b4210772f9e8c7;hp=155dfa9eef98b33399733ce47b43bd971aefbf8a;hpb=a14c841f32358e665b19b419c91c1f711e4b0431;p=sliver-openvswitch.git diff --git a/secchan/secchan.c b/secchan/secchan.c index 155dfa9ee..0f55cde96 100644 --- a/secchan/secchan.c +++ b/secchan/secchan.c @@ -1,6 +1,6 @@ /* Copyright (c) 2008 The Board of Trustees of The Leland Stanford * Junior University - * + * * We are making the OpenFlow specification and associated documentation * (Software) available for public use and benefit with the expectation * that others will use, modify and enhance the Software and contribute @@ -13,10 +13,10 @@ * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -25,106 +25,222 @@ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * + * * The name and trademarks of copyright holder(s) may NOT be used in * advertising or publicity pertaining to the Software or any * derivatives without specific, written prior permission. */ +#include +#include "secchan.h" +#include #include #include -#include +#include #include +#include #include -#include -#include -#include "buffer.h" #include "command-line.h" #include "compiler.h" +#include "daemon.h" +#include "dirs.h" +#include "discovery.h" +#include "executer.h" +#include "fail-open.h" #include "fault.h" +#include "in-band.h" #include "list.h" -#include "util.h" -#include "rconn.h" -#include "vconn-ssl.h" -#include "vlog-socket.h" +#include "ofpbuf.h" #include "openflow.h" +#include "packets.h" +#include "port-watcher.h" #include "poll-loop.h" +#include "ratelimit.h" +#include "rconn.h" +#ifdef SUPPORT_SNAT +#include "snat.h" +#endif +#include "stp-secchan.h" +#include "status.h" +#include "timeval.h" +#include "util.h" +#include "vconn-ssl.h" #include "vconn.h" +#include "vlog-socket.h" #include "vlog.h" #define THIS_MODULE VLM_secchan -static void parse_options(int argc, char *argv[]); -static void usage(void) NO_RETURN; - -static struct vconn *listen_vconn = NULL; - -struct half { - struct rconn *rconn; - struct buffer *rxbuf; +struct hook { + const struct hook_class *class; + void *aux; }; -struct relay { - struct list node; - struct half halves[2]; +struct secchan { + struct hook *hooks; + size_t n_hooks, allocated_hooks; }; -static struct list relays = LIST_INITIALIZER(&relays); +static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(60, 60); + +static void parse_options(int argc, char *argv[], struct settings *); +static void usage(void) NO_RETURN; -static void new_management_connection(const char *nl_name, struct vconn *new_remote); -static void relay_create(struct rconn *, struct rconn *); -static void relay_run(struct relay *); +static struct pvconn *open_passive_vconn(const char *name); +static struct vconn *accept_vconn(struct pvconn *pvconn); + +static struct relay *relay_create(struct rconn *local, struct rconn *remote, + bool is_mgmt_conn); +static struct relay *relay_accept(const struct settings *, struct pvconn *); +static void relay_run(struct relay *, struct secchan *); static void relay_wait(struct relay *); static void relay_destroy(struct relay *); int main(int argc, char *argv[]) { - const char *nl_name; + struct settings s; + + struct list relays = LIST_INITIALIZER(&relays); + + struct secchan secchan; + + struct pvconn *monitor; + + struct pvconn *listeners[MAX_MGMT]; + size_t n_listeners; + + struct rconn *local_rconn, *remote_rconn; + struct relay *controller_relay; + struct discovery *discovery; + struct switch_status *switch_status; + struct port_watcher *pw; + int i; int retval; set_program_name(argv[0]); register_fault_handlers(); + time_init(); vlog_init(); - parse_options(argc, argv); + parse_options(argc, argv, &s); + signal(SIGPIPE, SIG_IGN); - if (argc - optind != 2) { - fatal(0, - "need exactly two non-option arguments; use --help for usage"); - } - nl_name = argv[optind]; - if (strncmp(nl_name, "nl:", 3) - || strlen(nl_name) < 4 - || nl_name[strspn(nl_name + 3, "0123456789") + 3]) { - fatal(0, "%s: argument is not of the form \"nl:DP_ID\"", nl_name); + secchan.hooks = NULL; + secchan.n_hooks = 0; + secchan.allocated_hooks = 0; + + /* Start listening for management and monitoring connections. */ + n_listeners = 0; + for (i = 0; i < s.n_listeners; i++) { + listeners[n_listeners++] = open_passive_vconn(s.listener_names[i]); } + monitor = s.monitor_name ? open_passive_vconn(s.monitor_name) : NULL; + + /* Initialize switch status hook. */ + switch_status_start(&secchan, &s, &switch_status); + /* Start listening for vlogconf requests. */ retval = vlog_server_listen(NULL, NULL); if (retval) { - fatal(retval, "Could not listen for vlog connections"); + ofp_fatal(retval, "Could not listen for vlog connections"); + } + + die_if_already_running(); + daemonize(); + + VLOG_WARN("OpenFlow reference implementation version %s", VERSION); + VLOG_WARN("OpenFlow protocol version 0x%02x", OFP_VERSION); + + /* Connect to datapath. */ + if (strncmp(s.dp_name, "nl:", 3) && strncmp(s.dp_name, "unix:", 5) + && !s.controller_name) { + VLOG_WARN("Controller not specified and datapath is not nl: or " + "unix:. (Did you forget to specify the datapath?)"); + } + local_rconn = rconn_create(0, s.max_backoff); + rconn_connect(local_rconn, s.dp_name); + switch_status_register_category(switch_status, "local", + rconn_status_cb, local_rconn); + + /* Connect to controller. */ + remote_rconn = rconn_create(s.probe_interval, s.max_backoff); + if (s.controller_name) { + retval = rconn_connect(remote_rconn, s.controller_name); + if (retval == EAFNOSUPPORT) { + ofp_fatal(0, "No support for %s vconn", s.controller_name); + } + } + switch_status_register_category(switch_status, "remote", + rconn_status_cb, remote_rconn); + + /* Start relaying. */ + controller_relay = relay_create(local_rconn, remote_rconn, false); + list_push_back(&relays, &controller_relay->node); + + /* Set up hooks. */ + port_watcher_start(&secchan, local_rconn, remote_rconn, &pw); + discovery = s.discovery ? discovery_init(&s, pw, switch_status) : NULL; +#ifdef SUPPORT_SNAT + snat_start(&secchan, pw); +#endif + if (s.enable_stp) { + stp_start(&secchan, &s, pw, local_rconn, remote_rconn); + } + if (s.in_band) { + in_band_start(&secchan, &s, switch_status, pw, remote_rconn); + } + if (s.fail_mode == FAIL_OPEN) { + fail_open_start(&secchan, &s, switch_status, + local_rconn, remote_rconn); + } + if (s.rate_limit) { + rate_limit_start(&secchan, &s, switch_status, + local_rconn, remote_rconn); + } + if (s.command_acl[0]) { + executer_start(&secchan, &s); } - relay_create(rconn_new(argv[optind], 1), rconn_new(argv[optind + 1], 1)); for (;;) { struct relay *r, *n; + size_t i; /* Do work. */ LIST_FOR_EACH_SAFE (r, n, struct relay, node, &relays) { - relay_run(r); + relay_run(r, &secchan); } - if (listen_vconn) { - struct vconn *new_remote; + for (i = 0; i < n_listeners; i++) { for (;;) { - retval = vconn_accept(listen_vconn, &new_remote); - if (retval) { - if (retval != EAGAIN) { - VLOG_WARN("accept failed (%s)", strerror(retval)); - } + struct relay *r = relay_accept(&s, listeners[i]); + if (!r) { break; } - - new_management_connection(nl_name, new_remote); + list_push_back(&relays, &r->node); + } + } + if (monitor) { + struct vconn *new = accept_vconn(monitor); + if (new) { + rconn_add_monitor(local_rconn, new); + } + } + for (i = 0; i < secchan.n_hooks; i++) { + if (secchan.hooks[i].class->periodic_cb) { + secchan.hooks[i].class->periodic_cb(secchan.hooks[i].aux); + } + } + if (s.discovery) { + char *controller_name; + if (rconn_is_connectivity_questionable(remote_rconn)) { + discovery_question_connectivity(discovery); + } + if (discovery_run(discovery, &controller_name)) { + if (controller_name) { + rconn_connect(remote_rconn, controller_name); + } else { + rconn_disconnect(remote_rconn); + } } } @@ -132,8 +248,19 @@ main(int argc, char *argv[]) LIST_FOR_EACH (r, struct relay, node, &relays) { relay_wait(r); } - if (listen_vconn) { - vconn_accept_wait(listen_vconn); + for (i = 0; i < n_listeners; i++) { + pvconn_wait(listeners[i]); + } + if (monitor) { + pvconn_wait(monitor); + } + for (i = 0; i < secchan.n_hooks; i++) { + if (secchan.hooks[i].class->wait_cb) { + secchan.hooks[i].class->wait_cb(secchan.hooks[i].aux); + } + } + if (discovery) { + discovery_wait(discovery); } poll_block(); } @@ -141,52 +268,168 @@ main(int argc, char *argv[]) return 0; } -static void -new_management_connection(const char *nl_name, struct vconn *new_remote) +static struct pvconn * +open_passive_vconn(const char *name) +{ + struct pvconn *pvconn; + int retval; + + retval = pvconn_open(name, &pvconn); + if (retval && retval != EAGAIN) { + ofp_fatal(retval, "opening %s", name); + } + return pvconn; +} + +static struct vconn * +accept_vconn(struct pvconn *pvconn) +{ + struct vconn *new; + int retval; + + retval = pvconn_accept(pvconn, OFP_VERSION, &new); + if (retval && retval != EAGAIN) { + VLOG_WARN_RL(&rl, "accept failed (%s)", strerror(retval)); + } + return new; +} + +void +add_hook(struct secchan *secchan, const struct hook_class *class, void *aux) { - char *nl_name_without_subscription; - struct vconn *new_local; + struct hook *hook; + + if (secchan->n_hooks >= secchan->allocated_hooks) { + secchan->allocated_hooks = secchan->allocated_hooks * 2 + 1; + secchan->hooks = xrealloc(secchan->hooks, + (sizeof *secchan->hooks + * secchan->allocated_hooks)); + } + hook = &secchan->hooks[secchan->n_hooks++]; + hook->class = class; + hook->aux = aux; +} + +struct ofp_packet_in * +get_ofp_packet_in(struct relay *r) +{ + struct ofpbuf *msg = r->halves[HALF_LOCAL].rxbuf; + struct ofp_header *oh = msg->data; + if (oh->type == OFPT_PACKET_IN) { + if (msg->size >= offsetof (struct ofp_packet_in, data)) { + return msg->data; + } else { + VLOG_WARN("packet too short (%zu bytes) for packet_in", + msg->size); + } + } + return NULL; +} + +bool +get_ofp_packet_eth_header(struct relay *r, struct ofp_packet_in **opip, + struct eth_header **ethp) +{ + const int min_len = offsetof(struct ofp_packet_in, data) + ETH_HEADER_LEN; + struct ofp_packet_in *opi = get_ofp_packet_in(r); + if (opi && ntohs(opi->header.length) >= min_len) { + *opip = opi; + *ethp = (void *) opi->data; + return true; + } + return false; +} + +/* OpenFlow message relaying. */ + +static struct relay * +relay_accept(const struct settings *s, struct pvconn *pvconn) +{ + struct vconn *new_remote, *new_local; struct rconn *r1, *r2; + char *vconn_name; + int nl_index; int retval; - /* nl:123 or nl:123:1 opens a netlink connection to local datapath 123. We - * only accept the former syntax in main(). - * - * nl:123:0 opens a netlink connection to local datapath 123 without - * obtaining a subscription for ofp_packet_in or ofp_flow_expired - * messages.*/ - nl_name_without_subscription = xasprintf("%s:0", nl_name); - retval = vconn_open(nl_name_without_subscription, &new_local); + new_remote = accept_vconn(pvconn); + if (!new_remote) { + return NULL; + } + + if (sscanf(s->dp_name, "nl:%d", &nl_index) == 1) { + /* nl:123 or nl:123:1 opens a netlink connection to local datapath 123. + * nl:123:0 opens a netlink connection to local datapath 123 without + * obtaining a subscription for ofp_packet_in or ofp_flow_expired + * messages. That's what we want here; management connections should + * not receive those messages, at least by default. */ + vconn_name = xasprintf("nl:%d:0", nl_index); + } else { + /* We don't have a way to specify not to subscribe to those messages + * for other transports. (That's a defect: really this should be in + * the OpenFlow protocol, not the Netlink transport). */ + VLOG_WARN_RL(&rl, "new management connection will receive " + "asynchronous messages"); + vconn_name = xstrdup(s->dp_name); + } + + retval = vconn_open(vconn_name, OFP_VERSION, &new_local); if (retval) { - VLOG_ERR("could not connect to %s (%s)", - nl_name_without_subscription, strerror(retval)); + VLOG_ERR_RL(&rl, "could not connect to %s (%s)", + vconn_name, strerror(retval)); vconn_close(new_remote); - return; + free(vconn_name); + return NULL; } - free(nl_name_without_subscription); - /* Add it to the relay list. */ - r1 = rconn_new_from_vconn(nl_name_without_subscription, 1, new_local); - r2 = rconn_new_from_vconn("passive", 1, new_remote); - relay_create(r1, r2); + /* Create and return relay. */ + r1 = rconn_create(0, 0); + rconn_connect_unreliably(r1, vconn_name, new_local); + free(vconn_name); + + r2 = rconn_create(0, 0); + rconn_connect_unreliably(r2, "passive", new_remote); + + return relay_create(r1, r2, true); } -static void -relay_create(struct rconn *a, struct rconn *b) +static struct relay * +relay_create(struct rconn *local, struct rconn *remote, bool is_mgmt_conn) { - struct relay *r; - int i; + struct relay *r = xcalloc(1, sizeof *r); + r->halves[HALF_LOCAL].rconn = local; + r->halves[HALF_REMOTE].rconn = remote; + r->is_mgmt_conn = is_mgmt_conn; + return r; +} - r = xmalloc(sizeof *r); - for (i = 0; i < 2; i++) { - r->halves[i].rconn = i ? b : a; - r->halves[i].rxbuf = NULL; +static bool +call_local_packet_cbs(struct secchan *secchan, struct relay *r) +{ + const struct hook *h; + for (h = secchan->hooks; h < &secchan->hooks[secchan->n_hooks]; h++) { + bool (*cb)(struct relay *, void *aux) = h->class->local_packet_cb; + if (cb && (cb)(r, h->aux)) { + return true; + } + } + return false; +} + +static bool +call_remote_packet_cbs(struct secchan *secchan, struct relay *r) +{ + const struct hook *h; + for (h = secchan->hooks; h < &secchan->hooks[secchan->n_hooks]; h++) { + bool (*cb)(struct relay *, void *aux) = h->class->remote_packet_cb; + if (cb && (cb)(r, h->aux)) { + return true; + } } - list_push_back(&relays, &r->node); + return false; } static void -relay_run(struct relay *r) +relay_run(struct relay *r, struct secchan *secchan) { int iteration; int i; @@ -204,15 +447,29 @@ relay_run(struct relay *r) if (!this->rxbuf) { this->rxbuf = rconn_recv(this->rconn); + if (this->rxbuf && (i == HALF_REMOTE || !r->is_mgmt_conn)) { + if (i == HALF_LOCAL + ? call_local_packet_cbs(secchan, r) + : call_remote_packet_cbs(secchan, r)) + { + ofpbuf_delete(this->rxbuf); + this->rxbuf = NULL; + progress = true; + break; + } + } } - if (this->rxbuf) { - int retval = rconn_send(peer->rconn, this->rxbuf); + if (this->rxbuf && !this->n_txq) { + int retval = rconn_send(peer->rconn, this->rxbuf, + &this->n_txq); if (retval != EAGAIN) { - this->rxbuf = NULL; if (!retval) { progress = true; + } else { + ofpbuf_delete(this->rxbuf); } + this->rxbuf = NULL; } } } @@ -221,11 +478,13 @@ relay_run(struct relay *r) } } - for (i = 0; i < 2; i++) { - struct half *this = &r->halves[i]; - if (!rconn_is_alive(this->rconn)) { - relay_destroy(r); - return; + if (r->is_mgmt_conn) { + for (i = 0; i < 2; i++) { + struct half *this = &r->halves[i]; + if (!rconn_is_alive(this->rconn)) { + relay_destroy(r); + return; + } } } } @@ -254,30 +513,80 @@ relay_destroy(struct relay *r) for (i = 0; i < 2; i++) { struct half *this = &r->halves[i]; rconn_destroy(this->rconn); - buffer_delete(this->rxbuf); + ofpbuf_delete(this->rxbuf); } free(r); } + +/* User interface. */ static void -parse_options(int argc, char *argv[]) +parse_options(int argc, char *argv[], struct settings *s) { + enum { + OPT_ACCEPT_VCONN = UCHAR_MAX + 1, + OPT_NO_RESOLV_CONF, + OPT_INACTIVITY_PROBE, + OPT_MAX_IDLE, + OPT_MAX_BACKOFF, + OPT_RATE_LIMIT, + OPT_BURST_LIMIT, + OPT_BOOTSTRAP_CA_CERT, + OPT_STP, + OPT_NO_STP, + OPT_OUT_OF_BAND, + OPT_IN_BAND, + OPT_COMMAND_ACL, + OPT_COMMAND_DIR, + VLOG_OPTION_ENUMS + }; static struct option long_options[] = { + {"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN}, + {"no-resolv-conf", no_argument, 0, OPT_NO_RESOLV_CONF}, + {"fail", required_argument, 0, 'F'}, + {"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'}, + {"monitor", required_argument, 0, 'm'}, + {"rate-limit", optional_argument, 0, OPT_RATE_LIMIT}, + {"burst-limit", required_argument, 0, OPT_BURST_LIMIT}, + {"stp", no_argument, 0, OPT_STP}, + {"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}, {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, + DAEMON_LONG_OPTIONS, + VLOG_LONG_OPTIONS, #ifdef HAVE_OPENSSL - {"private-key", required_argument, 0, 'p'}, - {"certificate", required_argument, 0, 'c'}, - {"ca-cert", required_argument, 0, 'C'}, + VCONN_SSL_LONG_OPTIONS + {"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); - + char *accept_re = NULL; + int retval; + + /* Set defaults that we can figure out before parsing options. */ + s->n_listeners = 0; + s->monitor_name = NULL; + s->fail_mode = FAIL_OPEN; + s->max_idle = 15; + s->probe_interval = 15; + s->max_backoff = 15; + s->update_resolv_conf = true; + s->rate_limit = 0; + s->burst_limit = 0; + s->enable_stp = false; + s->in_band = true; + s->command_acl = ""; + s->command_dir = xasprintf("%s/commands", ofp_pkgdatadir); for (;;) { - int retval; int c; c = getopt_long(argc, argv, short_options, long_options, NULL); @@ -286,17 +595,111 @@ parse_options(int argc, char *argv[]) } switch (c) { - case 'l': - if (listen_vconn) { - fatal(0, "-l or --listen may be only specified once"); + case OPT_ACCEPT_VCONN: + accept_re = optarg[0] == '^' ? optarg : xasprintf("^%s", optarg); + break; + + case OPT_NO_RESOLV_CONF: + s->update_resolv_conf = false; + break; + + case 'F': + if (!strcmp(optarg, "open")) { + s->fail_mode = FAIL_OPEN; + } else if (!strcmp(optarg, "closed")) { + s->fail_mode = FAIL_CLOSED; + } else { + ofp_fatal(0, "-f or --fail argument must be \"open\" " + "or \"closed\""); + } + break; + + case OPT_INACTIVITY_PROBE: + s->probe_interval = atoi(optarg); + if (s->probe_interval < 5) { + ofp_fatal(0, "--inactivity-probe argument must be at least 5"); + } + break; + + case OPT_MAX_IDLE: + if (!strcmp(optarg, "permanent")) { + s->max_idle = OFP_FLOW_PERMANENT; + } else { + s->max_idle = atoi(optarg); + if (s->max_idle < 1 || s->max_idle > 65535) { + ofp_fatal(0, "--max-idle argument must be between 1 and " + "65535 or the word 'permanent'"); + } + } + break; + + case OPT_MAX_BACKOFF: + s->max_backoff = atoi(optarg); + if (s->max_backoff < 1) { + ofp_fatal(0, "--max-backoff argument must be at least 1"); + } else if (s->max_backoff > 3600) { + s->max_backoff = 3600; + } + break; + + case OPT_RATE_LIMIT: + if (optarg) { + s->rate_limit = atoi(optarg); + if (s->rate_limit < 1) { + ofp_fatal(0, "--rate-limit argument must be at least 1"); + } + } else { + s->rate_limit = 1000; } - retval = vconn_open(optarg, &listen_vconn); - if (retval && retval != EAGAIN) { - fatal(retval, "opening %s", optarg); + break; + + case OPT_BURST_LIMIT: + s->burst_limit = atoi(optarg); + if (s->burst_limit < 1) { + ofp_fatal(0, "--burst-limit argument must be at least 1"); } - if (!vconn_is_passive(listen_vconn)) { - fatal(0, "%s is not a passive vconn", optarg); + break; + + case OPT_STP: + s->enable_stp = true; + break; + + case OPT_NO_STP: + s->enable_stp = false; + break; + + case OPT_OUT_OF_BAND: + s->in_band = false; + break; + + case OPT_IN_BAND: + 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 'l': + if (s->n_listeners >= MAX_MGMT) { + ofp_fatal(0, + "-l or --listen may be specified at most %d times", + MAX_MGMT); } + s->listener_names[s->n_listeners++] = optarg; + break; + + case 'm': + if (s->monitor_name) { + ofp_fatal(0, "-m or --monitor may only be specified once"); + } + s->monitor_name = optarg; break; case 'h': @@ -306,21 +709,15 @@ parse_options(int argc, char *argv[]) printf("%s "VERSION" compiled "__DATE__" "__TIME__"\n", argv[0]); exit(EXIT_SUCCESS); - case 'v': - vlog_set_verbosity(optarg); - break; + DAEMON_OPTION_HANDLERS -#ifdef HAVE_OPENSSL - case 'p': - vconn_ssl_set_private_key_file(optarg); - break; + VLOG_OPTION_HANDLERS - case 'c': - vconn_ssl_set_certificate_file(optarg); - break; +#ifdef HAVE_OPENSSL + VCONN_SSL_OPTION_HANDLERS - case 'C': - vconn_ssl_set_ca_cert_file(optarg); + case OPT_BOOTSTRAP_CA_CERT: + vconn_ssl_set_ca_cert_file(optarg, true); break; #endif @@ -332,21 +729,90 @@ parse_options(int argc, char *argv[]) } } free(short_options); + + argc -= optind; + argv += optind; + if (argc < 1 || argc > 2) { + ofp_fatal(0, "need one or two non-option arguments; " + "use --help for usage"); + } + + /* Local and remote vconns. */ + s->dp_name = argv[0]; + s->controller_name = argc > 1 ? xstrdup(argv[1]) : NULL; + + /* Set accept_controller_regex. */ + if (!accept_re) { + accept_re = vconn_ssl_is_configured() ? "^ssl:.*" : ".*"; + } + retval = regcomp(&s->accept_controller_regex, accept_re, + REG_NOSUB | REG_EXTENDED); + if (retval) { + size_t length = regerror(retval, &s->accept_controller_regex, NULL, 0); + char *buffer = xmalloc(length); + regerror(retval, &s->accept_controller_regex, buffer, length); + ofp_fatal(0, "%s: %s", accept_re, buffer); + } + s->accept_controller_re = accept_re; + + /* Mode of operation. */ + s->discovery = s->controller_name == NULL; + if (s->discovery && !s->in_band) { + ofp_fatal(0, "Cannot perform discovery with out-of-band control"); + } + + /* Rate limiting. */ + if (s->rate_limit) { + if (s->rate_limit < 100) { + VLOG_WARN("Rate limit set to unusually low value %d", + s->rate_limit); + } + if (!s->burst_limit) { + s->burst_limit = s->rate_limit / 4; + } + s->burst_limit = MAX(s->burst_limit, 1); + s->burst_limit = MIN(s->burst_limit, INT_MAX / 1000); + } } static void usage(void) { - printf("%s: Secure Channel, a relay for OpenFlow messages.\n" - "usage: %s [OPTIONS] LOCAL REMOTE\n" - "where LOCAL and REMOTE are active OpenFlow connection methods.\n", + printf("%s: secure channel, a relay for OpenFlow messages.\n" + "usage: %s [OPTIONS] nl:DP_IDX [CONTROLLER]\n" + "where nl:DP_IDX is a datapath that has been added with dpctl.\n" + "CONTROLLER is an active OpenFlow connection method; if it is\n" + "omitted, then secchan performs controller discovery.\n", program_name, program_name); - vconn_usage(true, true); - printf("\nNetworking options:\n" + vconn_usage(true, true, true); + printf("\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" + " -F, --fail=open|closed when controller connection fails:\n" + " closed: drop all packets\n" + " open (default): act as learning switch\n" + " --inactivity-probe=SECS time between inactivity probes\n" + " --max-idle=SECS max idle for flows set up by secchan\n" + " --max-backoff=SECS max time between controller connection\n" + " attempts (default: 15 seconds)\n" " -l, --listen=METHOD allow management connections on METHOD\n" " (a passive OpenFlow connection method)\n" - "\nOther options:\n" - " -v, --verbose set maximum verbosity level\n" + " -m, --monitor=METHOD copy traffic to/from kernel to METHOD\n" + " (a passive OpenFlow connection method)\n" + " --out-of-band controller connection is out-of-band\n" + " --stp enable 802.1D Spanning Tree Protocol\n" + " --no-stp disable 802.1D Spanning Tree Protocol\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", + ofp_pkgdatadir); + daemon_usage(); + vlog_usage(); + printf("\nOther options:\n" " -h, --help display this help message\n" " -V, --version display version information\n"); exit(EXIT_SUCCESS);