Changeset eb083ad in mainline for uspace/srv/net/udp/sock.c

Timestamp:

2012-05-17T21:09:06Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (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/udp/sock.c (modified) (4 diffs)

uspace/srv/net/udp/sock.c

@@ -43 +43 @@
 #include <ipc/services.h>
 #include <ipc/socket.h>
-#include <net/modules.h>
 #include <net/socket.h>
 #include <ns.h>
@@ -134 +133 @@
         assert(sock_core != NULL);
         sock->sock_core = sock_core;
-
-
-        refresh_answer(&answer, NULL);
+        
         SOCKET_SET_SOCKET_ID(answer, sock_id);
 
         SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
         SOCKET_SET_HEADER_SIZE(answer, sizeof(udp_header_t));
-        answer_call(callid, EOK, &answer, 3);
+        async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
+            IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
 }
 
@@ -369 +367 @@
                 }
         }
-
-        refresh_answer(&answer, NULL);
+        
+        IPC_SET_ARG1(answer, 0);
         SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
-        answer_call(callid, EOK, &answer, 2);
+        async_answer_2(callid, EOK, IPC_GET_ARG1(answer),
+            IPC_GET_ARG2(answer));
         fibril_mutex_unlock(&socket->lock);
+        
 out:
         if (addr != NULL)
@@ -486 +486 @@
 
         log_msg(LVL_DEBUG, "read_data_length <- %zu", length);
+        IPC_SET_ARG2(answer, 0);
         SOCKET_SET_READ_DATA_LENGTH(answer, length);
         SOCKET_SET_ADDRESS_LENGTH(answer, sizeof(addr));
-        answer_call(callid, EOK, &answer, 3);
-
+        async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
+            IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+        
         /* Push one fragment notification to client's queue */
         udp_sock_notify_data(sock_core);