Changeset 1affcdf3 in mainline for uspace/lib/net/tl

Timestamp:

2011-06-10T19:33:41Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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

Location:

uspace/lib/net/tl

Files:

• icmp_remote.c (modified) (5 diffs)
• tl_skel.c (modified) (2 diffs)

uspace/lib/net/tl/icmp_remote.c

@@ -41 +41 @@
 
 #include <async.h>
+#include <async_obsolete.h>
 #include <errno.h>
 #include <ipc/services.h>
@@ -64 +65 @@
     icmp_param_t mtu, packet_t *packet)
 {
-        async_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (sysarg_t) code,
+        async_obsolete_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (sysarg_t) code,
             (sysarg_t) packet_get_id(packet), (sysarg_t) mtu);
         return EOK;
@@ -83 +84 @@
 int icmp_source_quench_msg(int icmp_phone, packet_t *packet)
 {
-        async_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0,
+        async_obsolete_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0,
             (sysarg_t) packet_get_id(packet));
         return EOK;
@@ -103 +104 @@
 int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t *packet)
 {
-        async_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (sysarg_t) code,
+        async_obsolete_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (sysarg_t) code,
             (sysarg_t) packet_get_id(packet));
         return EOK;
@@ -125 +126 @@
     icmp_param_t pointer, packet_t *packet)
 {
-        async_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (sysarg_t) code,
+        async_obsolete_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (sysarg_t) code,
             (sysarg_t) packet_get_id(packet), (sysarg_t) pointer);
         return EOK;

uspace/lib/net/tl/tl_skel.c

@@ -42 +42 @@
 #include <net/modules.h>
 
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
+
 /** Default thread for new connections.
  *
@@ -77 +80 @@
                  * result.
                  */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
+                if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP))
                         return;