fix last commit

wangyu- · wangyu- · commit 2c67c319b70e · 2018-02-24T18:07:16.000-06:00
diff --git a/network.cpp b/network.cpp
@@ -568,6 +568,8 @@ int send_raw_ip(raw_info_t &raw_info,const char * payload,int payloadlen)
 
 	if(raw_info.disabled)
 	{
+		mylog(log_debug,"[%s,%d]connection disabled, no packet will be sent\n",my_ntoa(recv_info.src_ip),recv_info.src_port);
+		assert(max_rst_allowed>=0);
 		return 0;
 	}
 
@@ -1451,6 +1453,7 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen)
     if(tcph->rst==1)
     {
 		raw_info.rst_received++;
+
     	if(max_rst_to_show>0)
     	{
     		if(raw_info.rst_received < max_rst_to_show)
@@ -1459,14 +1462,14 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen)
     		}
     		else if(raw_info.rst_received == max_rst_to_show)
     		{
-    			mylog(log_warn,"[%s,%d]rst==1,cnt=%d >=max_rst_to_show, this log is muted for current connection\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received);
+    			mylog(log_warn,"[%s,%d]rst==1,cnt=%d >=max_rst_to_show, this log will be muted for current connection\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received);
     		}
     		else
     		{
     			mylog(log_debug,"[%s,%d]rst==1,cnt=%d\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received);
     		}
     	}
-    	if(max_rst_to_show==0)
+    	else if(max_rst_to_show==0)
     	{
     		mylog(log_debug,"[%s,%d]rst==1,cnt=%d\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received);
     	}
@@ -1477,7 +1480,7 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen)
 
 		if(max_rst_allowed>=0 && raw_info.rst_received==max_rst_allowed+1 )
 		{
-			mylog(log_warn,"[%s,%d]connection disabled because of rst_received %d > max_rst_allow=%d\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received,(int)max_rst_allowed );
+			mylog(log_warn,"[%s,%d]connection disabled because of rst_received=%d > max_rst_allow=%d\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received,(int)max_rst_allowed );
 			raw_info.disabled=1;
 		}
     }

Original file line number	Diff line number	Diff line change
`@@ -568,6 +568,8 @@ int send_raw_ip(raw_info_t &raw_info,const char * payload,int payloadlen)`
`568`	`568`
`569`	`569`	`if(raw_info.disabled)`
`570`	`570`	`{`
	`571`	`+ mylog(log_debug,"[%s,%d]connection disabled, no packet will be sent\n",my_ntoa(recv_info.src_ip),recv_info.src_port);`
	`572`	`+ assert(max_rst_allowed>=0);`
`571`	`573`	`return 0;`
`572`	`574`	`}`
`573`	`575`
`@@ -1451,6 +1453,7 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen)`
`1451`	`1453`	`if(tcph->rst==1)`
`1452`	`1454`	`{`
`1453`	`1455`	`raw_info.rst_received++;`
	`1456`	`+`
`1454`	`1457`	`if(max_rst_to_show>0)`
`1455`	`1458`	`{`
`1456`	`1459`	`if(raw_info.rst_received < max_rst_to_show)`
`@@ -1459,14 +1462,14 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen)`
`1459`	`1462`	`}`
`1460`	`1463`	`else if(raw_info.rst_received == max_rst_to_show)`
`1461`	`1464`	`{`
`1462`		`- mylog(log_warn,"[%s,%d]rst==1,cnt=%d >=max_rst_to_show, this log is muted for current connection\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received);`
	`1465`	`+ mylog(log_warn,"[%s,%d]rst==1,cnt=%d >=max_rst_to_show, this log will be muted for current connection\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received);`
`1463`	`1466`	`}`
`1464`	`1467`	`else`
`1465`	`1468`	`{`
`1466`	`1469`	`mylog(log_debug,"[%s,%d]rst==1,cnt=%d\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received);`
`1467`	`1470`	`}`
`1468`	`1471`	`}`
`1469`		`- if(max_rst_to_show==0)`
	`1472`	`+ else if(max_rst_to_show==0)`
`1470`	`1473`	`{`
`1471`	`1474`	`mylog(log_debug,"[%s,%d]rst==1,cnt=%d\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received);`
`1472`	`1475`	`}`
`@@ -1477,7 +1480,7 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen)`
`1477`	`1480`
`1478`	`1481`	`if(max_rst_allowed>=0 && raw_info.rst_received==max_rst_allowed+1 )`
`1479`	`1482`	`{`
`1480`		`- mylog(log_warn,"[%s,%d]connection disabled because of rst_received %d > max_rst_allow=%d\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received,(int)max_rst_allowed );`
	`1483`	`+ mylog(log_warn,"[%s,%d]connection disabled because of rst_received=%d > max_rst_allow=%d\n",my_ntoa(recv_info.src_ip),recv_info.src_port,(int)raw_info.rst_received,(int)max_rst_allowed );`
`1481`	`1484`	`raw_info.disabled=1;`
`1482`	`1485`	`}`
`1483`	`1486`	`}`