Changes in uspace/lib/packet/generic/packet_server.c [ffa2c8ef:01b87dc5] in mainline

File:

• uspace/lib/packet/generic/packet_server.c (modified) (8 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -44 +44 @@
 #include <unistd.h>
 #include <sys/mman.h>
+
+#include <ipc/ipc.h>
 #include <ipc/packet.h>
 #include <ipc/net.h>
+
 #include <net/packet.h>
 #include <net/packet_header.h>
@@ -289 +292 @@
 
         if (!async_share_in_receive(&callid, &size)) {
-                async_answer_0(callid, EINVAL);
+                ipc_answer_0(callid, EINVAL);
                 return EINVAL;
         }
 
         if (size != packet->length) {
-                async_answer_0(callid, ENOMEM);
+                ipc_answer_0(callid, ENOMEM);
                 return ENOMEM;
         }
@@ -319 +322 @@
 int
 packet_server_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    size_t *answer_count)
+    int *answer_count)
 {
         packet_t *packet;
@@ -330 +333 @@
         case NET_PACKET_CREATE_1:
                 packet = packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX,
-                    IPC_GET_CONTENT(*call), DEFAULT_SUFFIX);
+                    IPC_GET_CONTENT(call), DEFAULT_SUFFIX);
                 if (!packet)
                         return ENOMEM;
@@ -340 +343 @@
         case NET_PACKET_CREATE_4:
                 packet = packet_get_local(
-                    ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(*call)) ?
-                    IPC_GET_ADDR_LEN(*call) : DEFAULT_ADDR_LEN),
-                    DEFAULT_PREFIX + IPC_GET_PREFIX(*call),
-                    IPC_GET_CONTENT(*call),
-                    DEFAULT_SUFFIX + IPC_GET_SUFFIX(*call));
+                    ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(call)) ?
+                    IPC_GET_ADDR_LEN(call) : DEFAULT_ADDR_LEN),
+                    DEFAULT_PREFIX + IPC_GET_PREFIX(call),
+                    IPC_GET_CONTENT(call),
+                    DEFAULT_SUFFIX + IPC_GET_SUFFIX(call));
                 if (!packet)
                         return ENOMEM;
@@ -353 +356 @@
         
         case NET_PACKET_GET:
-                packet = pm_find(IPC_GET_ID(*call));
+                packet = pm_find(IPC_GET_ID(call));
                 if (!packet_is_valid(packet))
                         return ENOENT;
@@ -359 +362 @@
         
         case NET_PACKET_GET_SIZE:
-                packet = pm_find(IPC_GET_ID(*call));
+                packet = pm_find(IPC_GET_ID(call));
                 if (!packet_is_valid(packet))
                         return ENOENT;
@@ -367 +370 @@
         
         case NET_PACKET_RELEASE:
-                return packet_release_wrapper(IPC_GET_ID(*call));
+                return packet_release_wrapper(IPC_GET_ID(call));
         }