diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-11-25 11:31:11 -0200 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2015-11-30 10:31:35 -0800 |
| commit | ffe4c74f9331114287754d5b0ca8eec219927acc (patch) | |
| tree | e7f161b5d6f9b34e8b3a39ae92f51951ca08768e /lib/odp-util.h | |
| parent | 53902038abe62c45ff46d7de9dcec30c3d1d861e (diff) | |
| download | openvswitch-ffe4c74f9331114287754d5b0ca8eec219927acc.tar.gz | |
tunneling: extend flow_tnl with ipv6 addresses
Note that because there's been no prerequisite on the outer protocol,
we cannot add it now. Instead, treat the ipv4 and ipv6 dst fields in the way
that either both are null, or at most one of them is non-null.
[cascardo: abstract testing either dst with flow_tnl_dst_is_set]
cascardo: using IPv4-mapped address is an exercise for the future, since this
would require special handling of MFF_TUN_SRC and MFF_TUN_DST and OpenFlow
messages.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Co-authored-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'lib/odp-util.h')
| -rw-r--r-- | lib/odp-util.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/odp-util.h b/lib/odp-util.h index 1e49893f0..a9364164f 100644 --- a/lib/odp-util.h +++ b/lib/odp-util.h @@ -109,6 +109,8 @@ void odp_portno_names_destroy(struct hmap *portno_names); * - OVS_TUNNEL_KEY_ATTR_ID 8 -- 4 12 * - OVS_TUNNEL_KEY_ATTR_IPV4_SRC 4 -- 4 8 * - OVS_TUNNEL_KEY_ATTR_IPV4_DST 4 -- 4 8 + * - OVS_TUNNEL_KEY_ATTR_IPV6_SRC 16 -- 4 20 + * - OVS_TUNNEL_KEY_ATTR_IPV6_DST 16 -- 4 20 * - OVS_TUNNEL_KEY_ATTR_TOS 1 3 4 8 * - OVS_TUNNEL_KEY_ATTR_TTL 1 3 4 8 * - OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT 0 -- 4 4 @@ -133,13 +135,13 @@ void odp_portno_names_destroy(struct hmap *portno_names); * OVS_KEY_ATTR_ICMPV6 2 2 4 8 * OVS_KEY_ATTR_ND 28 -- 4 32 * ---------------------------------------------------------- - * total 532 + * total 572 * * We include some slack space in case the calculation isn't quite right or we * add another field and forget to adjust this value. */ -#define ODPUTIL_FLOW_KEY_BYTES 576 -BUILD_ASSERT_DECL(FLOW_WC_SEQ == 34); +#define ODPUTIL_FLOW_KEY_BYTES 640 +BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35); /* A buffer with sufficient size and alignment to hold an nlattr-formatted flow * key. An array of "struct nlattr" might not, in theory, be sufficiently |