[ovs-dev] [PATCH v4 1/3] conntrack: restore the origin sport for each round with new address

[wenxu at ucloud.cn]

From: wenxu <wenxu at ucloud.cn>

It is better to choose the origin select sport as current sport
for each port search round with new address.

Signed-off-by: wenxu <wenxu at ucloud.cn>
---
 lib/conntrack.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/conntrack.c b/lib/conntrack.c
index 551c206..00906f8 100644
--- a/lib/conntrack.c
+++ b/lib/conntrack.c
@@ -2409,11 +2409,11 @@ nat_get_unique_tuple(struct conntrack *ct, const struct conn *conn,
 {
     union ct_addr min_addr = {0}, max_addr = {0}, curr_addr = {0},
                   guard_addr = {0};
+    uint16_t min_sport, max_sport, curr_sport, orig_sport;
     uint32_t hash = nat_range_hash(conn, ct->hash_basis);
     bool pat_proto = conn->key.nw_proto == IPPROTO_TCP ||
                      conn->key.nw_proto == IPPROTO_UDP;
     uint16_t min_dport, max_dport, curr_dport;
-    uint16_t min_sport, max_sport, curr_sport;
 
     min_addr = conn->nat_info->min_addr;
     max_addr = conn->nat_info->max_addr;
@@ -2425,7 +2425,7 @@ nat_get_unique_tuple(struct conntrack *ct, const struct conn *conn,
      * we can stop once we reach it. */
     guard_addr = curr_addr;
 
-    set_sport_range(conn->nat_info, &conn->key, hash, &curr_sport,
+    set_sport_range(conn->nat_info, &conn->key, hash, &orig_sport,
                     &min_sport, &max_sport);
     set_dport_range(conn->nat_info, &conn->key, hash, &curr_dport,
                     &min_dport, &max_dport);
@@ -2443,6 +2443,8 @@ another_round:
         goto next_addr;
     }
 
+    curr_sport = orig_sport;
+
     FOR_EACH_PORT_IN_RANGE(curr_dport, min_dport, max_dport) {
         nat_conn->rev_key.src.port = htons(curr_dport);
         FOR_EACH_PORT_IN_RANGE(curr_sport, min_sport, max_sport) {
-- 
1.8.3.1