Changeset 59ecd4a in mainline for uspace/lib/net/include/icmp_interface.h

Timestamp:

2010-04-04T21:41:47Z (14 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.

File:

• uspace/lib/net/include/icmp_interface.h (moved) (moved from uspace/srv/net/include/icmp_interface.h ) (5 diffs)

uspace/lib/net/include/icmp_interface.h

@@ -43 +43 @@
 #include <sys/types.h>
 
-#include "device.h"
-
-#include "../structures/measured_strings.h"
-#include "../structures/packet/packet.h"
-
-#include "inet.h"
-#include "ip_codes.h"
-#include "socket_codes.h"
-
-#include "icmp_codes.h"
-#include "icmp_common.h"
+#include <net_device.h>
+#include <adt/measured_strings.h>
+#include <packet/packet.h>
+#include <inet.h>
+#include <ip_codes.h>
+#include <socket_codes.h>
+#include <icmp_codes.h>
+#include <icmp_common.h>
 
 /** @name ICMP module interface
@@ -71 +68 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet);
+extern int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet);
 
 /** Sends the Source Quench error notification packet.
@@ -82 +79 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int icmp_source_quench_msg(int icmp_phone, packet_t packet);
+extern int icmp_source_quench_msg(int icmp_phone, packet_t packet);
 
 /** Sends the Time Exceeded error notification packet.
@@ -94 +91 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet);
+extern int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet);
 
 /** Sends the Parameter Problem error notification packet.
@@ -107 +104 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet);
+extern int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet);
 
 /*@}*/