Changeset 0a866eeb in mainline for uspace/lib/net/generic

Timestamp:

2010-10-08T19:45:11Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c69d327

Parents:

d52fbaf

Message:

Fix packet_get_copy() and socket_destroy_core() to use the remote packet
interfaces.

Fix packet_client.h to declare the remote packet interfaces and create
packet_local.h for the use by the packet server (or later possibly also by the
bundle build).

Location:

uspace/lib/net/generic

Files:

• packet_client.c (moved) (moved from uspace/lib/socket/packet/packet_client.c ) (3 diffs)
• packet_remote.c (modified) (1 diff)
• socket_core.c (moved) (moved from uspace/lib/socket/generic/socket_core.c ) (2 diffs)

uspace/lib/net/generic/packet_client.c

@@ -41 +41 @@
 #include <sys/mman.h>
 
+#include <packet_client.h>
+
 #include <net_messages.h>
 #include <packet/packet.h>
 #include <packet/packet_header.h>
-#include <packet/packet_client.h>
 
 int packet_copy_data(packet_t packet, const void * data, size_t length)
@@ -181 +182 @@
 
         // get a new packet
-        copy = packet_get_4_local(phone, PACKET_DATA_LENGTH(packet),
+        copy = packet_get_4_remote(phone, PACKET_DATA_LENGTH(packet),
             PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix,
             PACKET_MIN_SUFFIX(packet));
@@ -199 +200 @@
                 return copy;
         } else {
-                pq_release_local(phone, copy->packet_id);
+                pq_release_remote(phone, copy->packet_id);
                 return NULL;
         }

uspace/lib/net/generic/packet_remote.c

@@ -44 +44 @@
 
 #include <net_messages.h>
+#include <packet_client.h>
+#include <packet_remote.h>
+
 #include <packet/packet.h>
-#include <packet/packet_client.h>
 #include <packet/packet_header.h>
-#include <packet_remote.h>
 
 /** Obtain the packet from the packet server as the shared memory block.

uspace/lib/net/generic/socket_core.c

@@ -47 +47 @@
 #include <adt/int_map.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
+#include <packet_remote.h>
 #include <net/modules.h>
 #include <socket_core.h>
@@ -91 +92 @@
         // release all received packets
         while((packet_id = dyn_fifo_pop(&socket->received)) >= 0){
-                pq_release_local(packet_phone, packet_id);
+                pq_release_remote(packet_phone, packet_id);
         }
         dyn_fifo_destroy(&socket->received);