X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_packet.h;h=2673558e19e6b75d37375fcde4948f2facc84321;hb=116392b1742e86440c6a194170c1c9bca1314fe1;hp=9d63baecf883a17bed9ce2d37ee691fb58d1fdba;hpb=e5f0050c7a5d411f96af6401797529d58825e2af;p=vpp.git diff --git a/src/vnet/ip/ip4_packet.h b/src/vnet/ip/ip4_packet.h index 9d63baecf88..2673558e19e 100644 --- a/src/vnet/ip/ip4_packet.h +++ b/src/vnet/ip/ip4_packet.h @@ -41,8 +41,8 @@ #define included_ip4_packet_h #include /* for ip_csum_t */ -#include /* for tcp_header_t */ #include /* for clib_net_to_host_u16 */ +#include /* for WARN_OFF/WARN_ON macro */ /* IP4 address which can be accessed either as 4 bytes or as a 32-bit number. */ @@ -197,64 +197,122 @@ ip4_next_header (ip4_header_t * i) return (void *) i + ip4_header_bytes (i); } -always_inline u16 -ip4_header_checksum (ip4_header_t * i) +/* Turn off array bounds check due to ip4_header_t + option field operations. */ + +/* *INDENT-OFF* */ +WARN_OFF(array-bounds) +/* *INDENT-ON* */ + +static_always_inline u16 +ip4_header_checksum_inline (ip4_header_t * i, int with_checksum) { - u16 *iphdr = (u16 *) i; - u32 sum = 0; int option_len = (i->ip_version_and_header_length & 0xf) - 5; + uword sum = 0; +#if uword_bits == 64 + u32 *iphdr = (u32 *) i; + + sum += iphdr[0]; + sum += iphdr[1]; + sum += with_checksum ? iphdr[2] : *(u16 *) (iphdr + 2); + /* skip checksum */ + sum += iphdr[3]; + sum += iphdr[4]; + + if (PREDICT_FALSE (option_len > 0)) + switch (option_len) + { + case 10: + sum += iphdr[14]; + case 9: + sum += iphdr[13]; + case 8: + sum += iphdr[12]; + case 7: + sum += iphdr[11]; + case 6: + sum += iphdr[10]; + case 5: + sum += iphdr[9]; + case 4: + sum += iphdr[8]; + case 3: + sum += iphdr[7]; + case 2: + sum += iphdr[6]; + case 1: + sum += iphdr[5]; + default: + break; + } - sum += clib_net_to_host_u16 (iphdr[0]); - sum += clib_net_to_host_u16 (iphdr[1]); - sum += clib_net_to_host_u16 (iphdr[2]); - sum += clib_net_to_host_u16 (iphdr[3]); - sum += clib_net_to_host_u16 (iphdr[4]); + sum = ((u32) sum) + (sum >> 32); +#else + u16 *iphdr = (u16 *) i; - sum += clib_net_to_host_u16 (iphdr[6]); - sum += clib_net_to_host_u16 (iphdr[7]); - sum += clib_net_to_host_u16 (iphdr[8]); - sum += clib_net_to_host_u16 (iphdr[9]); + sum += iphdr[0]; + sum += iphdr[1]; + sum += iphdr[2]; + sum += iphdr[3]; + sum += iphdr[4]; + if (with_checksum) + sum += iphdr[5]; + sum += iphdr[6]; + sum += iphdr[7]; + sum += iphdr[8]; + sum += iphdr[9]; if (PREDICT_FALSE (option_len > 0)) switch (option_len) { case 10: - sum += clib_net_to_host_u16 (iphdr[28]); - sum += clib_net_to_host_u16 (iphdr[29]); + sum += iphdr[28]; + sum += iphdr[29]; case 9: - sum += clib_net_to_host_u16 (iphdr[26]); - sum += clib_net_to_host_u16 (iphdr[27]); + sum += iphdr[26]; + sum += iphdr[27]; case 8: - sum += clib_net_to_host_u16 (iphdr[24]); - sum += clib_net_to_host_u16 (iphdr[25]); + sum += iphdr[24]; + sum += iphdr[25]; case 7: - sum += clib_net_to_host_u16 (iphdr[22]); - sum += clib_net_to_host_u16 (iphdr[23]); + sum += iphdr[22]; + sum += iphdr[23]; case 6: - sum += clib_net_to_host_u16 (iphdr[20]); - sum += clib_net_to_host_u16 (iphdr[21]); + sum += iphdr[20]; + sum += iphdr[21]; case 5: - sum += clib_net_to_host_u16 (iphdr[18]); - sum += clib_net_to_host_u16 (iphdr[19]); + sum += iphdr[18]; + sum += iphdr[19]; case 4: - sum += clib_net_to_host_u16 (iphdr[16]); - sum += clib_net_to_host_u16 (iphdr[17]); + sum += iphdr[16]; + sum += iphdr[17]; case 3: - sum += clib_net_to_host_u16 (iphdr[14]); - sum += clib_net_to_host_u16 (iphdr[15]); + sum += iphdr[14]; + sum += iphdr[15]; case 2: - sum += clib_net_to_host_u16 (iphdr[12]); - sum += clib_net_to_host_u16 (iphdr[13]); + sum += iphdr[12]; + sum += iphdr[13]; case 1: - sum += clib_net_to_host_u16 (iphdr[10]); - sum += clib_net_to_host_u16 (iphdr[11]); + sum += iphdr[10]; + sum += iphdr[11]; default: break; } +#endif sum = ((u16) sum) + (sum >> 16); sum = ((u16) sum) + (sum >> 16); - return clib_host_to_net_u16 (~((u16) sum)); + return ~((u16) sum); +} + +/* *INDENT-OFF* */ +WARN_ON(array-bounds) +/* *INDENT-ON* */ + +always_inline u16 +ip4_header_checksum (ip4_header_t * i) +{ + return ip4_header_checksum_inline (i, /* with_checksum */ 0); } always_inline void @@ -300,6 +358,18 @@ ip4_header_get_ecn (const ip4_header_t * ip4) return (ip4->tos & IP_PACKET_TC_FIELD_ECN_MASK); } +always_inline u8 +ip4_header_get_ttl (const ip4_header_t *ip4) +{ + return (ip4->ttl); +} + +always_inline void +ip4_header_set_ttl (ip4_header_t *ip4, u8 ttl) +{ + ip4->ttl = ttl; +} + always_inline void ip4_header_set_df (ip4_header_t * ip4) { @@ -324,7 +394,7 @@ ip4_header_get_df (const ip4_header_t * ip4) static inline uword ip4_header_checksum_is_valid (ip4_header_t * i) { - return i->checksum == ip4_header_checksum (i); + return ip4_header_checksum_inline (i, /* with_checksum */ 1) == 0; } #define ip4_partial_header_checksum_x1(ip0,sum0) \ @@ -405,47 +475,6 @@ ip4_multicast_ethernet_address (u8 * ethernet_address, ethernet_address[5] = d[3]; } -always_inline void -ip4_tcp_reply_x1 (ip4_header_t * ip0, tcp_header_t * tcp0) -{ - u32 src0, dst0; - - src0 = ip0->src_address.data_u32; - dst0 = ip0->dst_address.data_u32; - ip0->src_address.data_u32 = dst0; - ip0->dst_address.data_u32 = src0; - - src0 = tcp0->src; - dst0 = tcp0->dst; - tcp0->src = dst0; - tcp0->dst = src0; -} - -always_inline void -ip4_tcp_reply_x2 (ip4_header_t * ip0, ip4_header_t * ip1, - tcp_header_t * tcp0, tcp_header_t * tcp1) -{ - u32 src0, dst0, src1, dst1; - - src0 = ip0->src_address.data_u32; - src1 = ip1->src_address.data_u32; - dst0 = ip0->dst_address.data_u32; - dst1 = ip1->dst_address.data_u32; - ip0->src_address.data_u32 = dst0; - ip1->src_address.data_u32 = dst1; - ip0->dst_address.data_u32 = src0; - ip1->dst_address.data_u32 = 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; -} - #endif /* included_ip4_packet_h */ /*