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_out2in.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_out2in.c')
| -rw-r--r-- | src/plugins/nat/nat_det_out2in.c | 60 |
1 files changed, 27 insertions, 33 deletions
diff --git a/src/plugins/nat/nat_det_out2in.c b/src/plugins/nat/nat_det_out2in.c index c4bd096deb1..45fba18b248 100644 --- a/src/plugins/nat/nat_det_out2in.c +++ b/src/plugins/nat/nat_det_out2in.c @@ -343,8 +343,7 @@ VLIB_NODE_FN (snat_det_out2in_node) (vlib_main_t * vm, b0->error = node->errors[NAT_DET_OUT2IN_ERROR_NO_TRANSLATION]; goto trace0; } - old_port0 = udp0->dst_port; - udp0->dst_port = new_port0 = ses0->in_port; + new_port0 = ses0->in_port; old_addr0 = ip0->dst_address; ip0->dst_address = new_addr0; @@ -365,25 +364,24 @@ VLIB_NODE_FN (snat_det_out2in_node) (vlib_main_t * vm, && ses0->state == SNAT_SESSION_TCP_LAST_ACK) snat_det_ses_close (dm0, ses0); + old_port0 = tcp0->dst; + tcp0->dst = new_port0; + sum0 = tcp0->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 */ ); tcp0->checksum = ip_csum_fold (sum0); } - else if (udp0->checksum) + else { - 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->dst_port; + udp0->dst_port = new_port0; + udp0->checksum = 0; } trace0: @@ -464,8 +462,7 @@ VLIB_NODE_FN (snat_det_out2in_node) (vlib_main_t * vm, b1->error = node->errors[NAT_DET_OUT2IN_ERROR_NO_TRANSLATION]; goto trace1; } - old_port1 = udp1->dst_port; - udp1->dst_port = new_port1 = ses1->in_port; + new_port1 = ses1->in_port; old_addr1 = ip1->dst_address; ip1->dst_address = new_addr1; @@ -486,25 +483,24 @@ VLIB_NODE_FN (snat_det_out2in_node) (vlib_main_t * vm, && ses1->state == SNAT_SESSION_TCP_LAST_ACK) snat_det_ses_close (dm1, ses1); + old_port1 = tcp1->dst; + tcp1->dst = new_port1; + sum1 = tcp1->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 */ ); tcp1->checksum = ip_csum_fold (sum1); } - else if (udp1->checksum) + else { - 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->dst_port; + udp1->dst_port = new_port1; + udp1->checksum = 0; } trace1: @@ -618,8 +614,7 @@ VLIB_NODE_FN (snat_det_out2in_node) (vlib_main_t * vm, b0->error = node->errors[NAT_DET_OUT2IN_ERROR_NO_TRANSLATION]; goto trace00; } - old_port0 = udp0->dst_port; - udp0->dst_port = new_port0 = ses0->in_port; + new_port0 = ses0->in_port; old_addr0 = ip0->dst_address; ip0->dst_address = new_addr0; @@ -640,25 +635,24 @@ VLIB_NODE_FN (snat_det_out2in_node) (vlib_main_t * vm, && ses0->state == SNAT_SESSION_TCP_LAST_ACK) snat_det_ses_close (dm0, ses0); + old_port0 = tcp0->dst; + tcp0->dst = new_port0; + sum0 = tcp0->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 */ ); tcp0->checksum = ip_csum_fold (sum0); } - else if (udp0->checksum) + else { - 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->dst_port; + udp0->dst_port = new_port0; + udp0->checksum = 0; } trace00: |