X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6_packet.h;h=b1c9be4d19932a62efcaee8b269fc619fd924adc;hb=d69f4396bfe6b41ca04b7fc1496475f0a635b0da;hp=1e551c8b67d0805c9eb8f3cd231fc62fb1c604f7;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git diff --git a/src/vnet/ip/ip6_packet.h b/src/vnet/ip/ip6_packet.h index 1e551c8b67d..b1c9be4d199 100644 --- a/src/vnet/ip/ip6_packet.h +++ b/src/vnet/ip/ip6_packet.h @@ -40,7 +40,7 @@ #ifndef included_ip6_packet_h #define included_ip6_packet_h -#include +#include #include typedef union @@ -53,6 +53,11 @@ typedef union } ip6_address_t; +typedef struct +{ + ip6_address_t addr, mask; +} ip6_address_and_mask_t; + /* Packed so that the mhash key doesn't include uninitialized pad bytes */ /* *INDENT-OFF* */ typedef CLIB_PACKED (struct { @@ -62,6 +67,13 @@ typedef CLIB_PACKED (struct { }) ip6_address_fib_t; /* *INDENT-ON* */ +typedef enum +{ + IP46_TYPE_ANY, + IP46_TYPE_IP4, + IP46_TYPE_IP6 +} ip46_type_t; + /* *INDENT-OFF* */ typedef CLIB_PACKED (union { struct { @@ -79,22 +91,27 @@ typedef CLIB_PACKED (union { #define ip46_address_reset(ip46) ((ip46)->as_u64[0] = (ip46)->as_u64[1] = 0) #define ip46_address_cmp(ip46_1, ip46_2) (memcmp(ip46_1, ip46_2, sizeof(*ip46_1))) #define ip46_address_is_zero(ip46) (((ip46)->as_u64[0] == 0) && ((ip46)->as_u64[1] == 0)) +#define ip46_address_is_equal(a1, a2) (((a1)->as_u64[0] == (a2)->as_u64[0]) \ + && ((a1)->as_u64[1] == (a2)->as_u64[1])) +#define ip46_address_initializer {{{ 0 }}} -always_inline void -ip46_from_addr_buf (u32 is_ipv6, u8 * buf, ip46_address_t * ip) +always_inline ip46_address_t +to_ip46 (u32 is_ipv6, u8 * buf) { + ip46_address_t ip; if (is_ipv6) - ip->ip6 = *((ip6_address_t *) buf); + ip.ip6 = *((ip6_address_t *) buf); else - ip46_address_set_ip4 (ip, (ip4_address_t *) buf); + ip46_address_set_ip4 (&ip, (ip4_address_t *) buf); + return ip; } + always_inline void -ip6_addr_fib_init (ip6_address_fib_t * addr_fib, ip6_address_t * address, - u32 fib_index) +ip6_addr_fib_init (ip6_address_fib_t * addr_fib, + const ip6_address_t * address, u32 fib_index) { - addr_fib->ip6_addr.as_u64[0] = address->as_u64[0]; - addr_fib->ip6_addr.as_u64[1] = address->as_u64[1]; + addr_fib->ip6_addr = *address; addr_fib->fib_index = fib_index; } @@ -138,13 +155,13 @@ typedef enum } ip6_multicast_link_local_group_id_t; always_inline uword -ip6_address_is_multicast (ip6_address_t * a) +ip6_address_is_multicast (const ip6_address_t * a) { return a->as_u8[0] == 0xff; } always_inline uword -ip46_address_is_multicast (ip46_address_t * a) +ip46_address_is_multicast (const ip46_address_t * a) { return ip46_address_is_ip4 (a) ? ip4_address_is_multicast (&a->ip4) : ip6_address_is_multicast (&a->ip6); @@ -174,7 +191,7 @@ ip6_set_solicited_node_multicast_address (ip6_address_t * a, u32 id) always_inline void ip6_link_local_address_from_ethernet_address (ip6_address_t * a, - u8 * ethernet_address) + const u8 * ethernet_address) { a->as_u64[0] = a->as_u64[1] = 0; a->as_u16[0] = clib_host_to_net_u16 (0xfe80); @@ -201,7 +218,7 @@ ip6_multicast_ethernet_address (u8 * ethernet_address, u32 group_id) } always_inline uword -ip6_address_is_equal (ip6_address_t * a, ip6_address_t * b) +ip6_address_is_equal (const ip6_address_t * a, const ip6_address_t * b) { int i; for (i = 0; i < ARRAY_LEN (a->as_uword); i++) @@ -211,8 +228,9 @@ ip6_address_is_equal (ip6_address_t * a, ip6_address_t * b) } always_inline uword -ip6_address_is_equal_masked (ip6_address_t * a, ip6_address_t * b, - ip6_address_t * mask) +ip6_address_is_equal_masked (const ip6_address_t * a, + const ip6_address_t * b, + const ip6_address_t * mask) { int i; for (i = 0; i < ARRAY_LEN (a->as_uword); i++) @@ -228,7 +246,7 @@ ip6_address_is_equal_masked (ip6_address_t * a, ip6_address_t * b, } always_inline void -ip6_address_mask (ip6_address_t * a, ip6_address_t * mask) +ip6_address_mask (ip6_address_t * a, const ip6_address_t * mask) { int i; for (i = 0; i < ARRAY_LEN (a->as_uword); i++) @@ -259,7 +277,7 @@ ip6_address_mask_from_width (ip6_address_t * a, u32 width) } always_inline uword -ip6_address_is_zero (ip6_address_t * a) +ip6_address_is_zero (const ip6_address_t * a) { int i; for (i = 0; i < ARRAY_LEN (a->as_uword); i++) @@ -270,47 +288,44 @@ ip6_address_is_zero (ip6_address_t * a) /* Check for unspecified address ::0 */ always_inline uword -ip6_address_is_unspecified (ip6_address_t * a) +ip6_address_is_unspecified (const ip6_address_t * a) { return ip6_address_is_zero (a); } /* Check for loopback address ::1 */ always_inline uword -ip6_address_is_loopback (ip6_address_t * a) -{ - uword is_loopback; - u8 save = a->as_u8[15]; - a->as_u8[15] = save ^ 1; - is_loopback = ip6_address_is_zero (a); - a->as_u8[15] = save; - return is_loopback; +ip6_address_is_loopback (const ip6_address_t * a) +{ + return (a->as_u64[0] == 0 && + a->as_u32[2] == 0 && + a->as_u16[6] == 0 && a->as_u8[14] == 0 && a->as_u8[15] == 1); } /* Check for link local unicast fe80::/10. */ always_inline uword -ip6_address_is_link_local_unicast (ip6_address_t * a) +ip6_address_is_link_local_unicast (const ip6_address_t * a) { return a->as_u8[0] == 0xfe && (a->as_u8[1] & 0xc0) == 0x80; } /* Check for unique local unicast fc00::/7. */ always_inline uword -ip6_address_is_local_unicast (ip6_address_t * a) +ip6_address_is_local_unicast (const ip6_address_t * a) { return (a->as_u8[0] & 0xfe) == 0xfc; } /* Check for unique global unicast 2000::/3. */ always_inline uword -ip6_address_is_global_unicast (ip6_address_t * a) +ip6_address_is_global_unicast (const ip6_address_t * a) { return (a->as_u8[0] & 0xe0) == 0x20; } /* Check for solicited node multicast 0xff02::1:ff00:0/104 */ always_inline uword -ip6_is_solicited_node_multicast_address (ip6_address_t * a) +ip6_is_solicited_node_multicast_address (const ip6_address_t * a) { return (a->as_u32[0] == clib_host_to_net_u32 (0xff020000) && a->as_u32[1] == 0 @@ -337,6 +352,29 @@ typedef struct ip6_address_t src_address, dst_address; } ip6_header_t; +always_inline u8 +ip6_traffic_class (const ip6_header_t * i) +{ + return (i->ip_version_traffic_class_and_flow_label & 0x0FF00000) >> 20; +} + +static_always_inline u8 +ip6_traffic_class_network_order (const ip6_header_t * ip6) +{ + return (clib_net_to_host_u32 (ip6->ip_version_traffic_class_and_flow_label) + & 0x0ff00000) >> 20; +} + +static_always_inline void +ip6_set_traffic_class_network_order (ip6_header_t * ip6, u8 dscp) +{ + u32 tmp = + clib_net_to_host_u32 (ip6->ip_version_traffic_class_and_flow_label); + tmp &= 0xf00fffff; + tmp |= (dscp << 20); + ip6->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32 (tmp); +} + always_inline void * ip6_next_header (ip6_header_t * i) { @@ -373,10 +411,10 @@ ip6_tcp_reply_x1 (ip6_header_t * ip0, tcp_header_t * tcp0) { u16 src0, dst0; - src0 = tcp0->ports.src; - dst0 = tcp0->ports.dst; - tcp0->ports.src = dst0; - tcp0->ports.dst = src0; + src0 = tcp0->src; + dst0 = tcp0->dst; + tcp0->src = dst0; + tcp0->dst = src0; } } @@ -400,14 +438,14 @@ ip6_tcp_reply_x2 (ip6_header_t * ip0, ip6_header_t * ip1, { u16 src0, dst0, src1, dst1; - src0 = tcp0->ports.src; - src1 = tcp1->ports.src; - dst0 = tcp0->ports.dst; - dst1 = tcp1->ports.dst; - tcp0->ports.src = dst0; - tcp1->ports.src = dst1; - tcp0->ports.dst = src0; - tcp1->ports.dst = src1; + src0 = tcp0->src; + src1 = tcp1->src; + dst0 = tcp0->dst; + dst1 = tcp1->dst; + tcp0->src = dst0; + tcp1->src = dst1; + tcp0->dst = src0; + tcp1->dst = src1; } } @@ -448,20 +486,47 @@ always_inline u8 ip6_ext_hdr(u8 nexthdr) * find out if nexthdr is an extension header or a protocol */ return (nexthdr == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS) || - (nexthdr == IP_PROTOCOL_IP6_NONXT) || (nexthdr == IP_PROTOCOL_IPV6_FRAGMENTATION) || (nexthdr == IP_PROTOCOL_IPSEC_AH) || (nexthdr == IP_PROTOCOL_IPV6_ROUTE) || (nexthdr == IP_PROTOCOL_IP6_DESTINATION_OPTIONS); } -#define ip6_ext_header_len(p) (((p)->n_data_u64s+1) << 3) -#define ip6_ext_authhdr_len(p) (((p)->n_data_u64s+2) << 2) +#define ip6_ext_header_len(p) ((((ip6_ext_header_t *)(p))->n_data_u64s+1) << 3) +#define ip6_ext_authhdr_len(p) ((((ip6_ext_header_t *)(p))->n_data_u64s+2) << 2) always_inline void * ip6_ext_next_header (ip6_ext_header_t *ext_hdr ) { return (void *)((u8 *) ext_hdr + ip6_ext_header_len(ext_hdr)); } +/* + * Macro to find the IPv6 ext header of type t + * I is the IPv6 header + * P is the previous IPv6 ext header (NULL if none) + * M is the matched IPv6 ext header of type t + */ +#define ip6_ext_header_find_t(i, p, m, t) \ +if ((i)->protocol == t) \ +{ \ + (m) = (void *)((i)+1); \ + (p) = NULL; \ +} \ +else \ +{ \ + (m) = NULL; \ + (p) = (void *)((i)+1); \ + while (ip6_ext_hdr((p)->next_hdr) && \ + ((ip6_ext_header_t *)(p))->next_hdr != (t)) \ + { \ + (p) = ip6_ext_next_header((p)); \ + } \ + if ( ((p)->next_hdr) == (t)) \ + { \ + (m) = (void *)(ip6_ext_next_header((p))); \ + } \ +} + + typedef CLIB_PACKED (struct { u8 next_hdr; /* Length of this header plus option data in 8 byte units. */ @@ -482,6 +547,9 @@ typedef CLIB_PACKED (struct { #define ip6_frag_hdr_offset(hdr) \ (clib_net_to_host_u16((hdr)->fragment_offset_and_more) >> 3) +#define ip6_frag_hdr_offset_bytes(hdr) \ + (8 * ip6_frag_hdr_offset(hdr)) + #define ip6_frag_hdr_more(hdr) \ (clib_net_to_host_u16((hdr)->fragment_offset_and_more) & 0x1)