Add changes in 4.2.1.

[tcpdump] / sctpHeader.h

diff --git a/sctpHeader.h b/sctpHeader.h
index bbf5bc1241de047687fc89bd2ff05790db1fa104..63f30b5d834a406513dc7767ec858efc2a4bebc2 100644 (file)
--- a/sctpHeader.h
+++ b/sctpHeader.h
@@ -1,3 +1,5 @@
+/* @(#) $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
  *
  * Redistribution and use in source and binary forms, with or without
 /* SCTP reference Implementation Copyright (C) 1999 Cisco And Motorola
  *
  * Redistribution and use in source and binary forms, with or without


@@ -29,14 +31,14 @@
  *
  * This file is part of the SCTP reference Implementation
  *
  *
  * 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:
  * Please send any bug reports or fixes you make to one of the following email
  * addresses:

- * 
+ *

  * [email protected]
  * [email protected]
  * [email protected]
  * [email protected]
  * [email protected]
  * [email protected]

- * 
+ *

  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorperated into the next SCTP release.
  */
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorperated into the next SCTP release.
  */


@@ -55,39 +57,39 @@ extern "C" {
 
 #ifdef TRU64
  #define _64BITS 1
 
 #ifdef TRU64
  #define _64BITS 1

-#endif 
+#endif

 
 struct sctpHeader{
 
 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{
 };
 
 /* 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{
 };
 
 struct sctpParamDesc{

-  u_short paramType;
-  u_short paramLength;
+  u_int16_t paramType;
+  u_int16_t paramLength;

 };
 
 
 struct sctpRelChunkDesc{
   struct sctpChunkDesc chk;
 };
 
 
 struct sctpRelChunkDesc{
   struct sctpChunkDesc chk;

-  u_int serialNumber;
+  u_int32_t serialNumber;

 };
 
 struct sctpVendorSpecificParam {
   struct sctpParamDesc p;  /* type must be 0xfffe */
 };
 
 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;

 };
 
 
 };
 
 


@@ -99,50 +101,55 @@ struct sctpVendorSpecificParam {
 
 /* this is used for init ack, too */
 struct sctpInitiation{
 
 /* 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 */
   /* 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 */
 };
 
 
 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;
 };
 
 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 */
 };
 
 
 struct sctpCookiePreserve{
   struct sctpParamDesc p;      /* type is set to SCTP_COOKIE_PRESERVE, len=8 */

-  u_int extraTime;
+  u_int32_t extraTime;

 };
 
 
 };
 
 

+struct sctpTimeStamp{
+  u_int32_t ts_sec;
+  u_int32_t ts_usec;
+};
+

 /* wire structure of my cookie */
 struct cookieMessage{
 /* 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 */
-  struct timespec timeEnteringState;   /* the time I built 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 */
   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
   /* at the end is tacked on the INIT chunk sent in

-   * its entirety and of course our 
+   * its entirety and of course our

    * signature.
    */
 };
    * signature.
    */
 };


@@ -164,23 +171,23 @@ struct sctpSendableInit{
 };
 
 
 };
 
 

-/* Selective Acknowledgement 
+/* Selective Acknowledgement

  * has the following structure with
  * a optional ammount of trailing int's
  * 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{
  * 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{
 };
 
 struct sctpSelectiveFrag{

-  u_short fragmentStart;
-  u_short fragmentEnd;
+  u_int16_t fragmentStart;
+  u_int16_t fragmentEnd;

 };
 
 
 };
 
 


@@ -190,12 +197,12 @@ struct sctpUnifiedSack{
 };
 
 /* for both RTT request/response the
 };
 
 /* for both RTT request/response the

- * following is sent 
+ * following is sent

  */
 
 struct sctpHBrequest {
  */
 
 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. */
 };
 
 /* here is what I read and respond with to. */


@@ -210,13 +217,13 @@ struct sctpHBsender{
   struct sctpChunkDesc hdr;
   struct sctpParamDesc hb;
   struct sctpHBrequest rtt;
   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.
  */
  * we must carry the init tag in the common header. Just the
  * common header is all that is needed with a chunk descriptor.
  */


@@ -232,15 +239,15 @@ struct sctpUnifiedAbortLight{
 struct sctpUnifiedAbortHeavy{
   struct sctpHeader mh;
   struct sctpChunkDesc uh;
 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 {
 };
 
 /* 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{
 };
 
 struct sctpUnifiedShutdown{


@@ -253,8 +260,8 @@ struct sctpUnifiedShutdown{
  * that is defined as a operation error.
  */
 struct sctpOpErrorCause{
  * 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{
 };
 
 struct sctpUnifiedOpError{


@@ -266,15 +273,15 @@ struct sctpUnifiedStreamError{
   struct sctpHeader mh;
   struct sctpChunkDesc uh;
   struct sctpOpErrorCause c;
   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;
 };
 
 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
 };
 
 /* the following is used in all sends


@@ -287,10 +294,10 @@ struct sctpUnifiedSingleMsg{
 };
 
 struct sctpDataPart{
 };
 
 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{
 };
 
 struct sctpUnifiedDatagram{


@@ -300,14 +307,14 @@ struct sctpUnifiedDatagram{
 
 struct sctpECN_echo{
   struct sctpChunkDesc uh;
 
 struct sctpECN_echo{
   struct sctpChunkDesc uh;

-  u_int Lowest_TSN;
-};    
+  u_int32_t Lowest_TSN;
+};

 
 
 struct sctpCWR{
   struct sctpChunkDesc uh;
 
 
 struct sctpCWR{
   struct sctpChunkDesc uh;

-  u_int TSN_reduced_at;
-};    
+  u_int32_t TSN_reduced_at;
+};

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }