Use an 8-octet array when the ACK field is always 8 octets.

Get rid of "struct dccp_hdr_ack_bits" while we're at it.

diff --git a/print-dccp.c b/print-dccp.c
index c4370499df022584ee0fcf4ed86e466d78a6c41c..626853c2d7944053b0f8e758083e6cad8ec61b5d 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -75,38 +75,25 @@ struct dccp_hdr_request {
        u_int32_t       dccph_req_service;
 } UNALIGNED;
 
-/**
- * struct dccp_hdr_ack_bits - acknowledgment bits common to most packets
- *
- * @dccph_resp_ack_nr_high - 48 bit ack number high order bits, contains GSR
- * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR
- */
-struct dccp_hdr_ack_bits {
-       u_int32_t       dccph_ra;
-       u_int32_t       dccph_ack_nr_low;
-} UNALIGNED;
-
-#define DCCPH_ACK(dh_ack)   ((dh_ack)->dccph_ra >> 8)
-
 /**
  * struct dccp_hdr_response - Conection initiation response header
  *
- * @dccph_resp_ack_nr_high - 48 bit ack number high order bits, contains GSR
- * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR
+ * @dccph_resp_ack - 48 bit ack number, contains GSR
  * @dccph_resp_service - Echoes the Service Code on a received DCCP-Request
  */
 struct dccp_hdr_response {
-       struct dccp_hdr_ack_bits        dccph_resp_ack;
+       u_int8_t                        dccph_resp_ack[8];      /* always 8 bytes */
        u_int32_t                       dccph_resp_service;
 } UNALIGNED;
 
 /**
  * struct dccp_hdr_reset - Unconditionally shut down a connection
  *
+ * @dccph_resp_ack - 48 bit ack number
  * @dccph_reset_service - Echoes the Service Code on a received DCCP-Request
  */
 struct dccp_hdr_reset {
-       struct dccp_hdr_ack_bits        dccph_reset_ack;
+       u_int8_t                        dccph_reset_ack[8];     /* always 8 bytes */
        u_int8_t                        dccph_reset_code,
                                        dccph_reset_data[3];
 } UNALIGNED;