X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=af8d725a7196394a143806a16cccf8fe79e9aa45;hb=6042457bd537a2b5140e17e4abceacbaafff6b57;hp=022b1a4db98df0895ca7bcfce4b53e5f60402c13;hpb=7286b1e13dbf358ea6071d04b311474208308ad6;p=openvswitch diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 022b1a4d..af8d725a 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,13 +33,15 @@ #include "openflow/openflow.h" #include "poll-loop.h" #include "rconn.h" -#include "shash.h" +#include "simap.h" #include "stream-ssl.h" #include "timeval.h" #include "unixctl.h" #include "util.h" #include "vconn.h" #include "vlog.h" +#include "socket-util.h" +#include "ofp-util.h" VLOG_DEFINE_THIS_MODULE(controller); @@ -48,7 +50,6 @@ VLOG_DEFINE_THIS_MODULE(controller); struct switch_ { struct lswitch *lswitch; - struct rconn *rconn; }; /* -H, --hub: Learn the ports on which MAC addresses appear? */ @@ -61,7 +62,7 @@ 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 +/* -w, --wildcard: 0 to disable wildcard flow entries, an OFPFW10_* bitmask to * enable specific wildcards, or UINT32_MAX to use the default wildcards. */ static uint32_t wildcards = 0; @@ -75,17 +76,16 @@ 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); +/* -Q, --port-queue: map from port name to port number. */ +static struct simap port_queues = SIMAP_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; -static int do_switching(struct switch_ *); static void new_switch(struct switch_ *, struct vconn *); static void parse_options(int argc, char *argv[]); static void usage(void) NO_RETURN; @@ -115,7 +115,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, 0, &vconn, DSCP_DEFAULT); if (!retval) { if (n_switches >= MAX_SWITCHES) { ovs_fatal(0, "max %d switch connections", n_switches); @@ -124,7 +124,7 @@ main(int argc, char *argv[]) continue; } else if (retval == EAFNOSUPPORT) { struct pvconn *pvconn; - retval = pvconn_open(name, &pvconn); + retval = pvconn_open(name, 0, &pvconn, DSCP_DEFAULT); if (!retval) { if (n_listeners >= MAX_LISTENERS) { ovs_fatal(0, "max %d passive connections", n_listeners); @@ -150,13 +150,11 @@ main(int argc, char *argv[]) daemonize_complete(); while (n_switches > 0 || n_listeners > 0) { - int iteration; - /* Accept connections on listening vconns. */ 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], &new_vconn); if (!retval || retval == EAGAIN) { if (!retval) { new_switch(&switches[n_switches++], new_vconn); @@ -168,32 +166,16 @@ main(int argc, char *argv[]) } } - /* Do some switching work. Limit the number of iterations so that - * callbacks registered with the poll loop don't starve. */ - for (iteration = 0; iteration < 50; iteration++) { - bool progress = false; - for (i = 0; i < n_switches; ) { - struct switch_ *this = &switches[i]; - - retval = do_switching(this); - if (!retval || retval == EAGAIN) { - if (!retval) { - progress = true; - } - i++; - } else { - rconn_destroy(this->rconn); - lswitch_destroy(this->lswitch); - switches[i] = switches[--n_switches]; - } - } - if (!progress) { - break; - } - } - for (i = 0; i < n_switches; i++) { + /* Do some switching work. . */ + for (i = 0; i < n_switches; ) { struct switch_ *this = &switches[i]; lswitch_run(this->lswitch); + if (lswitch_is_alive(this->lswitch)) { + i++; + } else { + lswitch_destroy(this->lswitch); + switches[i] = switches[--n_switches]; + } } unixctl_server_run(unixctl); @@ -206,8 +188,6 @@ main(int argc, char *argv[]) } for (i = 0; i < n_switches; i++) { struct switch_ *sw = &switches[i]; - rconn_run_wait(sw->rconn); - rconn_recv_wait(sw->rconn); lswitch_wait(sw->lswitch); } unixctl_server_wait(unixctl); @@ -221,64 +201,22 @@ static void new_switch(struct switch_ *sw, struct vconn *vconn) { struct lswitch_config cfg; + struct rconn *rconn; - sw->rconn = rconn_create(60, 0); - rconn_connect_unreliably(sw->rconn, vconn, NULL); + rconn = rconn_create(60, 0, DSCP_DEFAULT, 0); + rconn_connect_unreliably(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_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); -} - -static int -do_switching(struct switch_ *sw) -{ - unsigned int packets_sent; - struct ofpbuf *msg; - - packets_sent = rconn_packets_sent(sw->rconn); - - msg = rconn_recv(sw->rconn); - if (msg) { - if (!mute) { - lswitch_process_packet(sw->lswitch, sw->rconn, msg); - } - ofpbuf_delete(msg); - } - rconn_run(sw->rconn); - - return (!rconn_is_alive(sw->rconn) ? EOF - : rconn_packets_sent(sw->rconn) != packets_sent ? 0 - : 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); + cfg.mute = mute; + sw->lswitch = lswitch_create(rconn, &cfg); } static void @@ -295,8 +233,7 @@ add_port_queue(char *s) "\":\""); } - if (!shash_add_once(&port_queues, port_name, - (void *) (uintptr_t) atoi(queue_id))) { + if (!simap_put(&port_queues, port_name, atoi(queue_id))) { ovs_fatal(0, " arguments for -Q or --port-queue must " "be unique"); } @@ -386,7 +323,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: @@ -397,7 +335,7 @@ 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 @@ -418,7 +356,7 @@ parse_options(int argc, char *argv[]) } free(short_options); - if (!shash_is_empty(&port_queues) || default_queue != UINT32_MAX) { + if (!simap_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");