Changeset 59ecd4a3 in mainline for uspace/lib/net/tl

Timestamp:

2010-04-04T21:41:47Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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.

Location:

uspace/lib/net/tl

Files:

• icmp_client.c (moved) (moved from uspace/srv/net/tl/icmp/icmp_client.c ) (1 diff)
• icmp_remote.c (moved) (moved from uspace/srv/net/tl/icmp/icmp_remote.c ) (1 diff)
• tl_common.c (moved) (moved from uspace/srv/net/tl/tl_common.c ) (1 diff)

uspace/lib/net/tl/icmp_client.c

@@ -36 +36 @@
  */
 
-#include <errno.h>
-
 #ifdef CONFIG_DEBUG
         #include <stdio.h>
 #endif
 
+#include <errno.h>
 #include <sys/types.h>
 
-#include "../../include/icmp_codes.h"
-#include "../../include/icmp_client.h"
-
-#include "../../structures/packet/packet.h"
-#include "../../structures/packet/packet_client.h"
-
-#include "icmp_header.h"
+#include <icmp_codes.h>
+#include <icmp_client.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <icmp_header.h>
 
 int icmp_client_process_packet(packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu){

uspace/lib/net/tl/icmp_remote.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
-
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-
 #include <sys/types.h>
 
-#include "../../messages.h"
-#include "../../modules.h"
-
-#include "../../include/icmp_interface.h"
-
-#include "../../structures/packet/packet_client.h"
-
-#include "icmp_messages.h"
+#include <net_messages.h>
+#include <net_modules.h>
+#include <icmp_interface.h>
+#include <packet/packet_client.h>
+#include <icmp_messages.h>
 
 int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet){

uspace/lib/net/tl/tl_common.c

@@ -39 +39 @@
 #include <ipc/services.h>
 
-#include "../err.h"
-
-#include "../structures/packet/packet.h"
-#include "../structures/packet/packet_client.h"
-
-#include "../include/device.h"
-#include "../include/icmp_interface.h"
-#include "../include/in.h"
-#include "../include/in6.h"
-#include "../include/inet.h"
-#include "../include/ip_interface.h"
-#include "../include/socket_codes.h"
-#include "../include/socket_errno.h"
-
-#include "tl_common.h"
+#include <net_err.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <net_device.h>
+#include <icmp_interface.h>
+#include <in.h>
+#include <in6.h>
+#include <inet.h>
+#include <ip_interface.h>
+#include <socket_codes.h>
+#include <socket_errno.h>
+#include <tl_common.h>
 
 DEVICE_MAP_IMPLEMENT(packet_dimensions, packet_dimension_t);