X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=04b16e8709b529479392207e49334e27c47f6f56;hb=e8087a87a3155656596d92ebecfa37841b637ef7;hp=25deaffd9e5b43ad29652026e5fc30311c389036;hpb=27527aa09ce456796eeea728cef9528aa5612b70;p=openvswitch diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 25deaffd..04b16e87 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,14 @@ #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" VLOG_DEFINE_THIS_MODULE(controller); @@ -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,8 +76,8 @@ 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. */ static struct ofputil_flow_mod *default_flows; @@ -115,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); @@ -124,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); @@ -156,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); @@ -222,7 +223,7 @@ 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 @@ -273,8 +274,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"); } @@ -376,7 +376,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 @@ -397,7 +397,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");