projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timeval: Only log poll intervals longer than 50 ms.
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index c38c8123669f91f7284596c41b24e221e9ef5e48..af9e11f0d749083925f4b16da6955f163990ef2f 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.
@@
-269,7
+269,8
@@
read_flow_file(const char *name)
}
flow_format = NXFF_OPENFLOW10;
}
flow_format = NXFF_OPENFLOW10;
- while (parse_ofp_add_flow_file(&default_flows, &flow_format, stream)) {
+ while (parse_ofp_flow_mod_file(&default_flows, &flow_format, stream,
+ OFPFC_ADD)) {
continue;
}
continue;
}
@@
-306,7
+307,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'},