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

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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) (8 diffs)

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

@@ -829 +829 @@
         /* Notify the destination socket */
         async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
-            (ipcarg_t) socket->socket_id,
+            (sysarg_t) socket->socket_id,
             ((packet_dimension->content < socket_data->data_fragment_size) ?
             packet_dimension->content : socket_data->data_fragment_size), 0, 0,
-            (ipcarg_t) fragments);
+            (sysarg_t) fragments);
 
         return EOK;
@@ -1090 +1090 @@
                         /* Notify the destination socket */
                         async_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
-                            (ipcarg_t) listening_socket->socket_id,
+                            (sysarg_t) listening_socket->socket_id,
                             socket_data->data_fragment_size, TCP_HEADER_SIZE,
-                            0, (ipcarg_t) socket->socket_id);
+                            0, (sysarg_t) socket->socket_id);
 
                         fibril_rwlock_write_unlock(socket_data->local_lock);
@@ -1240 +1240 @@
 
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case NET_TL_RECEIVED:
 //              fibril_rwlock_read_lock(&tcp_globals.lock);
@@ -1323 +1323 @@
 
                 /* Process the call */
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         keep_on_going = false;
@@ -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;
@@ -2481 +2484 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;