summaryrefslogtreecommitdiff
path: root/utilities
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-03-25 15:04:12 -0700
committerBen Pfaff <blp@nicira.com>2011-03-31 16:42:01 -0700
commit81e2083fe6b7c16055f01c4b1e40f25867594bf6 (patch)
tree797735fa486ba538e0c8f8f5a135fceafaf5b0e7 /utilities
parent53d046612df6c88ad8b02c8e99bbfb6e45fe2326 (diff)
downloadopenvswitch-81e2083fe6b7c16055f01c4b1e40f25867594bf6.tar.gz
ofproto: Change string sets in interface from svec to sset.
Diffstat (limited to 'utilities')
-rw-r--r--utilities/ovs-openflowd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c
index d2e0336f3..f1c52f995 100644
--- a/utilities/ovs-openflowd.c
+++ b/utilities/ovs-openflowd.c
@@ -73,13 +73,13 @@ struct ofsettings {
const char *dp_desc; /* Datapath description. */
/* Related vconns and network devices. */
- struct svec snoops; /* Listen for controller snooping conns. */
+ struct sset snoops; /* Listen for controller snooping conns. */
/* Failure behavior. */
int max_idle; /* Idle time for flows in fail-open mode. */
/* NetFlow. */
- struct svec netflow; /* NetFlow targets. */
+ struct sset netflow; /* NetFlow targets. */
};
static unixctl_cb_func ovs_openflowd_exit;
@@ -291,9 +291,9 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
s->serial_desc = NULL;
s->dp_desc = NULL;
svec_init(&controllers);
- svec_init(&s->snoops);
+ sset_init(&s->snoops);
s->max_idle = 0;
- svec_init(&s->netflow);
+ sset_init(&s->netflow);
svec_init(&s->ports);
for (;;) {
int c;
@@ -398,7 +398,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
break;
case OPT_NETFLOW:
- svec_add(&s->netflow, optarg);
+ sset_add(&s->netflow, optarg);
break;
case 'l':
@@ -406,7 +406,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
break;
case OPT_SNOOP:
- svec_add(&s->snoops, optarg);
+ sset_add(&s->snoops, optarg);
break;
case OPT_PORTS: