Changeset 9ca0b29 for lib/libtrace.h.in

Timestamp:

06/27/11 10:14:15 (11 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

b7922c7

Parents:

d8e4595

Message:

• Add support for ECN bits in the TCP header - note that this does change the makeup of the libtrace_tcp_t struct which will be a problem for people referencing the reserved bits or trying to work out ECN manually. Long term, I think the benefits outweigh the slight discomfort that might be caused by this change.

File:

• lib/libtrace.h.in (modified) (1 diff)

lib/libtrace.h.in

@@ -535 +535 @@
     uint32_t ack_seq;           /**< Acknowledgement Number */
 #  if BYTE_ORDER == LITTLE_ENDIAN
-    LT_BITFIELD8 res1:4;        /**< Reserved bits */
-    LT_BITFIELD8 doff:4;        /**< Data Offset */     
-    LT_BITFIELD8 fin:1;         /**< FIN */
-    LT_BITFIELD8 syn:1;         /**< SYN flag */
-    LT_BITFIELD8 rst:1;         /**< RST flag */
-    LT_BITFIELD8 psh:1;         /**< PuSH flag */
-    LT_BITFIELD8 ack:1;         /**< ACK flag */
-    LT_BITFIELD8 urg:1;         /**< URG flag */
-    LT_BITFIELD8 res2:2;        /**< Reserved */
+    LT_BITFIELD8 ecn_ns:1;      /**< ECN Nonce Sum */
+    LT_BITFIELD8 res1:3;        /**< Reserved bits */
+    LT_BITFIELD8 doff:4;        /**< Data Offset */
+    LT_BITFIELD8 fin:1;         /**< FIN */
+    LT_BITFIELD8 syn:1;         /**< SYN flag */
+    LT_BITFIELD8 rst:1;         /**< RST flag */
+    LT_BITFIELD8 psh:1;         /**< PuSH flag */
+    LT_BITFIELD8 ack:1;         /**< ACK flag */
+    LT_BITFIELD8 urg:1;         /**< URG flag */
+    LT_BITFIELD8 ece:1;         /**< ECN Echo */
+    LT_BITFIELD8 cwr:1;         /**< ECN CWR */
 #  elif BYTE_ORDER == BIG_ENDIAN
-    LT_BITFIELD8 doff:4;        /**< Data offset */
-    LT_BITFIELD8 res1:4;        /**< Reserved bits */
-    LT_BITFIELD8 res2:2;        /**< Reserved */
-    LT_BITFIELD8 urg:1;         /**< URG flag */
-    LT_BITFIELD8 ack:1;         /**< ACK flag */
-    LT_BITFIELD8 psh:1;         /**< PuSH flag */
-    LT_BITFIELD8 rst:1;         /**< RST flag */
-    LT_BITFIELD8 syn:1;         /**< SYN flag */
-    LT_BITFIELD8 fin:1;         /**< FIN flag */
+    LT_BITFIELD8 doff:4;        /**< Data offset */
+    LT_BITFIELD8 res1:3;        /**< Reserved bits */
+    LT_BITFIELD8 ecn_ns:1;      /**< ECN Nonce Sum */
+    LT_BITFIELD8 cwr:1;         /**< ECN CWR */
+    LT_BITFIELD8 ece:1;         /**< ECN Echo */
+    LT_BITFIELD8 urg:1;         /**< URG flag */
+    LT_BITFIELD8 ack:1;         /**< ACK flag */
+    LT_BITFIELD8 psh:1;         /**< PuSH flag */
+    LT_BITFIELD8 rst:1;         /**< RST flag */
+    LT_BITFIELD8 syn:1;         /**< SYN flag */
+    LT_BITFIELD8 fin:1;         /**< FIN flag */
 #  else
 #   error "Adjust your <bits/endian.h> defines"