fin/rst bug

javpaw · Sep 7, 2013 · 0c600e3 · 0c600e3
1 parent 553a171
commit 0c600e3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main.c b/src/main.c
@@ -537,7 +537,7 @@ receive_thread(struct Masscan *masscan,
 
                 /* If this is a FIN, handle that. Note that ACK + 
                  * payload + FIN can come together */
-                if (TCP_IS_FIN(px, parsed.transport_offset)) {
+                if (TCP_IS_FIN(px, parsed.transport_offset) && !TCP_IS_RST(px, parsed.transport_offset)) {
                     tcpcon_handle(tcpcon, tcb, TCP_WHAT_FIN, 
                         0, 0, secs, usecs, seqno_them);
                 }
@@ -553,6 +553,7 @@ receive_thread(struct Masscan *masscan,
                  *  This happens when we've sent a FIN, deleted our connection,
                  *  but the other side didn't get the packet.
                  */
+                if (!TCP_IS_RST(px, parsed.transport_offset))
                 tcpcon_send_FIN(
                     tcpcon,
                     ip_me, ip_them,