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

Timestamp:

2011-04-07T21:38:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (diff), ccca251 (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) (4 diffs)

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

@@ -299 +299 @@
                 return tcp_release_and_return(packet, NO_DATA);
 
-//      printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header),
-//          ntohs(header->destination_port));
-
+#if 0
+        printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header),
+            ntohs(header->destination_port));
+#endif
         result = packet_get_addr(packet, (uint8_t **) &src, (uint8_t **) &dest);
         if (result <= 0)
@@ -1062 +1063 @@
         tcp_process_acknowledgement(socket, socket_data, header);
 
-        socket_data->next_incoming = ntohl(header->sequence_number);    // + 1;
+        socket_data->next_incoming = ntohl(header->sequence_number); /* + 1; */
         pq_release_remote(tcp_globals.net_phone, packet_get_id(packet));
         socket_data->state = TCP_SOCKET_ESTABLISHED;
@@ -1707 +1708 @@
                 if (socket->port > 0) {
                         socket_ports_exclude(&tcp_globals.sockets,
-                            socket->port);
+                            socket->port, free);
                         socket->port = 0;
                 }
@@ -2492 +2493 @@
         rc = packet_dimensions_initialize(&tcp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&tcp_globals.sockets);
+                socket_ports_destroy(&tcp_globals.sockets, free);
                 goto out;
         }