Changeset 557c7d0 in mainline for uspace/srv/net/tl

Timestamp:

2010-12-19T10:12:49Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8dd039a, f568ee7

Parents:

11658b64 (diff), 40dc422 (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/srv/net/tl

Files:

• icmp/icmp_module.c (modified) (1 diff)
• tcp/tcp.c (modified) (3 diffs)
• tcp/tcp_module.c (modified) (1 diff)
• udp/udp.c (modified) (2 diffs)
• udp/udp_module.c (modified) (1 diff)

uspace/srv/net/tl/icmp/icmp_module.c

@@ -74 +74 @@
                 goto out;
 
-        rc = REGISTER_ME(SERVICE_ICMP, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_ICMP, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;

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

@@ -1365 +1365 @@
 
                 case NET_SOCKET_BIND:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -1402 +1403 @@
 
                 case NET_SOCKET_CONNECT:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -1453 +1455 @@
 
                 case NET_SOCKET_SENDTO:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;

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

@@ -75 +75 @@
                 goto out;
 
-        rc = REGISTER_ME(SERVICE_TCP, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_TCP, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;

uspace/srv/net/tl/udp/udp.c

@@ -771 +771 @@
 
                 case NET_SOCKET_BIND:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -784 +785 @@
 
                 case NET_SOCKET_SENDTO:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;

uspace/srv/net/tl/udp/udp_module.c

@@ -75 +75 @@
                 goto out;
         
-        rc = REGISTER_ME(SERVICE_UDP, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_UDP, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;