git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Get rid of archaic "switch status" OpenFlow extension.
[sliver-openvswitch.git]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index
5675f89
..
f5e5014
100644
(file)
--- 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-260,7
+260,7
@@
do_switching(struct switch_ *sw)
static void
read_flow_file(const char *name)
{
static void
read_flow_file(const char *name)
{
-
struct ofpbuf *b
;
+
enum nx_flow_format flow_format
;
FILE *stream;
stream = fopen(optarg, "r");
FILE *stream;
stream = fopen(optarg, "r");
@@
-268,8
+268,9
@@
read_flow_file(const char *name)
ovs_fatal(errno, "%s: open", name);
}
ovs_fatal(errno, "%s: open", name);
}
- while ((b = parse_ofp_add_flow_file(stream)) != NULL) {
- list_push_back(&default_flows, &b->list_node);
+ flow_format = NXFF_OPENFLOW10;
+ while (parse_ofp_add_flow_file(&default_flows, &flow_format, stream)) {
+ continue;
}
fclose(stream);
}
fclose(stream);
@@
-305,7
+306,8
@@
parse_options(int argc, char *argv[])
OPT_MUTE,
OPT_WITH_FLOWS,
OPT_UNIXCTL,
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'},
};
static struct option long_options[] = {
{"hub", no_argument, 0, 'H'},