Merge pull request #817 from ywc689/bugfix

sent rst to both ends when snat session expires
iqiyi · Jul 14, 2022 · b42c3a2 · b42c3a2
2 parents ebec3f3 + aa08810
commit b42c3a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/config.mk b/src/config.mk
@@ -48,6 +48,7 @@ CFLAGS += -D CONFIG_DPVS_LOG
 #CFLAGS += -D CONFIG_MSG_DEBUG
 #CFLAGS += -D CONFIG_DPVS_MP_DEBUG
 #CFLAGS += -D CONFIG_DPVS_NETIF_DEBUG
+#CFLAGS += -D CONFIG_DPVS_ICMP_DEBUG
 
 # for ixgbe nic
 ifeq ($(CONFIG_IXGEB_PMD), y)

diff --git a/src/ipv6/icmp6.c b/src/ipv6/icmp6.c
@@ -33,7 +33,7 @@ static void icmp6_dump_hdr(const struct rte_mbuf *mbuf)
     lcoreid_t lcore = rte_lcore_id();
 
     fprintf(stderr, "lcore %d port %d icmp type %u code %u\n",
-            lcore, mbuf->port, ich->icmp_type, ich->icmp_code);
+            lcore, mbuf->port, ich->icmp6_type, ich->icmp6_code);
 
     return;
 }

diff --git a/src/ipvs/ip_vs_proto_tcp.c b/src/ipvs/ip_vs_proto_tcp.c
@@ -1145,8 +1145,9 @@ static int tcp_conn_expire(struct dp_vs_proto *proto,
     int err;
     assert(proto && conn && conn->dest);
 
-    if (conn->dest->fwdmode == DPVS_FWD_MODE_NAT
-            || conn->dest->fwdmode == DPVS_FWD_MODE_FNAT) {
+    if (conn->dest->fwdmode == DPVS_FWD_MODE_FNAT
+            || conn->dest->fwdmode == DPVS_FWD_MODE_SNAT
+            || conn->dest->fwdmode == DPVS_FWD_MODE_NAT) {
         /* send RST to RS and client */
         err = tcp_send_rst(proto, conn, DPVS_CONN_DIR_INBOUND);
         if (err != EDPVS_OK)