Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / dccp.h

diff --git a/dccp.h b/dccp.h
index 2f35e9c65484d18d6e660cf29950450b5a8d5282..5c66e23cd86041295a1ac085720815a9279385ae 100644 (file)
--- a/dccp.h
+++ b/dccp.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/dccp.h,v 1.2 2005-09-20 06:25:19 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/dccp.h,v 1.5 2006-11-02 09:05:23 hannes Exp $ (LBL) */

 /*
  * Copyright (C) Arnaldo Carvalho de Melo 2004
  * Copyright (C) Ian McDonald 2005 <[email protected]>
 /*
  * Copyright (C) Arnaldo Carvalho de Melo 2004
  * Copyright (C) Ian McDonald 2005 <[email protected]>


@@ -36,8 +36,8 @@ struct dccp_hdr {
        }               dccph_xtrs;
 };
 
        }               dccph_xtrs;
 };
 

-#define DCCPH_CCVAL(dh)        (((dh)->dccph_ccval_cscov) & 0x0F)
-#define DCCPH_CSCOV(dh)        (((dh)->dccph_ccval_cscov >> 4) & 0x0F)
+#define DCCPH_CCVAL(dh)        (((dh)->dccph_ccval_cscov >> 4) & 0xF)
+#define DCCPH_CSCOV(dh)        (((dh)->dccph_ccval_cscov) & 0xF)

 
 #define DCCPH_X(dh)    ((dh)->dccph_xtrs.dccph_xtr & 1)
 #define DCCPH_TYPE(dh) (((dh)->dccph_xtrs.dccph_xtr >> 1) & 0xF)
 
 #define DCCPH_X(dh)    ((dh)->dccph_xtrs.dccph_xtr & 1)
 #define DCCPH_TYPE(dh) (((dh)->dccph_xtrs.dccph_xtr >> 1) & 0xF)


@@ -86,12 +86,14 @@ struct dccp_hdr_response {
        u_int32_t                       dccph_resp_service;
 };
 
        u_int32_t                       dccph_resp_service;
 };
 

+#if 0

 static inline struct dccp_hdr_data *dccp_hdr_data(struct dccp_hdr *hdrg)
 {
        const int ext = DCCPH_X(hdrg) ? sizeof(struct dccp_hdr_ext) : 0;
 
        return (struct dccp_hdr_data *)(((u_char *)hdrg) + sizeof(hdrg) + ext);
 }
 static inline struct dccp_hdr_data *dccp_hdr_data(struct dccp_hdr *hdrg)
 {
        const int ext = DCCPH_X(hdrg) ? sizeof(struct dccp_hdr_ext) : 0;
 
        return (struct dccp_hdr_data *)(((u_char *)hdrg) + sizeof(hdrg) + ext);
 }

+#endif

 
 /**
  * struct dccp_hdr_reset - Unconditionally shut down a connection
 
 /**
  * struct dccp_hdr_reset - Unconditionally shut down a connection


@@ -115,7 +117,7 @@ enum dccp_pkt_type {
        DCCP_PKT_RESET,
        DCCP_PKT_SYNC,
        DCCP_PKT_SYNCACK,
        DCCP_PKT_RESET,
        DCCP_PKT_SYNC,
        DCCP_PKT_SYNCACK,

-       DCCP_PKT_INVALID,
+       DCCP_PKT_INVALID

 };
 
 enum dccp_reset_codes {
 };
 
 enum dccp_reset_codes {


@@ -131,7 +133,7 @@ enum dccp_reset_codes {
        DCCP_RESET_CODE_TOO_BUSY,
        DCCP_RESET_CODE_BAD_INIT_COOKIE,
        DCCP_RESET_CODE_AGGRESSION_PENALTY,
        DCCP_RESET_CODE_TOO_BUSY,
        DCCP_RESET_CODE_BAD_INIT_COOKIE,
        DCCP_RESET_CODE_AGGRESSION_PENALTY,

-       __DCCP_RESET_CODE_LAST,
+       __DCCP_RESET_CODE_LAST

 };
 
 #endif /* __DCCP_HDR__ */
 };
 
 #endif /* __DCCP_HDR__ */