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: Use 64-bit datapath id and management id (OpenFlow 0.9)
[sliver-openvswitch.git]
/
utilities
/
ovs-openflowd.c
diff --git
a/utilities/ovs-openflowd.c
b/utilities/ovs-openflowd.c
index
c275cd6
..
35f6f24
100644
(file)
--- a/
utilities/ovs-openflowd.c
+++ b/
utilities/ovs-openflowd.c
@@
-345,10
+345,10
@@
parse_options(int argc, char *argv[], struct ofsettings *s)
switch (c) {
case OPT_DATAPATH_ID:
switch (c) {
case OPT_DATAPATH_ID:
- if (strlen(optarg) != 1
2
- || strspn(optarg, "0123456789abcdefABCDEF") != 1
2
) {
+ if (strlen(optarg) != 1
6
+ || strspn(optarg, "0123456789abcdefABCDEF") != 1
6
) {
ovs_fatal(0, "argument to --datapath-id must be "
ovs_fatal(0, "argument to --datapath-id must be "
- "exactly 1
2
hex digits");
+ "exactly 1
6
hex digits");
}
s->datapath_id = strtoll(optarg, NULL, 16);
if (!s->datapath_id) {
}
s->datapath_id = strtoll(optarg, NULL, 16);
if (!s->datapath_id) {
@@
-467,10
+467,10
@@
parse_options(int argc, char *argv[], struct ofsettings *s)
break;
case OPT_MGMT_ID:
break;
case OPT_MGMT_ID:
- if (strlen(optarg) != 1
2
- || strspn(optarg, "0123456789abcdefABCDEF") != 1
2
) {
+ if (strlen(optarg) != 1
6
+ || strspn(optarg, "0123456789abcdefABCDEF") != 1
6
) {
ovs_fatal(0, "argument to --mgmt-id must be "
ovs_fatal(0, "argument to --mgmt-id must be "
- "exactly 1
2
hex digits");
+ "exactly 1
6
hex digits");
}
s->mgmt_id = strtoll(optarg, NULL, 16);
if (!s->mgmt_id) {
}
s->mgmt_id = strtoll(optarg, NULL, 16);
if (!s->mgmt_id) {
@@
-561,9
+561,9
@@
usage(void)
vconn_usage(true, true, true);
printf("\nOpenFlow options:\n"
" -d, --datapath-id=ID Use ID as the OpenFlow switch ID\n"
vconn_usage(true, true, true);
printf("\nOpenFlow options:\n"
" -d, --datapath-id=ID Use ID as the OpenFlow switch ID\n"
- " (ID must consist of 1
2
hex digits)\n"
+ " (ID must consist of 1
6
hex digits)\n"
" --mgmt-id=ID Use ID as the management ID\n"
" --mgmt-id=ID Use ID as the management ID\n"
- " (ID must consist of 1
2
hex digits)\n"
+ " (ID must consist of 1
6
hex digits)\n"
" --manufacturer=MFR Identify manufacturer as MFR\n"
" --hardware=HW Identify hardware as HW\n"
" --software=SW Identify software as SW\n"
" --manufacturer=MFR Identify manufacturer as MFR\n"
" --hardware=HW Identify hardware as HW\n"
" --software=SW Identify software as SW\n"