diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/ip/ip4_format.c | 7 | ||||
| -rw-r--r-- | src/vnet/ip/ip4_forward.c | 4 | ||||
| -rw-r--r-- | src/vnet/ip/ip4_pg.c | 6 | ||||
| -rw-r--r-- | src/vnet/ipfix-export/flow_report_classify.c | 4 | ||||
| -rw-r--r-- | src/vnet/ipfix-export/ipfix_doc.md | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/src/vnet/ip/ip4_format.c b/src/vnet/ip/ip4_format.c index 786a01d396b..c6639b20716 100644 --- a/src/vnet/ip/ip4_format.c +++ b/src/vnet/ip/ip4_format.c @@ -150,9 +150,10 @@ format_ip4_header (u8 * s, va_list * args) /* Check and report invalid checksums. */ { - u16 c = ip4_header_checksum (ip); - if (c != ip->checksum) - s = format (s, " (should be 0x%04x)", clib_net_to_host_u16 (c)); + if (!ip4_header_checksum_is_valid (ip)) + s = + format (s, " (should be 0x%04x)", + clib_net_to_host_u16 (ip4_header_checksum (ip))); } s = format (s, " dscp %U ecn %U", diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c index 595a0a1913c..3bf305303d4 100644 --- a/src/vnet/ip/ip4_forward.c +++ b/src/vnet/ip/ip4_forward.c @@ -2063,7 +2063,7 @@ ip4_ttl_inc (vlib_buffer_t * b, ip4_header_t * ip) ttl += 1; ip->ttl = ttl; - ASSERT (ip->checksum == ip4_header_checksum (ip)); + ASSERT (ip4_header_checksum_is_valid (ip)); } /* Decrement TTL & update checksum. @@ -2104,7 +2104,7 @@ ip4_ttl_and_checksum_check (vlib_buffer_t * b, ip4_header_t * ip, u16 * next, } /* Verify checksum. */ - ASSERT ((ip->checksum == ip4_header_checksum (ip)) || + ASSERT (ip4_header_checksum_is_valid (ip) || (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM)); } diff --git a/src/vnet/ip/ip4_pg.c b/src/vnet/ip/ip4_pg.c index d89424496f0..2ccd2b45a6f 100644 --- a/src/vnet/ip/ip4_pg.c +++ b/src/vnet/ip/ip4_pg.c @@ -90,8 +90,8 @@ compute_length_and_or_checksum (vlib_main_t * vm, ip0->checksum = ~ip_csum_fold (sum0); ip1->checksum = ~ip_csum_fold (sum1); - ASSERT (ip0->checksum == ip4_header_checksum (ip0)); - ASSERT (ip1->checksum == ip4_header_checksum (ip1)); + ASSERT (ip4_header_checksum_is_valid (ip0)); + ASSERT (ip4_header_checksum_is_valid (ip1)); } } @@ -123,7 +123,7 @@ compute_length_and_or_checksum (vlib_main_t * vm, ip4_partial_header_checksum_x1 (ip0, sum0); ip0->checksum = ~ip_csum_fold (sum0); - ASSERT (ip0->checksum == ip4_header_checksum (ip0)); + ASSERT (ip4_header_checksum_is_valid (ip0)); } } } diff --git a/src/vnet/ipfix-export/flow_report_classify.c b/src/vnet/ipfix-export/flow_report_classify.c index f004e9a0806..58f623db145 100644 --- a/src/vnet/ipfix-export/flow_report_classify.c +++ b/src/vnet/ipfix-export/flow_report_classify.c @@ -321,7 +321,7 @@ ipfix_classify_send_flows (flow_report_main_t * frm, udp->checksum = 0xffff; } - ASSERT (ip->checksum == ip4_header_checksum (ip)); + ASSERT (ip4_header_checksum_is_valid (ip)); to_next[0] = bi0; f->n_vectors++; @@ -376,7 +376,7 @@ flush: udp->checksum = 0xffff; } - ASSERT (ip->checksum == ip4_header_checksum (ip)); + ASSERT (ip4_header_checksum_is_valid (ip)); to_next[0] = bi0; f->n_vectors++; diff --git a/src/vnet/ipfix-export/ipfix_doc.md b/src/vnet/ipfix-export/ipfix_doc.md index 59118f68e11..1c7aad7750d 100644 --- a/src/vnet/ipfix-export/ipfix_doc.md +++ b/src/vnet/ipfix-export/ipfix_doc.md @@ -259,7 +259,7 @@ This function creates the packet header for an ipfix data packet udp->checksum = 0xffff; } - ASSERT (ip->checksum == ip4_header_checksum (ip)); + ASSERT (ip4_header_checksum_is_valid (ip)); vlib_put_frame_to_node (vm, ip4_lookup_node.index, f); } |