Changeset 8b655705 in mainline for uspace/lib/net/include/icmp_header.h

Timestamp:

2011-04-15T19:38:07Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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 mainline changes.

File:

• uspace/lib/net/include/icmp_header.h (modified) (3 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