Changeset b0f00a9 in mainline for uspace/lib/net/tl/icmp_client.c

Timestamp:

2011-11-06T22:21:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/tl/icmp_client.c (modified) (3 diffs)

uspace/lib/net/tl/icmp_client.c

@@ -39 +39 @@
 #include <icmp_header.h>
 #include <packet_client.h>
-
-#ifdef CONFIG_DEBUG
-#include <stdio.h>
-#endif
-
 #include <errno.h>
 #include <sys/types.h>
-
 #include <net/icmp_codes.h>
 #include <net/packet.h>
@@ -60 +54 @@
  * @return              Zero if the packet contains no data.
  */
-int
-icmp_client_process_packet(packet_t *packet, icmp_type_t *type,
+int icmp_client_process_packet(packet_t *packet, icmp_type_t *type,
     icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu)
 {
@@ -81 +74 @@
                 *mtu = header->un.frag.mtu;
 
-        /* Remove debug dump */
-#ifdef CONFIG_DEBUG
-        printf("ICMP error %d (%d) in packet %d\n", header->type, header->code,
-            packet_get_id(packet));
-#endif
         return sizeof(icmp_header_t);
 }