Changeset a676574 in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2011-01-09T12:18:00Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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 mainline changes.

File:

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

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

@@ -154 +154 @@
 
         /** Port map key. */
-        char *key;
+        uint8_t *key;
 
         /** Port map key length. */
@@ -205 +205 @@
 static int tcp_queue_received_packet(socket_core_t *, tcp_socket_data_t *,
     packet_t *, int, size_t);
+static void tcp_queue_received_end_of_data(socket_core_t *socket);
 
 static int tcp_received_msg(device_id_t, packet_t *, services_t, services_t);
@@ -357 +358 @@
         /* Find the destination socket */
         socket = socket_port_find(&tcp_globals.sockets,
-            ntohs(header->destination_port), (const char *) src, addrlen);
+            ntohs(header->destination_port), (uint8_t *) src, addrlen);
         if (!socket) {
                 /* Find the listening destination socket */
                 socket = socket_port_find(&tcp_globals.sockets,
-                    ntohs(header->destination_port), SOCKET_MAP_KEY_LISTENING,
-                    0);
+                    ntohs(header->destination_port),
+                    (uint8_t *) SOCKET_MAP_KEY_LISTENING, 0);
         }
 
@@ -453 +454 @@
 
 has_error_service:
-        fibril_rwlock_read_unlock(&tcp_globals.lock);
+        fibril_rwlock_write_unlock(&tcp_globals.lock);
 
         /* TODO error reporting/handling */
@@ -504 +505 @@
         size_t offset;
         uint32_t new_sequence_number;
+        bool forced_ack;
         int rc;
 
@@ -512 +514 @@
         assert(packet);
 
+        forced_ack = false;
+
         new_sequence_number = ntohl(header->sequence_number);
         old_incoming = socket_data->next_incoming;
 
-        if (header->finalize)
-                socket_data->fin_incoming = new_sequence_number;
+        if (header->finalize) {
+                socket_data->fin_incoming = new_sequence_number +
+                    total_length - TCP_HEADER_LENGTH(header);
+        }
 
         /* Trim begining if containing expected data */
@@ -760 +766 @@
                 /* Release duplicite or restricted */
                 pq_release_remote(tcp_globals.net_phone, packet_get_id(packet));
-        }
-
-        /* Change state according to the acknowledging incoming fin */
-        if (IS_IN_INTERVAL_OVERFLOW(old_incoming, socket_data->fin_incoming,
-            socket_data->next_incoming)) {
+                forced_ack = true;
+        }
+
+        /* If next in sequence is an incoming FIN */
+        if (socket_data->next_incoming == socket_data->fin_incoming) {
+                /* Advance sequence number */
+                socket_data->next_incoming += 1;
+
+                /* Handle FIN */
                 switch (socket_data->state) {
                 case TCP_SOCKET_FIN_WAIT_1:
@@ -771 +781 @@
                         socket_data->state = TCP_SOCKET_CLOSING;
                         break;
-                /*case TCP_ESTABLISHED:*/
+                case TCP_SOCKET_ESTABLISHED:
+                        /* Queue end-of-data marker on the socket. */
+                        tcp_queue_received_end_of_data(socket);
+                        socket_data->state = TCP_SOCKET_CLOSE_WAIT;
+                        break;
                 default:
                         socket_data->state = TCP_SOCKET_CLOSE_WAIT;
@@ -779 +793 @@
 
         packet = tcp_get_packets_to_send(socket, socket_data);
-        if (!packet) {
+        if (!packet && (socket_data->next_incoming != old_incoming || forced_ack)) {
                 /* Create the notification packet */
                 rc = tcp_create_notification_packet(&packet, socket,
@@ -835 +849 @@
 
         return EOK;
+}
+
+/** Queue end-of-data marker on the socket.
+ *
+ * Next element in the sequence space is FIN. Queue end-of-data marker
+ * on the socket.
+ *
+ * @param socket        Socket
+ */
+static void tcp_queue_received_end_of_data(socket_core_t *socket)
+{
+        assert(socket != NULL);
+
+        /* Notify the destination socket */
+        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+            (sysarg_t) socket->socket_id,
+            0, 0, 0,
+            (sysarg_t) 0 /* 0 fragments == no more data */);
 }
 
@@ -966 +998 @@
         /* Find the destination socket */
         listening_socket = socket_port_find(&tcp_globals.sockets,
-            listening_port, SOCKET_MAP_KEY_LISTENING, 0);
+            listening_port, (uint8_t *) SOCKET_MAP_KEY_LISTENING, 0);
         if (!listening_socket ||
             (listening_socket->socket_id != listening_socket_id)) {
@@ -990 +1022 @@
 
         rc = socket_port_add(&tcp_globals.sockets, listening_port, socket,
-            (const char *) socket_data->addr, socket_data->addrlen);
+            (uint8_t *) socket_data->addr, socket_data->addrlen);
         assert(socket == socket_port_find(&tcp_globals.sockets, listening_port,
-            (const char *) socket_data->addr, socket_data->addrlen));
+            (uint8_t *) socket_data->addr, socket_data->addrlen));
 
 //      rc = socket_bind_free_port(&tcp_globals.sockets, socket,
@@ -1803 +1835 @@
                         fibril_rwlock_write_unlock(socket_data->local_lock);
 
+                        socket_data->state = TCP_SOCKET_SYN_SENT;
+
                         /* Send the packet */
                         printf("connecting %d\n", packet_get_id(packet));
@@ -2075 +2109 @@
 
         /* Copy the key */
-        operation_timeout->key = ((char *) operation_timeout) +
+        operation_timeout->key = ((uint8_t *) operation_timeout) +
             sizeof(*operation_timeout);
         operation_timeout->key_length = socket->key_length;
@@ -2085 +2119 @@
         if (!fibril) {
                 free(operation_timeout);
-                return EPARTY;  /* FIXME: use another EC */
-        }
+                return ENOMEM;
+        }
+
 //      fibril_mutex_lock(&socket_data->operation.mutex);
         /* Start the timeout fibril */
@@ -2209 +2244 @@
 
                 tcp_prepare_operation_header(socket, socket_data, header, 0, 0);
-                rc = tcp_queue_packet(socket, socket_data, packet, 0);
+                rc = tcp_queue_packet(socket, socket_data, packet, total_length);
                 if (rc != EOK)
                         return rc;