Changeset ede63e4 in mainline for uspace/srv/net/tl/icmp

Timestamp:

2010-01-04T23:25:48Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

eac9722

Parents:

1a0fb3f8

Message:

• socket identifier generation moved to libsocket, + data fragment size fix and enhancement, + [ICMP|TCP|UDP]_HEADER_SIZE definition, + int_map_update() function to alter item key

Location:

uspace/srv/net/tl/icmp

Files:

• icmp.c (modified) (3 diffs)
• icmp_header.h (modified) (1 diff)

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

@@ -350 +350 @@
         // TODO do not ask all the time
         ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.addr_len, & icmp_globals.prefix, & icmp_globals.content, & icmp_globals.suffix ));
-        packet = packet_get_4( icmp_globals.net_phone, size, icmp_globals.addr_len, sizeof( icmp_header_t ) + icmp_globals.prefix, icmp_globals.suffix );
+        packet = packet_get_4( icmp_globals.net_phone, size, icmp_globals.addr_len, ICMP_HEADER_SIZE + icmp_globals.prefix, icmp_globals.suffix );
         if( ! packet ) return ENOMEM;
 
@@ -548 +548 @@
         }
         ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.addr_len, & icmp_globals.prefix, & icmp_globals.content, & icmp_globals.suffix ));
-        icmp_globals.prefix += sizeof( icmp_header_t );
-        icmp_globals.content -= sizeof( icmp_header_t );
+        icmp_globals.prefix += ICMP_HEADER_SIZE;
+        icmp_globals.content -= ICMP_HEADER_SIZE;
         // get configuration
         icmp_globals.error_reporting = NET_DEFAULT_ICMP_ERROR_REPORTING;
@@ -610 +610 @@
         length = packet_get_data_length( packet );
         if( length <= 0 ) return EINVAL;
-        if( length < sizeof( icmp_header_t )) return EINVAL;
+        if( length < ICMP_HEADER_SIZE) return EINVAL;
         data = packet_get_data( packet );
         if( ! data ) return EINVAL;

uspace/srv/net/tl/icmp/icmp_header.h

@@ -43 +43 @@
 #include "../../include/in.h"
 #include "../../include/icmp_codes.h"
+
+/** ICMP header size in bytes.
+ */
+#define ICMP_HEADER_SIZE                        sizeof( icmp_header_t )
 
 /** Type definition of the echo specific data.