Changeset dffabf0 in mainline for uspace/srv/net

Timestamp:

2011-01-05T19:08:03Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f03d3786

Parents:

e84d65a (diff), 196ef08 (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

Conflicts: no problem solving.
Added new apps to ignore list.

Location:

uspace/srv/net

Files:

• cfg/Makefile (modified) (1 diff)
• cfg/lo.netif_nil_bundle (deleted)
• cfg/ne2k.netif_nil_bundle (deleted)
• cfg/ne2k.netif_standalone (modified) (1 diff)
• netif/lo/Makefile (modified) (1 diff)
• nil/eth/Makefile (modified) (1 diff)
• nil/nildummy/Makefile (modified) (1 diff)
• tl/tcp/tcp.c (modified) (10 diffs)

uspace/srv/net/cfg/Makefile

@@ -36 +36 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LO_SOURCE = lo.netif_nil_bundle
-        NE2K_SOURCE = ne2k.netif_nil_bundle
-else
-        LO_SOURCE = lo.netif_standalone
-        NE2K_SOURCE = ne2k.netif_standalone
-endif
+LO_SOURCE = lo.netif_standalone
+NE2K_SOURCE = ne2k.netif_standalone
 
 LO_TARGET = lo

uspace/srv/net/cfg/ne2k.netif_standalone

@@ -7 +7 @@
 IL=ip
 
-IRQ=9
+IRQ=5
 IO=300
 

uspace/srv/net/netif/lo/Makefile

@@ -39 +39 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LIBS += $(USPACE_PREFIX)/srv/net/nil/nildummy/libnildummy.a
-endif
-
 BINARY = lo
 

uspace/srv/net/nil/eth/Makefile

@@ -39 +39 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LIBRARY = libeth
-else
-        BINARY = eth
-endif
+BINARY = eth
 
 SOURCES = \

uspace/srv/net/nil/nildummy/Makefile

@@ -39 +39 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LIBRARY = libnildummy
-else
-        BINARY = nildummy
-endif
+BINARY = nildummy
 
 SOURCES = \

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

@@ -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);
@@ -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 */);
 }
 
@@ -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));
@@ -2210 +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;