projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Allow specially named "unix:" controllers.
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 7d4e4d7704797245ea8e9d3deadee1b8f18f1818..359e3ab1a5ce75683815796eb6bacd9a603e7209 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-34,6
+34,7
@@
#include "dummy.h"
#include "leak-checker.h"
#include "netdev.h"
#include "dummy.h"
#include "leak-checker.h"
#include "netdev.h"
+#include "openflow/openflow.h"
#include "ovsdb-idl.h"
#include "poll-loop.h"
#include "process.h"
#include "ovsdb-idl.h"
#include "poll-loop.h"
#include "process.h"
@@
-80,7
+81,7
@@
main(int argc, char *argv[])
if (retval) {
exit(EXIT_FAILURE);
}
if (retval) {
exit(EXIT_FAILURE);
}
- unixctl_command_register("exit", ovs_vswitchd_exit, &exiting);
+ unixctl_command_register("exit",
"",
ovs_vswitchd_exit, &exiting);
bridge_init(remote);
free(remote);
bridge_init(remote);
free(remote);
@@
-146,12
+147,11
@@
parse_options(int argc, char *argv[])
}
switch (c) {
}
switch (c) {
- case 'H':
case 'h':
usage();
case 'V':
case 'h':
usage();
case 'V':
-
OVS_PRINT_VERSION
(OFP_VERSION, OFP_VERSION);
+
ovs_print_version
(OFP_VERSION, OFP_VERSION);
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
exit(EXIT_SUCCESS);
case OPT_MLOCKALL: