X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=fa60f8f68f53b6e5b757d0d68385a0f08632df9b;hb=3be4ef29f732897d47c1893dc9e325b74bf60782;hp=27c8e4731c7e326ef56042c739ae35c136375fad;hpb=02013bc03c5d5d9497af2ccb6982feb97dd5ee94;p=sliver-openvswitch.git diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 27c8e4731..fa60f8f68 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -40,6 +40,7 @@ #include "util.h" #include "vconn.h" #include "vlog.h" +#include "socket-util.h" VLOG_DEFINE_THIS_MODULE(controller); @@ -61,8 +62,9 @@ static bool set_up_flows = true; /* -N, --normal: Use "NORMAL" action instead of explicit port? */ static bool action_normal = false; -/* -w, --wildcard: Set up exact match or wildcard flow entries? */ -static bool exact_flows = true; +/* -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; @@ -77,9 +79,9 @@ 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); +/* --with-flows: Flows to send to switch. */ +static struct ofputil_flow_mod *default_flows; +static size_t n_default_flows; /* --unixctl: Name of unixctl socket, or null to use the default. */ static char *unixctl_path = NULL; @@ -114,7 +116,7 @@ main(int argc, char *argv[]) const char *name = argv[i]; struct vconn *vconn; - retval = vconn_open(name, OFP_VERSION, &vconn); + retval = vconn_open(name, OFP10_VERSION, &vconn, DSCP_DEFAULT); if (!retval) { if (n_switches >= MAX_SWITCHES) { ovs_fatal(0, "max %d switch connections", n_switches); @@ -123,7 +125,7 @@ main(int argc, char *argv[]) continue; } else if (retval == EAFNOSUPPORT) { struct pvconn *pvconn; - retval = pvconn_open(name, &pvconn); + retval = pvconn_open(name, &pvconn, DSCP_DEFAULT); if (!retval) { if (n_listeners >= MAX_LISTENERS) { ovs_fatal(0, "max %d passive connections", n_listeners); @@ -155,7 +157,7 @@ main(int argc, char *argv[]) for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) { struct vconn *new_vconn; - retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn); + retval = pvconn_accept(listeners[i], OFP10_VERSION, &new_vconn); if (!retval || retval == EAGAIN) { if (!retval) { new_switch(&switches[n_switches++], new_vconn); @@ -221,15 +223,16 @@ new_switch(struct switch_ *sw, struct vconn *vconn) { struct lswitch_config cfg; - sw->rconn = rconn_create(60, 0); + sw->rconn = rconn_create(60, 0, DSCP_DEFAULT); rconn_connect_unreliably(sw->rconn, vconn, NULL); cfg.mode = (action_normal ? LSW_NORMAL : learn_macs ? LSW_LEARN : LSW_FLOOD); - cfg.exact_flows = exact_flows; + cfg.wildcards = wildcards; cfg.max_idle = set_up_flows ? max_idle : -1; - cfg.default_flows = &default_flows; + cfg.default_flows = default_flows; + cfg.n_default_flows = n_default_flows; cfg.default_queue = default_queue; cfg.port_queues = &port_queues; sw->lswitch = lswitch_create(sw->rconn, &cfg); @@ -257,26 +260,6 @@ do_switching(struct switch_ *sw) : EAGAIN); } -static void -read_flow_file(const char *name) -{ - enum nx_flow_format flow_format; - FILE *stream; - - stream = fopen(optarg, "r"); - if (!stream) { - ovs_fatal(errno, "%s: open", name); - } - - flow_format = NXFF_OPENFLOW10; - while (parse_ofp_flow_mod_file(&default_flows, &flow_format, stream, - OFPFC_ADD)) { - continue; - } - - fclose(stream); -} - static void add_port_queue(char *s) { @@ -311,25 +294,23 @@ parse_options(int argc, char *argv[]) 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'}, - {"port-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'}, + {"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 - 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); @@ -360,7 +341,7 @@ parse_options(int argc, char *argv[]) break; case 'w': - exact_flows = false; + wildcards = optarg ? strtol(optarg, NULL, 16) : UINT32_MAX; break; case OPT_MAX_IDLE: @@ -384,7 +365,8 @@ parse_options(int argc, char *argv[]) break; case OPT_WITH_FLOWS: - read_flow_file(optarg); + parse_ofp_flow_mod_file(optarg, OFPFC_ADD, &default_flows, + &n_default_flows); break; case OPT_UNIXCTL: @@ -395,19 +377,17 @@ parse_options(int argc, char *argv[]) usage(); case 'V': - OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION); + ovs_print_version(OFP10_VERSION, OFP10_VERSION); exit(EXIT_SUCCESS); 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); @@ -448,7 +428,7 @@ usage(void) " -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, --wildcard use wildcards, not exact-match rules\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"