X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=f97797472447539348946347178870cff49bdae8;hb=b2fda3effc787f265b5ad5dfa967ac00627bd075;hp=b1b4f0a83c2d4e63a2b2b2b6c58a6741638b51b8;hpb=09913dfd259ae81dee6c944db1b92e9722f17667;p=sliver-openvswitch.git diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index b1b4f0a83..f97797472 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ #include "openflow/openflow.h" #include "poll-loop.h" #include "rconn.h" +#include "shash.h" #include "stream-ssl.h" #include "timeval.h" #include "unixctl.h" @@ -40,7 +41,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(controller) +VLOG_DEFINE_THIS_MODULE(controller); #define MAX_SWITCHES 16 #define MAX_LISTENERS 16 @@ -50,10 +51,11 @@ 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.) */ +/* -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? */ @@ -69,12 +71,15 @@ static int max_idle = 60; * of their messages (for debugging fail-open mode). */ static bool mute = false; -/* -q, --queue: OpenFlow queue to use, or the default queue if UINT32_MAX. */ -static uint32_t queue_id = UINT32_MAX; +/* -q, --queue: default OpenFlow queue, none if UINT32_MAX. */ +static uint32_t default_queue = UINT32_MAX; -/* --with-flows: File with flows to send to switch, or null to not load - * any default flows. */ -static struct ovs_queue default_flows = OVS_QUEUE_INITIALIZER; +/* -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; @@ -134,7 +139,6 @@ main(int argc, char *argv[]) ovs_fatal(0, "no active or passive switch connections"); } - die_if_already_running(); daemonize_start(); retval = unixctl_server_create(unixctl_path, &unixctl); @@ -215,13 +219,20 @@ main(int argc, char *argv[]) static void new_switch(struct switch_ *sw, struct vconn *vconn) { + struct lswitch_config cfg; + sw->rconn = rconn_create(60, 0); rconn_connect_unreliably(sw->rconn, vconn, NULL); - sw->lswitch = lswitch_create(sw->rconn, learn_macs, exact_flows, - set_up_flows ? max_idle : -1, - action_normal, default_flows.head); - lswitch_set_queue(sw->lswitch, queue_id); + cfg.mode = (action_normal ? LSW_NORMAL + : learn_macs ? LSW_LEARN + : LSW_FLOOD); + cfg.exact_flows = exact_flows; + 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 @@ -249,7 +260,8 @@ do_switching(struct switch_ *sw) static void read_flow_file(const char *name) { - struct ofpbuf *b; + enum nx_flow_format flow_format; + bool flow_mod_table_id; FILE *stream; stream = fopen(optarg, "r"); @@ -257,13 +269,38 @@ read_flow_file(const char *name) ovs_fatal(errno, "%s: open", name); } - while ((b = parse_ofp_add_flow_file(stream)) != NULL) { - queue_push_tail(&default_flows, b); + 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[]) { @@ -273,27 +310,27 @@ parse_options(int argc, char *argv[]) OPT_MUTE, OPT_WITH_FLOWS, OPT_UNIXCTL, - VLOG_OPTION_ENUMS + VLOG_OPTION_ENUMS, + DAEMON_OPTION_ENUMS }; static struct option long_options[] = { - {"hub", no_argument, 0, 'H'}, - {"noflow", no_argument, 0, 'n'}, - {"normal", no_argument, 0, 'N'}, - {"wildcard", no_argument, 0, 'w'}, - {"max-idle", required_argument, 0, OPT_MAX_IDLE}, - {"mute", no_argument, 0, OPT_MUTE}, - {"queue", required_argument, 0, 'q'}, - {"with-flows", required_argument, 0, OPT_WITH_FLOWS}, - {"unixctl", required_argument, 0, OPT_UNIXCTL}, - {"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'}, + {"wildcard", no_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 - STREAM_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); @@ -340,7 +377,11 @@ parse_options(int argc, char *argv[]) break; case 'q': - queue_id = atoi(optarg); + default_queue = atoi(optarg); + break; + + case 'Q': + add_port_queue(optarg); break; case OPT_WITH_FLOWS: @@ -361,13 +402,11 @@ parse_options(int argc, char *argv[]) VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS -#ifdef HAVE_OPENSSL STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: stream_ssl_set_peer_ca_cert_file(optarg); break; -#endif case '?': exit(EXIT_FAILURE); @@ -377,6 +416,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 @@ -393,9 +446,10 @@ 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 OFPAT_NORMAL action\n" + " -N, --normal use OFPP_NORMAL action\n" " -w, --wildcard use wildcards, not exact-match rules\n" - " -q, --queue=QUEUE OpenFlow queue ID to use for output\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"