X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/5667a87a62e984d2e5b97ee55ba2386d96533493..refs/heads/tcpdump-4.0:/dccp.h

diff --git a/dccp.h b/dccp.h
index ddc2d1d3..5c66e23c 100644
--- a/dccp.h
+++ b/dccp.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/dccp.h,v 1.3 2005-12-05 21:36:24 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 <iam4@cs.waikato.ac.nz>
@@ -36,8 +36,8 @@ struct dccp_hdr {
 	}		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)
@@ -117,7 +117,7 @@ enum dccp_pkt_type {
 	DCCP_PKT_RESET,
 	DCCP_PKT_SYNC,
 	DCCP_PKT_SYNCACK,
-	DCCP_PKT_INVALID,
+	DCCP_PKT_INVALID
 };
 
 enum dccp_reset_codes {
@@ -133,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_LAST,
+	__DCCP_RESET_CODE_LAST
 };
 
 #endif /* __DCCP_HDR__ */