Changeset 918e9910 in mainline

Timestamp:

2010-02-12T13:50:47Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

827d73f

Parents:

4be390b

Message:

• zero IP checksum flip fix

Location:

uspace/srv/net

Files:

• checksum.c (modified) (2 diffs)
• il/ip/ip.c (modified) (1 diff)
• include/checksum.h (modified) (1 diff)
• tl/icmp/icmp.c (modified) (1 diff)
• tl/tcp/tcp.c (modified) (1 diff)
• tl/udp/udp.c (modified) (1 diff)

uspace/srv/net/checksum.c

@@ -46 +46 @@
  */
 #define CRC_DIVIDER_LE  0xEDB88320
-
-/** IP checksum value for computed zero checksum.
- *  Zero is returned as 0xFFFF (not flipped)
- */
-#define IP_CHECKSUM_ZERO                        0xFFFFu
 
 uint32_t compute_crc32_le( uint32_t seed, uint8_t * data, size_t length ){
@@ -135 +130 @@
 uint16_t flip_checksum( uint16_t checksum ){
         // flip, zero is returned as 0xFFFF (not flipped)
-        return ( ~ checksum ) ? ( uint16_t ) ( ~ checksum ) : IP_CHECKSUM_ZERO;
+        checksum = ~ checksum;
+        return checksum ? checksum : IP_CHECKSUM_ZERO;
 }
 

uspace/srv/net/il/ip/ip.c

@@ -1204 +1204 @@
         }
         // checksum
-        if(( header->header_checksum ) && ( IP_HEADER_CHECKSUM( header ))){
+        if(( header->header_checksum ) && ( IP_HEADER_CHECKSUM( header ) != IP_CHECKSUM_ZERO )){
                 phone = ip_prepare_icmp_and_get_phone( 0, packet, header );
                 if( phone >= 0 ){

uspace/srv/net/include/checksum.h

@@ -41 +41 @@
 
 #include <sys/types.h>
+
+/** IP checksum value for computed zero checksum.
+ *  Zero is returned as 0xFFFF (not flipped)
+ */
+#define IP_CHECKSUM_ZERO                        0xFFFFu
 
 /**     Computes CRC32 value.

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

@@ -617 +617 @@
         // checksum
         if( header->checksum ){
-                while( ICMP_CHECKSUM( header, length )){
+                while( ICMP_CHECKSUM( header, length ) != IP_CHECKSUM_ZERO ){
                         // set the original message type on error notification
                         // type swap observed in Qemu

uspace/srv/net/tl/tcp/tcp.c

@@ -382 +382 @@
                 }
                 checksum = compute_checksum( checksum, socket_data->pseudo_header, socket_data->headerlen );
-                if( flip_checksum( compact_checksum( checksum ))){
+                if( flip_checksum( compact_checksum( checksum )) != IP_CHECKSUM_ZERO ){
                         printf( "checksum err %x -> %x\n", header->checksum, flip_checksum( compact_checksum( checksum )));
                         fibril_rwlock_write_unlock( socket_data->local_lock );

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

@@ -372 +372 @@
         // check checksum
         if( header->checksum ){
-                if( flip_checksum( compact_checksum( checksum ))){
+                if( flip_checksum( compact_checksum( checksum )) != IP_CHECKSUM_ZERO ){
                         if( tl_prepare_icmp_packet( udp_globals.net_phone, udp_globals.icmp_phone, packet, error ) == EOK ){
                                 // checksum error ICMP