Changeset 0a866eeb in mainline

Timestamp:

2010-10-08T19:45:11Z (14 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

Files:

• lib/net/Makefile (modified) (1 diff)
• lib/net/generic/packet_client.c (moved) (moved from uspace/lib/socket/packet/packet_client.c ) (3 diffs)
• lib/net/generic/packet_remote.c (modified) (1 diff)
• lib/net/generic/socket_core.c (moved) (moved from uspace/lib/socket/generic/socket_core.c ) (2 diffs)
• lib/net/il/ip_client.c (modified) (1 diff)
• lib/net/il/ip_remote.c (modified) (1 diff)
• lib/net/include/il_interface.h (modified) (1 diff)
• lib/net/include/netif_interface.h (modified) (1 diff)
• lib/net/include/packet_client.h (moved) (moved from uspace/lib/socket/include/packet/packet_client.h ) (4 diffs)
• lib/net/include/tl_interface.h (modified) (1 diff)
• lib/net/netif/netif_local.c (modified) (1 diff)
• lib/net/netif/netif_remote.c (modified) (1 diff)
• lib/net/nil/nil_remote.c (modified) (1 diff)
• lib/net/tl/icmp_client.c (modified) (1 diff)
• lib/net/tl/icmp_remote.c (modified) (1 diff)
• lib/net/tl/tl_common.c (modified) (1 diff)
• lib/socket/Makefile (modified) (1 diff)
• lib/socket/include/packet/packet_local.h (added)
• lib/socket/packet/packet_server.c (modified) (1 diff)
• srv/hw/netif/dp8390/dp8390.c (modified) (1 diff)
• srv/hw/netif/dp8390/dp8390_module.c (modified) (1 diff)
• srv/net/il/arp/arp.c (modified) (1 diff)
• srv/net/il/ip/ip.c (modified) (1 diff)
• srv/net/netif/lo/lo.c (modified) (1 diff)
• srv/net/nil/eth/eth.c (modified) (1 diff)
• srv/net/tl/icmp/icmp.c (modified) (1 diff)
• srv/net/tl/tcp/tcp.c (modified) (1 diff)
• srv/net/tl/udp/udp.c (modified) (1 diff)

uspace/lib/net/Makefile

@@ -35 +35 @@
         generic/net_remote.c \
         generic/net_checksum.c \
+        generic/packet_client.c \
         generic/packet_remote.c \
+        generic/socket_core.c \
         adt/module_map.c \
         netif/netif_local.c \

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);

uspace/lib/net/il/ip_client.c

@@ -40 +40 @@
 
 #include <ip_client.h>
+#include <packet_client.h>
+#include <ip_header.h>
+
 #include <packet/packet.h>
-#include <packet/packet_client.h>
-#include <ip_header.h>
 
 size_t ip_client_header_length(packet_t packet){

uspace/lib/net/il/ip_remote.c

@@ -47 +47 @@
 #include <net/inet.h>
 #include <ip_interface.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <il_messages.h>
 #include <ip_messages.h>

uspace/lib/net/include/il_interface.h

@@ -46 +46 @@
 #include <net_device.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <il_messages.h>
 

uspace/lib/net/include/netif_interface.h

@@ -53 +53 @@
 
 #include <netif_remote.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 
 #define netif_module_message    netif_module_message_standalone

uspace/lib/net/include/packet_client.h

@@ -172 +172 @@
  *  @returns Other error codes as defined for the packet_return() function.
  */
-extern int packet_translate_local(int phone, packet_ref packet, packet_id_t packet_id);
+extern int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id);
 
 /** Obtains the packet of the given dimensions.
@@ -184 +184 @@
  *  @returns NULL on error.
  */
-extern packet_t packet_get_4_local(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix);
+extern packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix);
 
 /** Obtains the packet of the given content size.
@@ -193 +193 @@
  *  @returns NULL on error.
  */
-extern packet_t packet_get_1_local(int phone, size_t content);
+extern packet_t packet_get_1_remote(int phone, size_t content);
 
 /** Releases the packet queue.
@@ -202 +202 @@
  *  @param[in] packet_id The packet identifier.
  */
-extern void pq_release_local(int phone, packet_id_t packet_id);
+extern void pq_release_remote(int phone, packet_id_t packet_id);
 
 /** Returns the packet copy.

uspace/lib/net/include/tl_interface.h

@@ -44 +44 @@
 #include <net_device.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <tl_messages.h>
 

uspace/lib/net/netif/netif_local.c

@@ -47 +47 @@
 #include <net/modules.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet/packet_server.h>
 #include <packet_remote.h>

uspace/lib/net/netif/netif_remote.c

@@ -40 +40 @@
 #include <adt/measured_strings.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <net_device.h>
 #include <netif_remote.h>

uspace/lib/net/nil/nil_remote.c

@@ -40 +40 @@
 #include <nil_interface.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <nil_messages.h>
 #include <nil_remote.h>

uspace/lib/net/tl/icmp_client.c

@@ -46 +46 @@
 #include <icmp_client.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <icmp_header.h>
 

uspace/lib/net/tl/icmp_remote.c

@@ -45 +45 @@
 #include <net/modules.h>
 #include <icmp_interface.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <icmp_messages.h>
 

uspace/lib/net/tl/tl_common.c

@@ -46 +46 @@
 
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <net_device.h>

uspace/lib/socket/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        generic/socket_core.c \
         generic/icmp_common.c \
         generic/icmp_api.c \
         packet/packet.c \
-        packet/packet_client.c \
         packet/packet_server.c 
 

uspace/lib/socket/packet/packet_server.c

@@ -49 +49 @@
 #include <net_messages.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet/packet_local.h>
 #include <packet/packet_header.h>
 #include <packet/packet_server.h>

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -39 +39 @@
 #include <netif_local.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 
 #include "dp8390_drv.h"

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -46 +46 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <adt/measured_strings.h>
 #include <net_device.h>

uspace/srv/net/il/arp/arp.c

@@ -56 +56 @@
 #include <adt/measured_strings.h>
 #include <packet/packet.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <il_messages.h>

uspace/srv/net/il/ip/ip.c

@@ -68 +68 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <nil_messages.h>

uspace/srv/net/netif/lo/lo.c

@@ -47 +47 @@
 #include <net/modules.h>
 #include <adt/measured_strings.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <net_device.h>
 #include <nil_interface.h>

uspace/srv/net/nil/eth/eth.c

@@ -59 +59 @@
 #include <il_interface.h>
 #include <adt/measured_strings.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <nil_local.h>

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

@@ -56 +56 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <net_checksum.h>

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

@@ -58 +58 @@
 #include <net_messages.h>
 #include <adt/dynamic_fifo.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <net_checksum.h>

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

@@ -55 +55 @@
 #include <net_messages.h>
 #include <adt/dynamic_fifo.h>
-#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <net_checksum.h>