diff options
| author |   Pierre Pfister <ppfister@cisco.com> | 2016-04-25 14:15:15 +0100 |
|---|---|---|
| committer |   Damjan Marion <damarion@cisco.com> | 2016-04-26 14:09:00 +0000 |
| commit | 1dabaafcebb02699cae1ebd2b58e34dfe6b0f064 (patch) | |
| tree | f07da13dee800ebbbdab85233249289c38c89203 /vnet/vnet/ip/ip6_packet.h | |
| parent | 0371807f7b1213ee474f8850dc85ae5dd0a24532 (diff) | |
Port glean neighbor entry support to IPv6
This patch is more or less a port of I71f3ba0c8192 to IPv6.
In practice it allows creating a route via a neighbor which is not resolved yet.
It also adds static flag to IPv6 neighbor entries.
And as Damjan suggested, it formalizes ip46_address_t by using
the IPv4 embedded IPv6 address format.
Change-Id: Ifa7328a03380ea4ff118b7ca4897b4ab23a3e57c
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
Diffstat (limited to 'vnet/vnet/ip/ip6_packet.h')
| -rw-r--r-- | vnet/vnet/ip/ip6_packet.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/vnet/vnet/ip/ip6_packet.h b/vnet/vnet/ip/ip6_packet.h index 9a52cf72586..7fbcab14eac 100644 --- a/vnet/vnet/ip/ip6_packet.h +++ b/vnet/vnet/ip/ip6_packet.h @@ -40,6 +40,9 @@ #ifndef included_ip6_packet_h #define included_ip6_packet_h +#include <vnet/ip/tcp_packet.h> +#include <vnet/ip/ip4_packet.h> + typedef union { u8 as_u8[16]; u16 as_u16[8]; @@ -55,6 +58,17 @@ typedef CLIB_PACKED (struct { u32 fib_index; }) ip6_address_fib_t; +typedef CLIB_PACKED (union { + struct { + u32 pad[3]; + ip4_address_t ip4; + }; + ip6_address_t ip6; +}) ip46_address_t; +#define ip46_address_is_ip4(ip46) (((ip46)->pad[0] | (ip46)->pad[1] | (ip46)->pad[2]) == 0) +#define ip46_address_mask_ip4(ip46) ((ip46)->pad[0] = (ip46)->pad[1] = (ip46)->pad[2] = 0) +#define ip46_address_set_ip4(ip46, ip) (ip46_address_mask_ip4(ip46), (ip46)->ip4 = (ip)[0]) + always_inline void ip6_addr_fib_init (ip6_address_fib_t * addr_fib, ip6_address_t * address, u32 fib_index) |