1 files changed, 68 insertions, 68 deletions

diff --git a/contrib/tcpdump/sctpHeader.h b/contrib/tcpdump/sctpHeader.h
index b4a131a59a48..3b26094c1b82 100644
--- a/contrib/tcpdump/sctpHeader.h
+++ b/contrib/tcpdump/sctpHeader.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/sctpHeader.h,v 1.3 2001/08/01 03:34:00 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/sctpHeader.h,v 1.6 2002/12/11 07:14:11 guy Exp $ (LBL) */
 
 /* SCTP reference Implementation Copyright (C) 1999 Cisco And Motorola
  *
@@ -31,14 +31,14 @@
  *
  * This file is part of the SCTP reference Implementation
  *
- * 
+ *
  * Please send any bug reports or fixes you make to one of the following email
  * addresses:
- * 
+ *
  * rstewar1@email.mot.com
  * kmorneau@cisco.com
  * qxie1@email.mot.com
- * 
+ *
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorperated into the next SCTP release.
  */
@@ -57,39 +57,39 @@ extern "C" {
 
 #ifdef TRU64
  #define _64BITS 1
-#endif 
+#endif
 
 struct sctpHeader{
-  u_short source;
-  u_short destination;
-  u_int verificationTag;
-  u_int adler32;
+  u_int16_t source;
+  u_int16_t destination;
+  u_int32_t verificationTag;
+  u_int32_t adler32;
 };
 
 /* various descriptor parsers */
 
 struct sctpChunkDesc{
-  u_char chunkID;
-  u_char chunkFlg;
-  u_short chunkLength;
+  u_int8_t chunkID;
+  u_int8_t chunkFlg;
+  u_int16_t chunkLength;
 };
 
 struct sctpParamDesc{
-  u_short paramType;
-  u_short paramLength;
+  u_int16_t paramType;
+  u_int16_t paramLength;
 };
 
 
 struct sctpRelChunkDesc{
   struct sctpChunkDesc chk;
-  u_int serialNumber;
+  u_int32_t serialNumber;
 };
 
 struct sctpVendorSpecificParam {
   struct sctpParamDesc p;  /* type must be 0xfffe */
-  u_int vendorId;	   /* vendor ID from RFC 1700 */
-  u_short vendorSpecificType;
-  u_short vendorSpecificLen;
+  u_int32_t vendorId;	   /* vendor ID from RFC 1700 */
+  u_int16_t vendorSpecificType;
+  u_int16_t vendorSpecificLen;
 };
 
 
@@ -101,55 +101,55 @@ struct sctpVendorSpecificParam {
 
 /* this is used for init ack, too */
 struct sctpInitiation{
-  u_int initTag;		/* tag of mine */
-  u_int rcvWindowCredit;	/* rwnd */
-  u_short NumPreopenStreams;	/* OS */
-  u_short MaxInboundStreams;     /* MIS */
-  u_int initialTSN;
+  u_int32_t initTag;		/* tag of mine */
+  u_int32_t rcvWindowCredit;	/* rwnd */
+  u_int16_t NumPreopenStreams;	/* OS */
+  u_int16_t MaxInboundStreams;     /* MIS */
+  u_int32_t initialTSN;
   /* optional param's follow in sctpParamDesc form */
 };
 
 struct sctpV4IpAddress{
   struct sctpParamDesc p;	/* type is set to SCTP_IPV4_PARAM_TYPE, len=10 */
-  u_int  ipAddress;
+  u_int32_t  ipAddress;
 };
 
 
 struct sctpV6IpAddress{
   struct sctpParamDesc p;	/* type is set to SCTP_IPV6_PARAM_TYPE, len=22 */
-  u_char  ipAddress[16];
+  u_int8_t  ipAddress[16];
 };
 
 struct sctpDNSName{
   struct sctpParamDesc param;
-  u_char name[1];
+  u_int8_t name[1];
 };
 
 
 struct sctpCookiePreserve{
   struct sctpParamDesc p;	/* type is set to SCTP_COOKIE_PRESERVE, len=8 */
-  u_int extraTime;
+  u_int32_t extraTime;
 };
 
 
 struct sctpTimeStamp{
-  u_int ts_sec;
-  u_int ts_usec;
+  u_int32_t ts_sec;
+  u_int32_t ts_usec;
 };
 
 /* wire structure of my cookie */
 struct cookieMessage{
-  u_int TieTag_curTag;			/* copied from assoc if present */
-  u_int TieTag_hisTag; 		/* copied from assoc if present */
-  int cookieLife;			/* life I will award this cookie */
+  u_int32_t TieTag_curTag;		/* copied from assoc if present */
+  u_int32_t TieTag_hisTag; 		/* copied from assoc if present */
+  int32_t cookieLife;			/* life I will award this cookie */
   struct sctpTimeStamp timeEnteringState; /* the time I built cookie */
   struct sctpInitiation initAckISent;	/* the INIT-ACK that I sent to my peer */
-  u_int addressWhereISent[4];		/* I make this 4 ints so I get 128bits for future */
-  int addrtype;				/* address type */
-  u_short locScope;			/* V6 local scope flag */
-  u_short siteScope;			/* V6 site scope flag */
+  u_int32_t addressWhereISent[4];	/* I make this 4 ints so I get 128bits for future */
+  int32_t addrtype;			/* address type */
+  u_int16_t locScope;			/* V6 local scope flag */
+  u_int16_t siteScope;			/* V6 site scope flag */
   /* at the end is tacked on the INIT chunk sent in
-   * its entirety and of course our 
+   * its entirety and of course our
    * signature.
    */
 };
@@ -171,23 +171,23 @@ struct sctpSendableInit{
 };
 
 
-/* Selective Acknowledgement 
+/* Selective Acknowledgement
  * has the following structure with
  * a optional ammount of trailing int's
- * on the last part (based on the numberOfDesc 
+ * on the last part (based on the numberOfDesc
  * field).
  */
 
 struct sctpSelectiveAck{
-  u_int highestConseqTSN;
-  u_int updatedRwnd;
-  u_short numberOfdesc;
-  u_short numDupTsns;
+  u_int32_t highestConseqTSN;
+  u_int32_t updatedRwnd;
+  u_int16_t numberOfdesc;
+  u_int16_t numDupTsns;
 };
 
 struct sctpSelectiveFrag{
-  u_short fragmentStart;
-  u_short fragmentEnd;
+  u_int16_t fragmentStart;
+  u_int16_t fragmentEnd;
 };
 
 
@@ -197,12 +197,12 @@ struct sctpUnifiedSack{
 };
 
 /* for both RTT request/response the
- * following is sent 
+ * following is sent
  */
 
 struct sctpHBrequest {
-  u_int time_value_1;
-  u_int time_value_2;
+  u_int32_t time_value_1;
+  u_int32_t time_value_2;
 };
 
 /* here is what I read and respond with to. */
@@ -217,13 +217,13 @@ struct sctpHBsender{
   struct sctpChunkDesc hdr;
   struct sctpParamDesc hb;
   struct sctpHBrequest rtt;
-  char addrFmt[SCTP_ADDRMAX];
-  unsigned short userreq;
+  int8_t addrFmt[SCTP_ADDRMAX];
+  u_int16_t userreq;
 };
-  
 
 
-/* for the abort and shutdown ACK 
+
+/* for the abort and shutdown ACK
  * we must carry the init tag in the common header. Just the
  * common header is all that is needed with a chunk descriptor.
  */
@@ -239,15 +239,15 @@ struct sctpUnifiedAbortLight{
 struct sctpUnifiedAbortHeavy{
   struct sctpHeader mh;
   struct sctpChunkDesc uh;
-  unsigned short causeCode;
-  unsigned short causeLen;
+  u_int16_t causeCode;
+  u_int16_t causeLen;
 };
 
 /* For the graceful shutdown we must carry
  * the tag (in common header)  and the highest consequitive acking value
  */
 struct sctpShutdown {
-  u_int TSN_Seen;
+  u_int32_t TSN_Seen;
 };
 
 struct sctpUnifiedShutdown{
@@ -260,8 +260,8 @@ struct sctpUnifiedShutdown{
  * that is defined as a operation error.
  */
 struct sctpOpErrorCause{
-  u_short cause;
-  u_short causeLen;
+  u_int16_t cause;
+  u_int16_t causeLen;
 };
 
 struct sctpUnifiedOpError{
@@ -273,15 +273,15 @@ struct sctpUnifiedStreamError{
   struct sctpHeader mh;
   struct sctpChunkDesc uh;
   struct sctpOpErrorCause c;
-  u_short strmNum;
-  u_short reserved;
+  u_int16_t strmNum;
+  u_int16_t reserved;
 };
 
 struct staleCookieMsg{
   struct sctpHeader mh;
   struct sctpChunkDesc uh;
   struct sctpOpErrorCause c;
-  u_int moretime;
+  u_int32_t moretime;
 };
 
 /* the following is used in all sends
@@ -294,10 +294,10 @@ struct sctpUnifiedSingleMsg{
 };
 
 struct sctpDataPart{
-  u_int TSN;
-  u_short streamId;
-  u_short sequence;
-  u_int payloadtype;
+  u_int32_t TSN;
+  u_int16_t streamId;
+  u_int16_t sequence;
+  u_int32_t payloadtype;
 };
 
 struct sctpUnifiedDatagram{
@@ -307,14 +307,14 @@ struct sctpUnifiedDatagram{
 
 struct sctpECN_echo{
   struct sctpChunkDesc uh;
-  u_int Lowest_TSN;
-};    
+  u_int32_t Lowest_TSN;
+};
 
 
 struct sctpCWR{
   struct sctpChunkDesc uh;
-  u_int TSN_reduced_at;
-};    
+  u_int32_t TSN_reduced_at;
+};
 
 #ifdef	__cplusplus
 }