diff options
| author |   Keith Burns (alagalah) <alagalah@gmail.com> | 2016-05-05 18:16:50 -0700 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-05-13 16:07:41 +0000 |
| commit | 94b1442a6731bb879797c016a8febaec2f2ae7c9 (patch) | |
| tree | 7c874e6fc3c102cae06133430c4b9799f073df3a /vnet/vnet/nsh/nsh_packet.h | |
| parent | 3e53fc56645f4b99d014031995bd00d16c051a9b (diff) | |
VPP43 - NSH refactoring: Added nsh-map nodes
- removed vnet/vnet/nsh-gre
- removed all nsh from vnet/vnet/nsh_vxlan_gpe to
vnet/vnet/nsh
- moved vnet/vnet/nsh_vxlan_gpe to vnet/vnet/vxlan_gpe
- added cli and binary api for VXLAN GPE tunnels
- plan to move vnet/vnet/nsh to new repo (sfc_nsh) and make plugin
- added cli for NSH (binary API will be done in sfc_nsh)
- vnet/vnet/gre will be extended in VPP-54
Change-Id: I1d27def916532321577ccd68cb982ae0d0a07e6f
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
Diffstat (limited to 'vnet/vnet/nsh/nsh_packet.h')
| -rw-r--r-- | vnet/vnet/nsh/nsh_packet.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vnet/vnet/nsh/nsh_packet.h b/vnet/vnet/nsh/nsh_packet.h index 87d46a93b6d..cbe4f1e4193 100644 --- a/vnet/vnet/nsh/nsh_packet.h +++ b/vnet/vnet/nsh/nsh_packet.h @@ -73,20 +73,21 @@ typedef CLIB_PACKED(struct { u8 length; u8 md_type; u8 next_protocol; - u32 spi_si; + u32 nsp_nsi; // nsp 24 bits, nsi 8 bits /* Context headers, always present */ u32 c1; u32 c2; u32 c3; u32 c4; /* Optional variable length metadata */ - u32 * tlvs; + u32 tlvs[0]; }) nsh_header_t; +#define NSH_VERSION (0<<6) #define NSH_O_BIT (1<<5) #define NSH_C_BIT (1<<4) /* Network byte order shift / mask */ -#define NSH_SINDEX_MASK 0xFF -#define NSH_SPI_MASK (0x00FFFFFF) -#define NSH_SPI_SHIFT 8 +#define NSH_NSI_MASK 0xFF +#define NSH_NSP_MASK (0x00FFFFFF) +#define NSH_NSP_SHIFT 8 #endif /* included_vnet_nsh_packet_h */ |