Changeset 3819ce5 in mainline for uspace/srv

Timestamp:

2011-12-25T10:05:28Z (14 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

Location:

uspace/srv/net/tl/tcp

Files:

• conn.c (modified) (2 diffs)
• segment.c (modified) (1 diff)
• tcp.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;
+                }
         }
 

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

@@ -119 +119 @@
                 return NULL;
 
-        rseg->ctrl = CTL_RST;
-        rseg->seq = seg->ack;
+        if ((seg->ctrl & CTL_ACK) == 0) {
+                rseg->ctrl = CTL_RST | CTL_ACK;
+                rseg->seq = 0;
+                rseg->ack = seg->seq + seg->len;
+        } else {
+                rseg->ctrl = CTL_RST;
+                rseg->seq = seg->ack;
+        }
 
         return rseg;

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

@@ -36 +36 @@
 
 #include <async.h>
+#include <bitops.h>
 #include <byteorder.h>
 #include <errno.h>
@@ -191 +192 @@
         tcp_pdu_t *pdu;
         size_t hdr_size;
-
-        /* XXX Header options */
-        hdr_size = sizeof(tcp_header_t);
+        tcp_header_t *hdr;
+        uint32_t data_offset;
+
+        if (pdu_raw_size < sizeof(tcp_header_t)) {
+                log_msg(LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu",
+                    pdu_raw_size, sizeof(tcp_header_t));
+                pq_release_remote(net_sess, packet_get_id(packet));
+                return EINVAL;
+        }
+
+        hdr = (tcp_header_t *)pdu_raw;
+        data_offset = BIT_RANGE_EXTRACT(uint32_t, DF_DATA_OFFSET_h, DF_DATA_OFFSET_l,
+            uint16_t_be2host(hdr->doff_flags));
+
+        hdr_size = sizeof(uint32_t) * data_offset;
 
         if (pdu_raw_size < hdr_size) {
                 log_msg(LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu",
                     pdu_raw_size, hdr_size);
+                pq_release_remote(net_sess, packet_get_id(packet));
+                return EINVAL;
+        }
+
+        if (hdr_size < sizeof(tcp_header_t)) {
+                log_msg(LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu",
+                    hdr_size, sizeof(tcp_header_t));
                 pq_release_remote(net_sess, packet_get_id(packet));
                 return EINVAL;