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
bfd: Include prerequisite header for FreeBSD
[sliver-openvswitch.git]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index
bf0ae92
..
d9ae983
100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012
, 2013
Nicira, Inc.
*
* 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.
@@
-116,8
+116,8
@@
main(int argc, char *argv[])
const char *name = argv[i];
struct vconn *vconn;
const char *name = argv[i];
struct vconn *vconn;
- retval = vconn_open(name, get_allowed_ofp_versions(),
- &vconn
, DSCP_DEFAULT
);
+ retval = vconn_open(name, get_allowed_ofp_versions(),
DSCP_DEFAULT,
+ &vconn);
if (!retval) {
if (n_switches >= MAX_SWITCHES) {
ovs_fatal(0, "max %d switch connections", n_switches);
if (!retval) {
if (n_switches >= MAX_SWITCHES) {
ovs_fatal(0, "max %d switch connections", n_switches);
@@
-127,7
+127,7
@@
main(int argc, char *argv[])
} else if (retval == EAFNOSUPPORT) {
struct pvconn *pvconn;
retval = pvconn_open(name, get_allowed_ofp_versions(),
} else if (retval == EAFNOSUPPORT) {
struct pvconn *pvconn;
retval = pvconn_open(name, get_allowed_ofp_versions(),
-
&pvconn, DSCP_DEFAULT
);
+
DSCP_DEFAULT, &pvconn
);
if (!retval) {
if (n_listeners >= MAX_LISTENERS) {
ovs_fatal(0, "max %d passive connections", n_listeners);
if (!retval) {
if (n_listeners >= MAX_LISTENERS) {
ovs_fatal(0, "max %d passive connections", n_listeners);
@@
-136,7
+136,7
@@
main(int argc, char *argv[])
}
}
if (retval) {
}
}
if (retval) {
- VLOG_ERR("%s: connect: %s", name, strerror(retval));
+ VLOG_ERR("%s: connect: %s", name,
ovs_
strerror(retval));
}
}
if (n_switches == 0 && n_listeners == 0) {
}
}
if (n_switches == 0 && n_listeners == 0) {
@@
-255,7
+255,7
@@
parse_options(int argc, char *argv[])
DAEMON_OPTION_ENUMS,
OFP_VERSION_OPTION_ENUMS
};
DAEMON_OPTION_ENUMS,
OFP_VERSION_OPTION_ENUMS
};
- static struct option long_options[] = {
+ static
const
struct option long_options[] = {
{"hub", no_argument, NULL, 'H'},
{"noflow", no_argument, NULL, 'n'},
{"normal", no_argument, NULL, 'N'},
{"hub", no_argument, NULL, 'H'},
{"noflow", no_argument, NULL, 'n'},
{"normal", no_argument, NULL, 'N'},
@@
-278,6
+278,7
@@
parse_options(int argc, char *argv[])
for (;;) {
int indexptr;
for (;;) {
int indexptr;
+ char *error;
int c;
c = getopt_long(argc, argv, short_options, long_options, &indexptr);
int c;
c = getopt_long(argc, argv, short_options, long_options, &indexptr);
@@
-327,8
+328,11
@@
parse_options(int argc, char *argv[])
break;
case OPT_WITH_FLOWS:
break;
case OPT_WITH_FLOWS:
- parse_ofp_flow_mod_file(optarg, OFPFC_ADD, &default_flows,
- &n_default_flows);
+ error = parse_ofp_flow_mod_file(optarg, OFPFC_ADD, &default_flows,
+ &n_default_flows);
+ if (error) {
+ ovs_fatal(0, "%s", error);
+ }
break;
case OPT_UNIXCTL:
break;
case OPT_UNIXCTL: