Changeset 71b00dcc in mainline for uspace/srv/net/tl/tcp/tcp_header.h

Timestamp:

2010-03-07T22:51:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

60ab6c3

Parents:

b5cbff4 (diff), 31c80a5 (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 lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/tl/tcp/tcp_header.h (modified) (8 diffs)

uspace/srv/net/tl/tcp/tcp_header.h

@@ -43 +43 @@
 /** TCP header size in bytes.
  */
-#define TCP_HEADER_SIZE                 sizeof( tcp_header_t )
+#define TCP_HEADER_SIZE                 sizeof(tcp_header_t)
 
 /** Returns the actual TCP header length in bytes.
  *  @param[in] header The TCP packet header.
  */
-#define TCP_HEADER_LENGTH( header )             (( header )->header_length * 4u )
+#define TCP_HEADER_LENGTH(header)               ((header)->header_length * 4u)
 
 /** Returns the TCP header length.
  *  @param[in] length The TCP header length in bytes.
  */
-#define TCP_COMPUTE_HEADER_LENGTH( length )             (( uint8_t ) (( length ) / 4u ))
+#define TCP_COMPUTE_HEADER_LENGTH(length)               ((uint8_t) ((length) / 4u))
 
 /** Type definition of the transmission datagram header.
@@ -90 +90 @@
         /** The source port number.
          */
-        uint16_t        source_port;
+        uint16_t source_port;
         /** The destination port number.
          */
-        uint16_t        destination_port;
+        uint16_t destination_port;
         /** The sequence number of the first data octet in this segment (except when SYN is present).
          *  If SYN is present the sequence number is the initial sequence number (ISN) and the first data octet is ISN+1.
          */
-        uint32_t        sequence_number;
+        uint32_t sequence_number;
         /** If the ACK control bit is set this field contains the value of the next sequence number the sender of the segment is expecting to receive.
          *  Once a~connection is established this is always sent.
          *  @see acknowledge
          */
-        uint32_t        acknowledgement_number;
+        uint32_t acknowledgement_number;
 #ifdef ARCH_IS_BIG_ENDIAN
         /** The number of 32~bit words in the TCP Header.
@@ -108 +108 @@
          *  The TCP header (even one including options) is an integral number of 32~bits long.
          */
-        uint8_t header_length:4;
+        uint8_t header_length:4;
         /** Four bits reserved for future use.
          *  Must be zero.
          */
-        uint8_t reserved1:4;
+        uint8_t reserved1:4;
 #else
         /** Four bits reserved for future use.
          *  Must be zero.
          */
-        uint8_t reserved1:4;
+        uint8_t reserved1:4;
         /** The number of 32~bit words in the TCP Header.
          *  This indicates where the data begins.
          *  The TCP header (even one including options) is an integral number of 32~bits long.
          */
-        uint8_t header_length:4;
+        uint8_t header_length:4;
 #endif
 #ifdef ARCH_IS_BIG_ENDIAN
@@ -128 +128 @@
          *  Must be zero.
          */
-        uint8_t reserved2:2;
+        uint8_t reserved2:2;
         /** Urgent Pointer field significant.
          *  @see tcp_header:urgent_pointer
          */
-        uint8_t urgent:1;
+        uint8_t urgent:1;
         /** Acknowledgment field significant
          *  @see tcp_header:acknowledgement_number
          */
-        uint8_t acknowledge:1;
+        uint8_t acknowledge:1;
         /** Push function.
          */
-        uint8_t push:1;
+        uint8_t push:1;
         /** Reset the connection.
          */
-        uint8_t reset:1;
+        uint8_t reset:1;
         /** Synchronize the sequence numbers.
          */
-        uint8_t synchronize:1;
+        uint8_t synchronize:1;
         /** No more data from the sender.
          */
-        uint8_t finalize:1;
+        uint8_t finalize:1;
 #else
         /** No more data from the sender.
          */
-        uint8_t finalize:1;
+        uint8_t finalize:1;
         /** Synchronize the sequence numbers.
          */
-        uint8_t synchronize:1;
+        uint8_t synchronize:1;
         /** Reset the connection.
          */
-        uint8_t reset:1;
+        uint8_t reset:1;
         /** Push function.
          */
-        uint8_t push:1;
+        uint8_t push:1;
         /** Acknowledgment field significant.
          *  @see tcp_header:acknowledgement_number
          */
-        uint8_t acknowledge:1;
+        uint8_t acknowledge:1;
         /** Urgent Pointer field significant.
          *  @see tcp_header:urgent_pointer
          */
-        uint8_t urgent:1;
+        uint8_t urgent:1;
         /** Two bits reserved for future use.
          *  Must be zero.
          */
-        uint8_t reserved2:2;
+        uint8_t reserved2:2;
 #endif
         /** The number of data octets beginning with the one indicated in the acknowledgment field which the sender of this segment is willing to accept.
          *  @see tcp_header:acknowledge
          */
-        uint16_t        window;
+        uint16_t window;
         /** The checksum field is the 16~bit one's complement of the one's complement sum of all 16~bit words in the header and text.
          *  If a~segment contains an odd number of header and text octets to be checksummed, the last octet is padded on the right with zeros to form a~16~bit word for checksum purposes.
@@ -188 +188 @@
          *  If the computed checksum is zero, it is transmitted as all ones (the equivalent in one's complement arithmetic).
          */
-        uint16_t        checksum;
+        uint16_t checksum;
         /** This field communicates the current value of the urgent pointer as a~positive offset from the sequence number in this segment.
          *  The urgent pointer points to the sequence number of the octet following the urgent data.
@@ -194 +194 @@
          *  @see tcp_header:urgent
          */
-        uint16_t        urgent_pointer;
+        uint16_t urgent_pointer;
 } __attribute__ ((packed));
 
@@ -202 +202 @@
         /** Option type.
          */
-        uint8_t         type;
+        uint8_t type;
         /** Option length.
          */
-        uint8_t         length;
+        uint8_t length;
 };
 
@@ -215 +215 @@
          *  @see TCPOPT_MAX_SEGMENT_SIZE_LENGTH
          */
-        tcp_option_t    option;
+        tcp_option_t option;
         /** Maximum segment size in bytes.
          */
-        uint16_t                max_segment_size;
+        uint16_t max_segment_size;
 } __attribute__ ((packed));