Changeset 058edb6 in mainline for uspace/lib

Timestamp:

2010-10-06T18:50:55Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bcafa70

Parents:

2aa15d4

Message:

Move socket_codes.h from libsocket to libc.

Remove stuff that was probably inappropriatelly taken from a Linux kernel
header.

Remove unneeded AF and PF codes.

Start assigning AF and PF codes sequentially. (These are not standardized.)

Location:

uspace/lib

Files:

• c/include/net/socket_codes.h (added)
• net/include/icmp_interface.h (modified) (2 diffs)
• net/include/ip_client.h (modified) (2 diffs)
• net/include/ip_interface.h (modified) (2 diffs)
• net/include/tl_common.h (modified) (1 diff)
• net/tl/tl_common.c (modified) (2 diffs)
• socket/generic/icmp_api.c (modified) (2 diffs)
• socket/generic/inet.c (modified) (2 diffs)
• socket/generic/socket_core.c (modified) (2 diffs)
• socket/include/icmp_api.h (modified) (2 diffs)
• socket/include/socket.h (modified) (1 diff)
• socket/include/socket_codes.h (deleted)
• socket/include/socket_messages.h (modified) (1 diff)

uspace/lib/net/include/icmp_interface.h

@@ -34 +34 @@
 #define __NET_ICMP_INTERFACE_H__
 
+#include <net/socket_codes.h>
 #include <sys/types.h>
 
@@ -41 +42 @@
 #include <inet.h>
 #include <ip_codes.h>
-#include <socket_codes.h>
 #include <icmp_codes.h>
 #include <icmp_common.h>

uspace/lib/net/include/ip_client.h

@@ -38 +38 @@
 #define __NET_IP_CLIENT_H__
 
+#include <net/socket_codes.h>
 #include <sys/types.h>
 
@@ -43 +44 @@
 #include <ip_codes.h>
 #include <ip_interface.h>
-#include <socket_codes.h>
 
 /** Prepares the packet to be transfered via IP.

uspace/lib/net/include/ip_interface.h

@@ -34 +34 @@
 #define __NET_IP_INTERFACE_H__
 
+#include <net/socket_codes.h>
 #include <async.h>
 #include <ipc/services.h>
@@ -42 +43 @@
 #include <in.h>
 #include <ip_codes.h>
-#include <socket_codes.h>
 
 #ifdef CONFIG_IL_TL_BUNDLE

uspace/lib/net/include/tl_common.h

@@ -38 +38 @@
 #define __NET_TL_COMMON_H__
 
+#include <net/socket_codes.h>
+
 #include <packet/packet.h>
 #include <net_device.h>
 #include <inet.h>
-#include <socket_codes.h>
 
 /** Device packet dimensions.

uspace/lib/net/tl/tl_common.c

@@ -36 +36 @@
  */
 
+#include <net/socket_codes.h>
 #include <async.h>
 #include <ipc/services.h>
@@ -51 +52 @@
 #include <ip_local.h>
 #include <ip_remote.h>
-#include <socket_codes.h>
 #include <ip_interface.h>
 #include <tl_interface.h>

uspace/lib/socket/generic/icmp_api.c

@@ -36 +36 @@
  */
 
+#include <net/socket_codes.h>
 #include <async.h>
 
@@ -47 +48 @@
 #include <inet.h>
 #include <ip_codes.h>
-#include <socket_codes.h>
 #include <icmp_messages.h>
 

uspace/lib/socket/generic/inet.c

@@ -35 +35 @@
  */
 
+#include <net/socket_codes.h>
 #include <errno.h>
 #include <mem.h>
@@ -43 +44 @@
 #include <in6.h>
 #include <inet.h>
-#include <socket_codes.h>
 
 int inet_ntop(uint16_t family, const uint8_t * data, char * address, size_t length){

uspace/lib/socket/generic/socket_core.c

@@ -35 +35 @@
  */
 
+#include <net/socket_codes.h>
+
 #include <stdint.h>
 #include <stdlib.h>
@@ -42 +44 @@
 #include <in.h>
 #include <inet.h>
-#include <socket_codes.h>
 #include <adt/dynamic_fifo.h>
 #include <adt/int_map.h>

uspace/lib/socket/include/icmp_api.h

@@ -38 +38 @@
 #define __NET_ICMP_API_H__
 
+#include <net/socket_codes.h>
 #include <sys/types.h>
 
@@ -45 +46 @@
 #include <inet.h>
 #include <ip_codes.h>
-#include <socket_codes.h>
 #include <icmp_codes.h>
 #include <icmp_common.h>

uspace/lib/socket/include/socket.h

@@ -40 +40 @@
 #define __NET_SOCKET_H__
 
+#include <net/socket_codes.h>
+
 #include <net_byteorder.h>
 #include <in.h>
 #include <in6.h>
 #include <inet.h>
-#include <socket_codes.h>
 #include <errno.h>
 

uspace/lib/socket/include/socket_messages.h

@@ -43 +43 @@
 #include <ipc/net.h>
 
-#include <socket_codes.h>
+#include <net/socket_codes.h>
 
 /** Socket client messages.