Changeset 91478aa in mainline for uspace/srv/net/tl/icmp/icmp.c

Timestamp:

2010-02-17T23:20:41Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

9b87284, ca2d142

Parents:

536ded4

Message:

• unify packet dimension interfaces

File:

• uspace/srv/net/tl/icmp/icmp.c (modified) (2 diffs)

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

@@ -287 +287 @@
         length = ( size_t ) addrlen;
         // 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, ICMP_HEADER_SIZE + icmp_globals.prefix, icmp_globals.suffix );
+        ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.packet_dimension ));
+        packet = packet_get_4( icmp_globals.net_phone, size, icmp_globals.packet_dimension.addr_len, ICMP_HEADER_SIZE + icmp_globals.packet_dimension.prefix, icmp_globals.packet_dimension.suffix );
         if( ! packet ) return ENOMEM;
 
@@ -477 +477 @@
                 return icmp_globals.ip_phone;
         }
-        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 += ICMP_HEADER_SIZE;
-        icmp_globals.content -= ICMP_HEADER_SIZE;
+        ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.packet_dimension ));
+        icmp_globals.packet_dimension.prefix += ICMP_HEADER_SIZE;
+        icmp_globals.packet_dimension.content -= ICMP_HEADER_SIZE;
         // get configuration
         icmp_globals.error_reporting = NET_DEFAULT_ICMP_ERROR_REPORTING;