Changeset 7715994 in mainline for uspace/srv/net/tl/icmp/icmp_client.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/srv/net/tl/icmp/icmp_client.c (modified) (2 diffs)

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

@@ -37 +37 @@
 
 #include <errno.h>
-//#include <stdio.h>
+
+#ifdef CONFIG_DEBUG
+        #include <stdio.h>
+#endif
 
 #include <sys/types.h>
@@ -49 +52 @@
 #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 ){
-        icmp_header_ref header;
+int icmp_client_process_packet(packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu){
+        icmp_header_ref header;
 
-        header = ( icmp_header_ref ) packet_get_data( packet );
-        if(( ! header )
-        || ( packet_get_data_length( packet ) < sizeof( icmp_header_t ))){
+        header = (icmp_header_ref) packet_get_data(packet);
+        if((! header)
+                || (packet_get_data_length(packet) < sizeof(icmp_header_t))){
                 return 0;
         }
-        if( type ) * type = header->type;
-        if( code ) * code = header->code;
-        if( pointer ) * pointer = header->un.param.pointer;
-        if( mtu ) * mtu = header->un.frag.mtu;
+        if(type){
+                *type = header->type;
+        }
+        if(code){
+                *code = header->code;
+        }
+        if(pointer){
+                *pointer = header->un.param.pointer;
+        }
+        if(mtu){
+                *mtu = header->un.frag.mtu;
+        }
         // remove debug dump
-//      printf( "ICMP error %d (%d) in packet %d\n", header->type, header->code, packet_get_id( packet ));
-        return sizeof( icmp_header_t );
+#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);
 }
 
-size_t icmp_client_header_length( packet_t packet ){
-        if( packet_get_data_length( packet ) < sizeof( icmp_header_t )){
+size_t icmp_client_header_length(packet_t packet){
+        if(packet_get_data_length(packet) < sizeof(icmp_header_t)){
                 return 0;
         }
-        return sizeof( icmp_header_t );
+        return sizeof(icmp_header_t);
 }