Index: /branches/rel_apv_10_7_3/usr/src/sys/click/app/portfw/portfw.c
===================================================================
--- /branches/rel_apv_10_7_3/usr/src/sys/click/app/portfw/portfw.c	(revision 40183)
+++ /branches/rel_apv_10_7_3/usr/src/sys/click/app/portfw/portfw.c	(working copy)
@@ -286,7 +286,6 @@
 		return 0;
 	}
 
-	FASTLOG_SETUP_CONNECTION(CLICKTCP_SETUP_CONN_LOG, pcb, target);
 	pcb->cp_app = NULL;
 
 	/* Bug 22104, Adjust set CLICKPCB_SPLICE_NAT flag and call splice 
Index: /branches/rel_apv_10_7_3/usr/src/sys/click/netinet/click_input.c
===================================================================
--- /branches/rel_apv_10_7_3/usr/src/sys/click/netinet/click_input.c	(revision 40183)
+++ /branches/rel_apv_10_7_3/usr/src/sys/click/netinet/click_input.c	(working copy)
@@ -10897,7 +10897,6 @@
 				clicktcp_leave_func(int, 1);
 			}
 
-			FASTLOG_SETUP_CONNECTION(CLICKTCP_SETUP_CONN_LOG, client_pcb, server_pcb);
 			/* 
 			 * mss is not allowed to exceed the outgress if limit.
 			 * make sure that m and opt_addr have not been adjusted before here.
Index: /branches/rel_apv_10_7_3/usr/src/sys/click/netinet/click_splice.c
===================================================================
--- /branches/rel_apv_10_7_3/usr/src/sys/click/netinet/click_splice.c	(revision 40183)
+++ /branches/rel_apv_10_7_3/usr/src/sys/click/netinet/click_splice.c	(working copy)
@@ -143,6 +143,9 @@
 				server_pcb->recovery_point = server_pcb->sendleftwin = tcp->th_ack;
 				server_pcb->sendrightwin = tcp->th_ack + tcp->th_win;
 				clicktcp_newrealstate(server_pcb, TCPS_ESTABLISHED);
+				// TWSD-1397, record the connection SETUP log when 3-way handshake is completed.
+				if (likely(!server_pcb->cp_rs))
+					FASTLOG_SETUP_CONNECTION(CLICKTCP_SETUP_CONN_LOG, client_pcb, server_pcb);
 				/* patch offset to take server's iss into account */
 				client_pcb->splice_data.seq_offset -= server_pcb->recvnextseq;
 #if 0
@@ -1080,6 +1083,8 @@
 	sf_session_close(pcb);
 	pcb->cp_flags &= ~CLICKPCB_SPLICE_FLAGS;
 	target_pcb->cp_flags &= ~CLICKPCB_SPLICE_FLAGS;
+	// TWSD-1397, RST should be considered as DROP connection.
+	pcb->rexmt_count = 5;
 	FASTLOG_SETUP_CONNECTION(CLICKTCP_SETUP_CONN_LOG, pcb, target_pcb);
 	clicktcp_abortive_close(target_pcb);
 	clicktcp_abortive_close(pcb);