diff options
| author |   Ole Troan <ot@cisco.com> | 2019-11-04 13:44:09 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-11-04 15:44:00 +0000 |
| commit | 8f6d7a78767e6c49925bd380ed3601b70b43b3ee (patch) | |
| tree | dd3158b1a32a61f402fd182ea8b9c865a59b7c9d /src/plugins/nat/nat_det_in2out.c | |
| parent | cb3cfe876b3bbe2f360e3b32a43a060bdcb8bf9e (diff) | |
nat: revert respect udp checksum
This reverts commit 0d75f783644a24b219ed79d9f9c17387783f67ca.
Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: Iaf33301201897e6646eba2b4157e2a45f5fd30f2
Diffstat (limited to 'src/plugins/nat/nat_det_in2out.c')
| -rw-r--r-- | src/plugins/nat/nat_det_in2out.c | 69 |
1 files changed, 21 insertions, 48 deletions
diff --git a/src/plugins/nat/nat_det_in2out.c b/src/plugins/nat/nat_det_in2out.c index 832a2bae947..918e1f5f9c0 100644 --- a/src/plugins/nat/nat_det_in2out.c +++ b/src/plugins/nat/nat_det_in2out.c @@ -392,8 +392,7 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, } } - old_port0 = udp0->src_port; - udp0->src_port = new_port0 = ses0->out.out_port; + new_port0 = ses0->out.out_port; old_addr0.as_u32 = ip0->src_address.as_u32; ip0->src_address.as_u32 = new_addr0.as_u32; @@ -425,6 +424,9 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, && ses0->state == SNAT_SESSION_UNKNOWN) ses0->state = SNAT_SESSION_TCP_ESTABLISHED; + old_port0 = tcp0->src; + tcp0->src = new_port0; + sum0 = tcp0->checksum; sum0 = ip_csum_update (sum0, old_addr0.as_u32, new_addr0.as_u32, ip4_header_t, @@ -438,20 +440,9 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, else { ses0->state = SNAT_SESSION_UDP_ACTIVE; - - if (PREDICT_FALSE (udp0->checksum)) - { - sum0 = udp0->checksum; - sum0 = - ip_csum_update (sum0, old_addr0.as_u32, new_addr0.as_u32, - ip4_header_t, - dst_address /* changed member */ ); - sum0 = - ip_csum_update (sum0, old_port0, new_port0, - ip4_header_t /* cheat */ , - length /* changed member */ ); - udp0->checksum = ip_csum_fold (sum0); - } + old_port0 = udp0->src_port; + udp0->src_port = new_port0; + udp0->checksum = 0; } switch (ses0->state) @@ -565,8 +556,7 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, } } - old_port1 = udp1->src_port; - udp1->src_port = new_port1 = ses1->out.out_port; + new_port1 = ses1->out.out_port; old_addr1.as_u32 = ip1->src_address.as_u32; ip1->src_address.as_u32 = new_addr1.as_u32; @@ -598,6 +588,9 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, && ses1->state == SNAT_SESSION_UNKNOWN) ses1->state = SNAT_SESSION_TCP_ESTABLISHED; + old_port1 = tcp1->src; + tcp1->src = new_port1; + sum1 = tcp1->checksum; sum1 = ip_csum_update (sum1, old_addr1.as_u32, new_addr1.as_u32, ip4_header_t, @@ -611,20 +604,9 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, else { ses1->state = SNAT_SESSION_UDP_ACTIVE; - - if (PREDICT_FALSE (udp1->checksum)) - { - sum1 = udp1->checksum; - sum1 = - ip_csum_update (sum1, old_addr1.as_u32, new_addr1.as_u32, - ip4_header_t, - dst_address /* changed member */ ); - sum1 = - ip_csum_update (sum1, old_port1, new_port1, - ip4_header_t /* cheat */ , - length /* changed member */ ); - udp1->checksum = ip_csum_fold (sum1); - } + old_port1 = udp1->src_port; + udp1->src_port = new_port1; + udp1->checksum = 0; } switch (ses1->state) @@ -774,8 +756,7 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, } } - old_port0 = udp0->src_port; - udp0->src_port = new_port0 = ses0->out.out_port; + new_port0 = ses0->out.out_port; old_addr0.as_u32 = ip0->src_address.as_u32; ip0->src_address.as_u32 = new_addr0.as_u32; @@ -807,6 +788,9 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, && ses0->state == SNAT_SESSION_UNKNOWN) ses0->state = SNAT_SESSION_TCP_ESTABLISHED; + old_port0 = tcp0->src; + tcp0->src = new_port0; + sum0 = tcp0->checksum; sum0 = ip_csum_update (sum0, old_addr0.as_u32, new_addr0.as_u32, ip4_header_t, @@ -820,20 +804,9 @@ VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm, else { ses0->state = SNAT_SESSION_UDP_ACTIVE; - - if (PREDICT_FALSE (udp0->checksum)) - { - sum0 = udp0->checksum; - sum0 = - ip_csum_update (sum0, old_addr0.as_u32, new_addr0.as_u32, - ip4_header_t, - dst_address /* changed member */ ); - sum0 = - ip_csum_update (sum0, old_port0, new_port0, - ip4_header_t /* cheat */ , - length /* changed member */ ); - udp0->checksum = ip_csum_fold (sum0); - } + old_port0 = udp0->src_port; + udp0->src_port = new_port0; + udp0->checksum = 0; } switch (ses0->state) |