Changeset 91478aa in mainline for uspace/srv/net/tl

Timestamp:

2010-02-17T23:20:41Z (16 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

Location:

uspace/srv/net/tl

Files:

• icmp/icmp.c (modified) (2 diffs)
• icmp/icmp.h (modified) (1 diff)
• tl_common.c (modified) (1 diff)
• tl_common.h (modified) (1 diff)
• udp/udp.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;

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

@@ -94 +94 @@
          */
         int                             ip_phone;
-        /** Reserved packet prefix length.
+        /** Packet dimension.
          */
-        size_t                  prefix;
-        /** Maximal packet content length.
-         */
-        size_t                  content;
-        /** Reserved packet suffix length.
-         */
-        size_t                  suffix;
-        /** Packet address length.
-         */
-        size_t                  addr_len;
+        packet_dimension_t      packet_dimension;
         /** Networking module phone.
          */

uspace/srv/net/tl/tl_common.c

@@ -89 +89 @@
                 * packet_dimension = malloc( sizeof( ** packet_dimension ));
                 if( ! * packet_dimension ) return ENOMEM;
-                if( ERROR_OCCURRED( ip_packet_size_req( ip_phone, device_id, & ( ** packet_dimension ).addr_len, & ( ** packet_dimension ).prefix, & ( ** packet_dimension ).content, & ( ** packet_dimension ).suffix ))){
+                if( ERROR_OCCURRED( ip_packet_size_req( ip_phone, device_id, * packet_dimension ))){
                         free( * packet_dimension );
                         return ERROR_CODE;

uspace/srv/net/tl/tl_common.h

@@ -43 +43 @@
 #include "../include/inet.h"
 #include "../include/socket_codes.h"
-
-/** Type definition of the packet dimension.
- *  @see packet_dimension
- */
-typedef struct packet_dimension packet_dimension_t;
-
-/** Type definition of the packet dimension pointer.
- *  @see packet_dimension
- */
-typedef packet_dimension_t *    packet_dimension_ref;
-
-/** Packet dimension.
- */
-struct packet_dimension{
-        /** Reserved packet prefix length.
-         */
-        size_t                  prefix;
-        /** Maximal packet content length.
-         */
-        size_t                  content;
-        /** Reserved packet suffix length.
-         */
-        size_t                  suffix;
-        /** Maximal packet address length.
-         */
-        size_t                  addr_len;
-};
 
 /** Device packet dimensions.

uspace/srv/net/tl/udp/udp.c

@@ -205 +205 @@
         }
         // read default packet dimensions
-        ERROR_PROPAGATE( ip_packet_size_req( udp_globals.ip_phone, -1, & udp_globals.packet_dimension.addr_len, & udp_globals.packet_dimension.prefix, & udp_globals.packet_dimension.content, & udp_globals.packet_dimension.suffix ));
+        ERROR_PROPAGATE( ip_packet_size_req( udp_globals.ip_phone, -1, & udp_globals.packet_dimension ));
         ERROR_PROPAGATE( socket_ports_initialize( & udp_globals.sockets ));
         if( ERROR_OCCURRED( packet_dimensions_initialize( & udp_globals.dimensions ))){
@@ -579 +579 @@
 //      }else{
                 // do not ask all the time
-                ERROR_PROPAGATE( ip_packet_size_req( udp_globals.ip_phone, -1, & udp_globals.packet_dimension.addr_len, & udp_globals.packet_dimension.prefix, & udp_globals.packet_dimension.content, & udp_globals.packet_dimension.suffix ));
+                ERROR_PROPAGATE( ip_packet_size_req( udp_globals.ip_phone, -1, & udp_globals.packet_dimension ));
                 packet_dimension = & udp_globals.packet_dimension;
 //      }