Changeset 858fc90 in mainline for uspace/srv/net/tl/icmp/icmp_header.h

Timestamp:

2010-03-15T19:35:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (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 from bzr://bzr.helenos.org/head.

File:

• uspace/srv/net/tl/icmp/icmp_header.h (modified) (6 diffs)

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

@@ -46 +46 @@
 /** ICMP header size in bytes.
  */
-#define ICMP_HEADER_SIZE                        sizeof( icmp_header_t )
+#define ICMP_HEADER_SIZE                        sizeof(icmp_header_t)
 
 /** Type definition of the echo specific data.
@@ -63 +63 @@
         /** Message idintifier.
          */
-        icmp_param_t    identifier;
+        icmp_param_t identifier;
         /** Message sequence number.
          */
-        icmp_param_t    sequence_number;
+        icmp_param_t sequence_number;
 } __attribute__ ((packed));
 
@@ -84 +84 @@
         /** The type of the message.
          */
-        uint8_t type;
+        uint8_t type;
         /** The error code for the datagram reported by the ICMP message.
          *  The interpretation is dependent on the message type.
          */
-        uint8_t code;
+        uint8_t code;
         /** The checksum is the 16-bit ones's complement of the one's complement sum of the ICMP message starting with the ICMP Type.
      *  For computing the checksum, the checksum field should be zero.
          *  If the checksum does not match the contents, the datagram is discarded.
          */
-        uint16_t        checksum;
+        uint16_t checksum;
         /** Message specific data.
          */
@@ -99 +99 @@
                 /** Echo specific data.
                  */
-                icmp_echo_t             echo;
+                icmp_echo_t  echo;
                 /** Proposed gateway value.
                  */
-                in_addr_t                       gateway;
+                in_addr_t gateway;
                 /** Fragmentation needed specific data.
                  */
@@ -109 +109 @@
                          *  Must be zero.
                          */
-                        icmp_param_t    reserved;
+                        icmp_param_t reserved;
                         /** Proposed MTU.
                          */
-                        icmp_param_t    mtu;
+                        icmp_param_t mtu;
                 } frag;
                 /** Parameter problem specific data.
@@ -119 +119 @@
                         /** Problem pointer.
                          */
-                        icmp_param_t    pointer;
+                        icmp_param_t pointer;
                         /** Reserved field.
                          *  Must be zero.
                          */
-                        icmp_param_t    reserved;
+                        icmp_param_t reserved;
                 } param;
         } un;