X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=cb70e4f77b5be4eda782b3655b460ac8274f4be8;hb=8cf07a5901d7dc1aa3daebc83e58d715e0ad0200;hp=423ce1955869d2fbb0064118d6c93970302013a7;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=sliver-openvswitch.git diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 423ce1955..cb70e4f77 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -1,17 +1,17 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include @@ -21,25 +21,27 @@ #include #include #include +#include #include #include "command-line.h" #include "compiler.h" #include "daemon.h" -#include "fault.h" #include "learning-switch.h" +#include "ofp-parse.h" #include "ofpbuf.h" #include "openflow/openflow.h" #include "poll-loop.h" #include "rconn.h" +#include "shash.h" +#include "stream-ssl.h" #include "timeval.h" #include "unixctl.h" #include "util.h" -#include "vconn-ssl.h" #include "vconn.h" - #include "vlog.h" -#define THIS_MODULE VLM_controller + +VLOG_DEFINE_THIS_MODULE(controller); #define MAX_SWITCHES 16 #define MAX_LISTENERS 16 @@ -49,17 +51,42 @@ struct switch_ { struct rconn *rconn; }; -/* Learn the ports on which MAC addresses appear? */ +/* -H, --hub: Learn the ports on which MAC addresses appear? */ static bool learn_macs = true; -/* Set up flows? (If not, every packet is processed at the controller.) */ -static bool setup_flows = true; +/* -n, --noflow: Set up flows? (If not, every packet is processed at the + * controller.) */ +static bool set_up_flows = true; + +/* -N, --normal: Use "NORMAL" action instead of explicit port? */ +static bool action_normal = false; + +/* -w, --wildcard: 0 to disable wildcard flow entries, a OFPFW_* bitmask to + * enable specific wildcards, or UINT32_MAX to use the default wildcards. */ +static uint32_t wildcards = 0; /* --max-idle: Maximum idle time, in seconds, before flows expire. */ static int max_idle = 60; +/* --mute: If true, accept connections from switches but do not reply to any + * of their messages (for debugging fail-open mode). */ +static bool mute = false; + +/* -q, --queue: default OpenFlow queue, none if UINT32_MAX. */ +static uint32_t default_queue = UINT32_MAX; + +/* -Q, --port-queue: map from port name to port number (cast to void *). */ +static struct shash port_queues = SHASH_INITIALIZER(&port_queues); + +/* --with-flows: Flows to send to switch, or an empty list not to send any + * default flows. */ +static struct list default_flows = LIST_INITIALIZER(&default_flows); + +/* --unixctl: Name of unixctl socket, or null to use the default. */ +static char *unixctl_path = NULL; + static int do_switching(struct switch_ *); -static void new_switch(struct switch_ *, struct vconn *, const char *name); +static void new_switch(struct switch_ *, struct vconn *); static void parse_options(int argc, char *argv[]); static void usage(void) NO_RETURN; @@ -73,10 +100,8 @@ main(int argc, char *argv[]) int retval; int i; + proctitle_init(argc, argv); set_program_name(argv[0]); - register_fault_handlers(); - time_init(); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); @@ -89,14 +114,13 @@ main(int argc, char *argv[]) for (i = optind; i < argc; i++) { const char *name = argv[i]; struct vconn *vconn; - int retval; retval = vconn_open(name, OFP_VERSION, &vconn); if (!retval) { if (n_switches >= MAX_SWITCHES) { ovs_fatal(0, "max %d switch connections", n_switches); } - new_switch(&switches[n_switches++], vconn, name); + new_switch(&switches[n_switches++], vconn); continue; } else if (retval == EAFNOSUPPORT) { struct pvconn *pvconn; @@ -116,27 +140,26 @@ main(int argc, char *argv[]) ovs_fatal(0, "no active or passive switch connections"); } - die_if_already_running(); - daemonize(); + daemonize_start(); - retval = unixctl_server_create(NULL, &unixctl); + retval = unixctl_server_create(unixctl_path, &unixctl); if (retval) { - ovs_fatal(retval, "Could not listen for unixctl connections"); + exit(EXIT_FAILURE); } + daemonize_complete(); + while (n_switches > 0 || n_listeners > 0) { int iteration; - int i; /* Accept connections on listening vconns. */ for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) { struct vconn *new_vconn; - int retval; retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn); if (!retval || retval == EAGAIN) { if (!retval) { - new_switch(&switches[n_switches++], new_vconn, "tcp"); + new_switch(&switches[n_switches++], new_vconn); } i++; } else { @@ -151,7 +174,8 @@ main(int argc, char *argv[]) bool progress = false; for (i = 0; i < n_switches; ) { struct switch_ *this = &switches[i]; - int retval = do_switching(this); + + retval = do_switching(this); if (!retval || retval == EAGAIN) { if (!retval) { progress = true; @@ -169,7 +193,7 @@ main(int argc, char *argv[]) } for (i = 0; i < n_switches; i++) { struct switch_ *this = &switches[i]; - lswitch_run(this->lswitch, this->rconn); + lswitch_run(this->lswitch); } unixctl_server_run(unixctl); @@ -194,11 +218,22 @@ main(int argc, char *argv[]) } static void -new_switch(struct switch_ *sw, struct vconn *vconn, const char *name) +new_switch(struct switch_ *sw, struct vconn *vconn) { - sw->rconn = rconn_new_from_vconn(name, vconn); - sw->lswitch = lswitch_create(sw->rconn, learn_macs, - setup_flows ? max_idle : -1); + struct lswitch_config cfg; + + sw->rconn = rconn_create(60, 0); + rconn_connect_unreliably(sw->rconn, vconn, NULL); + + cfg.mode = (action_normal ? LSW_NORMAL + : learn_macs ? LSW_LEARN + : LSW_FLOOD); + cfg.wildcards = wildcards; + cfg.max_idle = set_up_flows ? max_idle : -1; + cfg.default_flows = &default_flows; + cfg.default_queue = default_queue; + cfg.port_queues = &port_queues; + sw->lswitch = lswitch_create(sw->rconn, &cfg); } static int @@ -211,7 +246,9 @@ do_switching(struct switch_ *sw) msg = rconn_recv(sw->rconn); if (msg) { - lswitch_process_packet(sw->lswitch, sw->rconn, msg); + if (!mute) { + lswitch_process_packet(sw->lswitch, sw->rconn, msg); + } ofpbuf_delete(msg); } rconn_run(sw->rconn); @@ -221,27 +258,80 @@ do_switching(struct switch_ *sw) : EAGAIN); } +static void +read_flow_file(const char *name) +{ + enum nx_flow_format flow_format; + bool flow_mod_table_id; + FILE *stream; + + stream = fopen(optarg, "r"); + if (!stream) { + ovs_fatal(errno, "%s: open", name); + } + + flow_format = NXFF_OPENFLOW10; + flow_mod_table_id = false; + while (parse_ofp_flow_mod_file(&default_flows, + &flow_format, &flow_mod_table_id, + stream, OFPFC_ADD)) { + continue; + } + + fclose(stream); +} + +static void +add_port_queue(char *s) +{ + char *save_ptr = NULL; + char *port_name; + char *queue_id; + + port_name = strtok_r(s, ":", &save_ptr); + queue_id = strtok_r(NULL, "", &save_ptr); + if (!queue_id) { + ovs_fatal(0, "argument to -Q or --port-queue should take the form " + "\":\""); + } + + if (!shash_add_once(&port_queues, port_name, + (void *) (uintptr_t) atoi(queue_id))) { + ovs_fatal(0, " arguments for -Q or --port-queue must " + "be unique"); + } +} + static void parse_options(int argc, char *argv[]) { enum { OPT_MAX_IDLE = UCHAR_MAX + 1, OPT_PEER_CA_CERT, - VLOG_OPTION_ENUMS + OPT_MUTE, + OPT_WITH_FLOWS, + OPT_UNIXCTL, + VLOG_OPTION_ENUMS, + DAEMON_OPTION_ENUMS }; static struct option long_options[] = { - {"hub", no_argument, 0, 'H'}, - {"noflow", no_argument, 0, 'n'}, - {"max-idle", required_argument, 0, OPT_MAX_IDLE}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"hub", no_argument, NULL, 'H'}, + {"noflow", no_argument, NULL, 'n'}, + {"normal", no_argument, NULL, 'N'}, + {"wildcards", optional_argument, NULL, 'w'}, + {"max-idle", required_argument, NULL, OPT_MAX_IDLE}, + {"mute", no_argument, NULL, OPT_MUTE}, + {"queue", required_argument, NULL, 'q'}, + {"port-queue", required_argument, NULL, 'Q'}, + {"with-flows", required_argument, NULL, OPT_WITH_FLOWS}, + {"unixctl", required_argument, NULL, OPT_UNIXCTL}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, -#ifdef HAVE_OPENSSL - VCONN_SSL_LONG_OPTIONS - {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, -#endif - {0, 0, 0, 0}, + STREAM_SSL_LONG_OPTIONS, + {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -260,7 +350,19 @@ parse_options(int argc, char *argv[]) break; case 'n': - setup_flows = false; + set_up_flows = false; + break; + + case OPT_MUTE: + mute = true; + break; + + case 'N': + action_normal = true; + break; + + case 'w': + wildcards = optarg ? strtol(optarg, NULL, 16) : UINT32_MAX; break; case OPT_MAX_IDLE: @@ -275,23 +377,37 @@ parse_options(int argc, char *argv[]) } break; + case 'q': + default_queue = atoi(optarg); + break; + + case 'Q': + add_port_queue(optarg); + break; + + case OPT_WITH_FLOWS: + read_flow_file(optarg); + break; + + case OPT_UNIXCTL: + unixctl_path = optarg; + break; + case 'h': usage(); case 'V': - OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION); + ovs_print_version(OFP_VERSION, OFP_VERSION); exit(EXIT_SUCCESS); VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS -#ifdef HAVE_OPENSSL - VCONN_SSL_OPTION_HANDLERS + 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; -#endif case '?': exit(EXIT_FAILURE); @@ -301,6 +417,20 @@ parse_options(int argc, char *argv[]) } } free(short_options); + + if (!shash_is_empty(&port_queues) || default_queue != UINT32_MAX) { + if (action_normal) { + ovs_error(0, "queue IDs are incompatible with -N or --normal; " + "not using OFPP_NORMAL"); + action_normal = false; + } + + if (!learn_macs) { + ovs_error(0, "queue IDs are incompatible with -H or --hub; " + "not acting as hub"); + learn_macs = true; + } + } } static void @@ -317,6 +447,12 @@ usage(void) " -H, --hub act as hub instead of learning switch\n" " -n, --noflow pass traffic, but don't add flows\n" " --max-idle=SECS max idle time for new flows\n" + " -N, --normal use OFPP_NORMAL action\n" + " -w, --wildcards[=MASK] wildcard (specified) bits in flows\n" + " -q, --queue=QUEUE-ID OpenFlow queue ID to use for output\n" + " -Q PORT-NAME:QUEUE-ID use QUEUE-ID for frames from PORT-NAME\n" + " --with-flows FILE use the flows from FILE\n" + " --unixctl=SOCKET override default control socket name\n" " -h, --help display this help message\n" " -V, --version display version information\n"); exit(EXIT_SUCCESS);