Changes in uspace/srv/net/tl/tcp/tcp.c [28a3e74:014dd57b] in mainline

File:

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

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

@@ -44 +44 @@
 #include <errno.h>
 
+#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/net.h>
@@ -63 +64 @@
 #include <ip_interface.h>
 #include <icmp_client.h>
-#include <icmp_remote.h>
+#include <icmp_interface.h>
 #include <net_interface.h>
 #include <socket_core.h>
@@ -299 +300 @@
                 return tcp_release_and_return(packet, NO_DATA);
 
-#if 0
-        printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header),
-            ntohs(header->destination_port));
-#endif
+//      printf("header len %d, port %d \n", TCP_HEADER_LENGTH(header),
+//          ntohs(header->destination_port));
+
         result = packet_get_addr(packet, (uint8_t **) &src, (uint8_t **) &dest);
         if (result <= 0)
@@ -1063 +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;
@@ -1204 +1204 @@
 }
 
-/** Per-connection initialization
- *
- */
-void tl_connection(void)
-{
-}
-
 /** Processes the TCP message.
  *
@@ -1224 +1217 @@
  * @see IS_NET_TCP_MESSAGE()
  */
-int tl_message(ipc_callid_t callid, ipc_call_t *call,
+int tl_module_message(ipc_callid_t callid, ipc_call_t *call,
     ipc_call_t *answer, size_t *answer_count)
 {
@@ -1506 +1499 @@
 
         /* Release the application phone */
-        async_hangup(app_phone);
+        ipc_hangup(app_phone);
 
         printf("release\n");
@@ -1708 +1701 @@
                 if (socket->port > 0) {
                         socket_ports_exclude(&tcp_globals.sockets,
-                            socket->port, free);
+                            socket->port);
                         socket->port = 0;
                 }
@@ -2454 +2447 @@
                                     SERVICE_TCP, IPC_GET_ERROR(*icall));
                         
-                        async_answer_0(iid, (sysarg_t) rc);
+                        ipc_answer_0(iid, (sysarg_t) rc);
                         break;
                 default:
-                        async_answer_0(iid, (sysarg_t) ENOTSUP);
+                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 
@@ -2479 +2472 @@
         tcp_globals.net_phone = net_phone;
         
-        tcp_globals.icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
+        tcp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP,
+            ICMP_CONNECT_TIMEOUT);
         tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP,
             SERVICE_TCP, tcp_receiver);
@@ -2493 +2487 @@
         rc = packet_dimensions_initialize(&tcp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&tcp_globals.sockets, free);
+                socket_ports_destroy(&tcp_globals.sockets);
                 goto out;
         }