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

Timestamp:

2011-01-21T12:55:13Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

50c06df, 85d0cf8, aa9f0a4

Parents:

d08abdb7 (diff), 7e36c8d (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

@@ -64 +64 @@
 #include <ip_interface.h>
 #include <icmp_client.h>
-#include <icmp_interface.h>
+#include <icmp_remote.h>
 #include <net_interface.h>
 #include <socket_core.h>
@@ -1204 +1204 @@
 }
 
+/** Per-connection initialization
+ *
+ */
+void tl_connection(void)
+{
+}
+
 /** Processes the TCP message.
  *
@@ -1217 +1224 @@
  * @see IS_NET_TCP_MESSAGE()
  */
-int tl_module_message(ipc_callid_t callid, ipc_call_t *call,
+int tl_message(ipc_callid_t callid, ipc_call_t *call,
     ipc_call_t *answer, size_t *answer_count)
 {
@@ -2472 +2479 @@
         tcp_globals.net_phone = net_phone;
         
-        tcp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP,
-            ICMP_CONNECT_TIMEOUT);
+        tcp_globals.icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
         tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP,
             SERVICE_TCP, tcp_receiver);