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
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
ofp-print.c
diff --git
a/lib/ofp-print.c
b/lib/ofp-print.c
index
b97180e
..
f7872cb
100644
(file)
--- a/
lib/ofp-print.c
+++ b/
lib/ofp-print.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.
@@
-642,6
+642,10
@@
ofp10_match_to_string(const struct ofp10_match *om, int verbosity)
ds_put_cstr(&f, "arp,");
} else if (om->dl_type == htons(ETH_TYPE_RARP)){
ds_put_cstr(&f, "rarp,");
ds_put_cstr(&f, "arp,");
} else if (om->dl_type == htons(ETH_TYPE_RARP)){
ds_put_cstr(&f, "rarp,");
+ } else if (om->dl_type == htons(ETH_TYPE_MPLS)) {
+ ds_put_cstr(&f, "mpls,");
+ } else if (om->dl_type == htons(ETH_TYPE_MPLS_MCAST)) {
+ ds_put_cstr(&f, "mplsm,");
} else {
skip_type = false;
}
} else {
skip_type = false;
}
@@
-1546,19
+1550,18
@@
ofp_print_role_message(struct ds *string, const struct ofp_header *oh)
}
ds_put_cstr(string, " role=");
}
ds_put_cstr(string, " role=");
- if (rr.request_current_role_only) {
- ds_put_cstr(string, "nochange");
- return;
- }
switch (rr.role) {
switch (rr.role) {
- case NX_ROLE_OTHER:
+ case OFPCR12_ROLE_NOCHANGE:
+ ds_put_cstr(string, "nochange");
+ break;
+ case OFPCR12_ROLE_EQUAL:
ds_put_cstr(string, "equal"); /* OF 1.2 wording */
break;
ds_put_cstr(string, "equal"); /* OF 1.2 wording */
break;
- case
NX
_ROLE_MASTER:
+ case
OFPCR12
_ROLE_MASTER:
ds_put_cstr(string, "master");
break;
ds_put_cstr(string, "master");
break;
- case
NX
_ROLE_SLAVE:
+ case
OFPCR12
_ROLE_SLAVE:
ds_put_cstr(string, "slave");
break;
default:
ds_put_cstr(string, "slave");
break;
default: