Changeset a2d8d59 in mainline for uspace/srv

Timestamp:

2011-01-17T16:26:10Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7e36c8d

Parents:

f1938c6 (diff), ffaba00 (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 ICMP rewrite

File:

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

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

@@ -123 +123 @@
 static bool error_reporting = true;
 static bool echo_replying = true;
+static packet_dimension_t icmp_dimension;
 
 /** ICMP client identification counter */
 static atomic_t icmp_client;
-static packet_dimension_t icmp_dimension;
-
-/** ICMP identifier and sequence number */
+
+/** ICMP identifier and sequence number (client-specific) */
 static fibril_local icmp_param_t icmp_id;
 static fibril_local icmp_param_t icmp_seq;
@@ -142 +142 @@
          * are 16-bit values.
          */
-        hash_index_t index = (key[0] & 0xffff) << 16 | (key[1] & 0xffff);
-        return index % REPLY_BUCKETS;
+        hash_index_t index = ((key[0] & 0xffff) << 16) | (key[1] & 0xffff);
+        return (index % REPLY_BUCKETS);
 }
 
@@ -209 +209 @@
         header->type = type;
         header->code = code;
+        
+        /*
+         * The checksum needs to be calculated
+         * with a virtual checksum field set to
+         * zero.
+         */
         header->checksum = 0;
         header->checksum = ICMP_CHECKSUM(header,
@@ -281 +287 @@
  *         zero.
  * @return ENOMEM if there is not enough memory left.
- * @return EPARTY if there was an internal error.
  *
  */
@@ -328 +333 @@
         }
         
-        bzero(header, sizeof(*header));
+        bzero(header, sizeof(icmp_header_t));
         header->un.echo.identifier = id;
         header->un.echo.sequence_number = sequence;
@@ -439 +444 @@
         unsigned long key[REPLY_KEYS] =
             {header->un.echo.identifier, header->un.echo.sequence_number};
+        
+        /* The packet is no longer needed */
         icmp_release(packet);
         
@@ -698 +705 @@
 /** Per-connection initialization
  *
+ * Initialize client-specific global variables.
+ *
  */
 void tl_connection(void)