Changeset ffaba00 in mainline

Timestamp:

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

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a2d8d59

Parents:

f1938c6

Message:

improve cstyle and comments

Location:

uspace

Files:

• lib/net/include/icmp_header.h (modified) (3 diffs)
• srv/net/tl/icmp/icmp.c (modified) (7 diffs)

uspace/lib/net/include/icmp_header.h

@@ -45 +45 @@
 
 /** ICMP header size in bytes. */
-#define ICMP_HEADER_SIZE        sizeof(icmp_header_t)
-
-/** Type definition of the echo specific data.
- * @see icmp_echo
- */
-typedef struct icmp_echo icmp_echo_t;
+#define ICMP_HEADER_SIZE  sizeof(icmp_header_t)
 
 /** Echo specific data. */
-struct icmp_echo {
+typedef struct icmp_echo {
         /** Message idintifier. */
         icmp_param_t identifier;
         /** Message sequence number. */
         icmp_param_t sequence_number;
-} __attribute__ ((packed));
-
-/** Type definition of the internet control message header.
- * @see icmp_header
- */
-typedef struct icmp_header icmp_header_t;
+} __attribute__((packed)) icmp_echo_t;
 
 /** Internet control message header. */
-struct icmp_header {
+typedef struct icmp_header {
         /** The type of the message. */
         uint8_t type;
@@ -83 +73 @@
          */
         uint16_t checksum;
-
+        
         /** Message specific data. */
         union {
                 /** Echo specific data. */
-                icmp_echo_t  echo;
+                icmp_echo_t echo;
                 /** Proposed gateway value. */
                 in_addr_t gateway;
@@ -107 +97 @@
                 } param;
         } un;
-} __attribute__ ((packed));
+} __attribute__((packed)) icmp_header_t;
 
 #endif

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)