Changeset 3819ce5 in mainline for uspace/srv/net/tl/tcp/conn.c

Timestamp:

2011-12-25T10:05:28Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ecf823a

Parents:

1440eae (diff), 7e1b130 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 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)) {
-                        log_msg(LVL_WARN, "ACK not acceptable, send RST.");
-                        tcp_reply_rst(&conn->ident, seg);
+                        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");
+                        }
                         return;
                 }
@@ -498 +502 @@
 
         if ((seg->ctrl & CTL_RST) != 0) {
-                log_msg(LVL_DEBUG, "%s: Connection reset. -> Closed",
-                    conn->name);
-                /* Reset connection */
-                tcp_conn_reset(conn);
-                /* XXX delete connection */
-                return;
+                /* 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;
+                }
         }