Changes in uspace/srv/net/tl/tcp/conn.c [2f0dd2a:e1c6dde9] in mainline

File:

• uspace/srv/net/tl/tcp/conn.c (modified) (2 diffs)

uspace/srv/net/tl/tcp/conn.c

@@ -491 +491 @@
                     conn->snd_una, seg->ack, conn->snd_nxt);
                 if (!seq_no_ack_acceptable(conn, seg->ack)) {
-                        if ((seg->ctrl & CTL_RST) == 0) {
-                                log_msg(LVL_WARN, "ACK not acceptable, send RST");
-                                tcp_reply_rst(&conn->ident, seg);
-                        } else {
-                                log_msg(LVL_WARN, "RST,ACK not acceptable, drop");
-                        }
+                        log_msg(LVL_WARN, "ACK not acceptable, send RST.");
+                        tcp_reply_rst(&conn->ident, seg);
                         return;
                 }
@@ -502 +498 @@
 
         if ((seg->ctrl & CTL_RST) != 0) {
-                /* If we get here, we have either an acceptable ACK or no ACK */
-                if ((seg->ctrl & CTL_ACK) != 0) {
-                        log_msg(LVL_DEBUG, "%s: Connection reset. -> Closed",
-                            conn->name);
-                        /* Reset connection */
-                        tcp_conn_reset(conn);
-                        return;
-                } else {
-                        log_msg(LVL_DEBUG, "%s: RST without ACK, drop",
-                            conn->name);
-                        return;
-                }
+                log_msg(LVL_DEBUG, "%s: Connection reset. -> Closed",
+                    conn->name);
+                /* Reset connection */
+                tcp_conn_reset(conn);
+                /* XXX delete connection */
+                return;
         }