Backout CHANGES update - wrong branch

[tcpdump] / dccp.h

diff --git a/dccp.h b/dccp.h
index 2c479aad4de9abf4dc9f27d2db7047ce519a79b3..ca71a34175f591826b4d156236e26fea57a5db27 100644 (file)
--- a/dccp.h
+++ b/dccp.h
@@ -1,5 +1,4 @@
-#ifndef __DCCP_HDR__
-#define __DCCP_HDR__
+/* @(#) $Header: /tcpdump/master/tcpdump/dccp.h,v 1.1.2.4 2006-05-12 01:46:17 guy Exp $ (LBL) */
 /*
  * Copyright (C) Arnaldo Carvalho de Melo 2004
  * Copyright (C) Ian McDonald 2005 <[email protected]>
@@ -9,6 +8,9 @@
  * BSD-style license that accompanies tcpdump or the GNU GPL version 2
  */
 
+#ifndef __DCCP_HDR__
+#define __DCCP_HDR__
+
 /**
  * struct dccp_hdr - generic part of DCCP packet header
  *
@@ -84,12 +86,14 @@ struct dccp_hdr_response {
        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);
 }
+#endif
 
 /**
  * struct dccp_hdr_reset - Unconditionally shut down a connection
@@ -113,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 {
@@ -129,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__ */