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
Expand tunnel IDs from 32 to 64 bits.
[sliver-openvswitch.git]
/
lib
/
ofp-print.c
diff --git
a/lib/ofp-print.c
b/lib/ofp-print.c
index
5370c9a
..
2d9e026
100644
(file)
--- a/
lib/ofp-print.c
+++ b/
lib/ofp-print.c
@@
-215,6
+215,7
@@
nx_action_len(enum nx_action_subtype subtype)
case NXAST_REG_MOVE: return sizeof(struct nx_action_reg_move);
case NXAST_REG_LOAD: return sizeof(struct nx_action_reg_load);
case NXAST_NOTE: return -1;
case NXAST_REG_MOVE: return sizeof(struct nx_action_reg_move);
case NXAST_REG_LOAD: return sizeof(struct nx_action_reg_load);
case NXAST_NOTE: return -1;
+ case NXAST_SET_TUNNEL64: return sizeof(struct nx_action_set_tunnel64);
default: return -1;
}
}
default: return -1;
}
}
@@
-233,6
+234,7
@@
ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah)
}
if (subtype <= TYPE_MAXIMUM(enum nx_action_subtype)) {
}
if (subtype <= TYPE_MAXIMUM(enum nx_action_subtype)) {
+ const struct nx_action_set_tunnel64 *nast64;
const struct nx_action_set_tunnel *nast;
const struct nx_action_set_queue *nasq;
const struct nx_action_resubmit *nar;
const struct nx_action_set_tunnel *nast;
const struct nx_action_set_queue *nasq;
const struct nx_action_resubmit *nar;
@@
-278,6
+280,12
@@
ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah)
nxm_format_reg_load(load, string);
return;
nxm_format_reg_load(load, string);
return;
+ case NXAST_SET_TUNNEL64:
+ nast64 = (struct nx_action_set_tunnel64 *) nah;
+ ds_put_format(string, "set_tunnel64:%#"PRIx64,
+ ntohll(nast64->tun_id));
+ return;
+
case NXAST_SNAT__OBSOLETE:
default:
break;
case NXAST_SNAT__OBSOLETE:
default:
break;