Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-sctp.c

diff --git a/print-sctp.c b/print-sctp.c
index 30affdd7bfcd41bd65ef883eb412af03613bff70..cc5bee4ff6f4ebab7cb871e62bd433017dbd2fca 100644 (file)
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -36,11 +36,12 @@
 /* \summary: Stream Control Transmission Protocol (SCTP) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Stream Control Transmission Protocol (SCTP) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"


@@ -89,7 +90,7 @@
  * [email protected]
  *
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * [email protected]
  *
  * Any bugs reported given to us we will try to fix... any fixes shared will

- * be incorperated into the next SCTP release.
+ * be incorporated into the next SCTP release.

  */
 
 /* The valid defines for all message
  */
 
 /* The valid defines for all message


@@ -249,7 +250,7 @@ struct sctpSendableInit{
 
 /* Selective Acknowledgement
  * has the following structure with
 
 /* Selective Acknowledgement
  * has the following structure with

- * a optional ammount of trailing int's
+ * a optional amount of trailing int's

  * on the last part (based on the numberOfDesc
  * field).
  */
  * on the last part (based on the numberOfDesc
  * field).
  */


@@ -434,7 +435,8 @@ static const struct tok PayloadProto_idents[] = {
 };
 
 
 };
 
 

-static inline int isForCES_port(u_short Port)
+static int
+isForCES_port(u_short Port)

 {
        if (Port == CHAN_HP)
                return 1;
 {
        if (Port == CHAN_HP)
                return 1;


@@ -448,9 +450,9 @@ static inline int isForCES_port(u_short Port)
 
 void
 sctp_print(netdissect_options *ndo,
 
 void
 sctp_print(netdissect_options *ndo,

-           const u_char *bp,        /* beginning of sctp packet */
-           const u_char *bp2,       /* beginning of enclosing */
-           u_int sctpPacketLength)  /* ip packet */
+          const u_char *bp,        /* beginning of sctp packet */
+          const u_char *bp2,       /* beginning of enclosing */
+          u_int sctpPacketLength)  /* sctp packet */

 {
   u_int sctpPacketLengthRemaining;
   const struct sctpHeader *sctpPktHdr;
 {
   u_int sctpPacketLengthRemaining;
   const struct sctpHeader *sctpPktHdr;


@@ -463,18 +465,14 @@ sctp_print(netdissect_options *ndo,
   const char *sep;
   int isforces = 0;
 
   const char *sep;
   int isforces = 0;
 

-  if (sctpPacketLength < sizeof(struct sctpHeader))
-    {
-      ND_PRINT((ndo, "truncated-sctp - %ld bytes missing!",
-                  (long)(sizeof(struct sctpHeader) - sctpPacketLength)));
-      return;
-    }
+  ndo->ndo_protocol = "sctp";
+  ND_ICHECKMSG_ZU("length", sctpPacketLength, <, sizeof(struct sctpHeader));

   sctpPktHdr = (const struct sctpHeader*) bp;
   sctpPktHdr = (const struct sctpHeader*) bp;

-  ND_TCHECK(*sctpPktHdr);
+  ND_TCHECK_SIZE(sctpPktHdr);

   sctpPacketLengthRemaining = sctpPacketLength;
 
   sctpPacketLengthRemaining = sctpPacketLength;
 

-  sourcePort = EXTRACT_BE_U_2(&sctpPktHdr->source);
-  destPort = EXTRACT_BE_U_2(&sctpPktHdr->destination);
+  sourcePort = GET_BE_U_2(sctpPktHdr->source);
+  destPort = GET_BE_U_2(sctpPktHdr->destination);

 
   ip = (const struct ip *)bp2;
   if (IP_V(ip) == 6)
 
   ip = (const struct ip *)bp2;
   if (IP_V(ip) == 6)


@@ -483,27 +481,26 @@ sctp_print(netdissect_options *ndo,
     ip6 = NULL;
 
   if (ip6) {
     ip6 = NULL;
 
   if (ip6) {

-    ND_PRINT((ndo, "%s.%u > %s.%u: sctp",
-      ip6addr_string(ndo, &ip6->ip6_src),
+    ND_PRINT("%s.%u > %s.%u: sctp",
+      GET_IP6ADDR_STRING(ip6->ip6_src),

       sourcePort,
       sourcePort,

-      ip6addr_string(ndo, &ip6->ip6_dst),
-      destPort));
-  } else
-  {
-    ND_PRINT((ndo, "%s.%u > %s.%u: sctp",
-      ipaddr_string(ndo, &ip->ip_src),
+      GET_IP6ADDR_STRING(ip6->ip6_dst),
+      destPort);
+  } else {
+    ND_PRINT("%s.%u > %s.%u: sctp",
+      GET_IPADDR_STRING(ip->ip_src),

       sourcePort,
       sourcePort,

-      ipaddr_string(ndo, &ip->ip_dst),
-      destPort));
+      GET_IPADDR_STRING(ip->ip_dst),
+      destPort);

   }
 
   if (isForCES_port(sourcePort)) {
   }
 
   if (isForCES_port(sourcePort)) {

-         ND_PRINT((ndo, "[%s]", tok2str(ForCES_channels, NULL, sourcePort)));
-         isforces = 1;
+        ND_PRINT("[%s]", tok2str(ForCES_channels, NULL, sourcePort));
+        isforces = 1;

   }
   if (isForCES_port(destPort)) {
   }
   if (isForCES_port(destPort)) {

-         ND_PRINT((ndo, "[%s]", tok2str(ForCES_channels, NULL, destPort)));
-         isforces = 1;
+        ND_PRINT("[%s]", tok2str(ForCES_channels, NULL, destPort));
+        isforces = 1;

   }
 
   bp += sizeof(struct sctpHeader);
   }
 
   bp += sizeof(struct sctpHeader);


@@ -523,14 +520,14 @@ sctp_print(netdissect_options *ndo,
 
       chunkDescPtr = (const struct sctpChunkDesc *)bp;
       if (sctpPacketLengthRemaining < sizeof(*chunkDescPtr)) {
 
       chunkDescPtr = (const struct sctpChunkDesc *)bp;
       if (sctpPacketLengthRemaining < sizeof(*chunkDescPtr)) {

-        ND_PRINT((ndo, "%s%u) [chunk descriptor cut off at end of packet]", sep, chunkCount+1));
-        break;
+       ND_PRINT("%s%u) [chunk descriptor cut off at end of packet]", sep, chunkCount+1);
+       break;

       }
       }

-      ND_TCHECK(*chunkDescPtr);
-      chunkLength = EXTRACT_BE_U_2(&chunkDescPtr->chunkLength);
+      ND_TCHECK_SIZE(chunkDescPtr);
+      chunkLength = GET_BE_U_2(chunkDescPtr->chunkLength);

       if (chunkLength < sizeof(*chunkDescPtr)) {
       if (chunkLength < sizeof(*chunkDescPtr)) {

-        ND_PRINT((ndo, "%s%u) [Bad chunk length %u, < size of chunk descriptor]", sep, chunkCount+1, chunkLength));
-        break;
+       ND_PRINT("%s%u) [Bad chunk length %u, < size of chunk descriptor]", sep, chunkCount+1, chunkLength);
+       break;

       }
       chunkLengthRemaining = chunkLength;
 
       }
       chunkLengthRemaining = chunkLength;
 


@@ -539,8 +536,8 @@ sctp_print(netdissect_options *ndo,
        align = 4 - align;
 
       if (sctpPacketLengthRemaining < align) {
        align = 4 - align;
 
       if (sctpPacketLengthRemaining < align) {

-        ND_PRINT((ndo, "%s%u) [Bad chunk length %u, > remaining data in packet]", sep, chunkCount+1, chunkLength));
-        break;
+       ND_PRINT("%s%u) [Bad chunk length %u, > remaining data in packet]", sep, chunkCount+1, chunkLength);
+       break;

       }
 
       ND_TCHECK_LEN(bp, chunkLength);
       }
 
       ND_TCHECK_LEN(bp, chunkLength);


@@ -549,10 +546,10 @@ sctp_print(netdissect_options *ndo,
       sctpPacketLengthRemaining -= sizeof(*chunkDescPtr);
       chunkLengthRemaining -= sizeof(*chunkDescPtr);
 
       sctpPacketLengthRemaining -= sizeof(*chunkDescPtr);
       chunkLengthRemaining -= sizeof(*chunkDescPtr);
 

-      ND_PRINT((ndo, "%s%u) ", sep, chunkCount+1));
-      chunkID = EXTRACT_U_1(chunkDescPtr->chunkID);
-      ND_PRINT((ndo, "[%s] ", tok2str(sctp_chunkid_str, "Unknown chunk type: 0x%x",
-                                      chunkID)));
+      ND_PRINT("%s%u) ", sep, chunkCount+1);
+      chunkID = GET_U_1(chunkDescPtr->chunkID);
+      ND_PRINT("[%s] ", tok2str(sctp_chunkid_str, "Unknown chunk type: 0x%x",
+              chunkID));

       switch (chunkID)
        {
        case SCTP_DATA :
       switch (chunkID)
        {
        case SCTP_DATA :


@@ -560,35 +557,33 @@ sctp_print(netdissect_options *ndo,
            const struct sctpDataPart *dataHdrPtr;
            uint8_t chunkFlg;
            uint32_t ppid;
            const struct sctpDataPart *dataHdrPtr;
            uint8_t chunkFlg;
            uint32_t ppid;

-           u_int payload_size;
+           uint16_t payload_size;

 
 

-           chunkFlg = EXTRACT_U_1(chunkDescPtr->chunkFlg);
+           chunkFlg = GET_U_1(chunkDescPtr->chunkFlg);

            if ((chunkFlg & SCTP_DATA_UNORDERED) == SCTP_DATA_UNORDERED)
            if ((chunkFlg & SCTP_DATA_UNORDERED) == SCTP_DATA_UNORDERED)

-             ND_PRINT((ndo, "(U)"));
+             ND_PRINT("(U)");

 
            if ((chunkFlg & SCTP_DATA_FIRST_FRAG) == SCTP_DATA_FIRST_FRAG)
 
            if ((chunkFlg & SCTP_DATA_FIRST_FRAG) == SCTP_DATA_FIRST_FRAG)

-             ND_PRINT((ndo, "(B)"));
+             ND_PRINT("(B)");

 
            if ((chunkFlg & SCTP_DATA_LAST_FRAG) == SCTP_DATA_LAST_FRAG)
 
            if ((chunkFlg & SCTP_DATA_LAST_FRAG) == SCTP_DATA_LAST_FRAG)

-             ND_PRINT((ndo, "(E)"));
+             ND_PRINT("(E)");

 
            if( ((chunkFlg & SCTP_DATA_UNORDERED) == SCTP_DATA_UNORDERED) ||
 
            if( ((chunkFlg & SCTP_DATA_UNORDERED) == SCTP_DATA_UNORDERED) ||

-               ((chunkFlg & SCTP_DATA_FIRST_FRAG) == SCTP_DATA_FIRST_FRAG) ||
+               ((chunkFlg & SCTP_DATA_FIRST_FRAG) == SCTP_DATA_FIRST_FRAG) ||

                ((chunkFlg & SCTP_DATA_LAST_FRAG) == SCTP_DATA_LAST_FRAG) )
                ((chunkFlg & SCTP_DATA_LAST_FRAG) == SCTP_DATA_LAST_FRAG) )

-             ND_PRINT((ndo, " "));
+             ND_PRINT(" ");

 
 

-           if (chunkLengthRemaining < sizeof(*dataHdrPtr)) {
-               ND_PRINT((ndo, "bogus chunk length %u]", chunkLength));
-               return;
-           }
+           ND_ICHECKMSG_ZU("chunk length", chunkLengthRemaining, <,
+                           sizeof(*dataHdrPtr));

            dataHdrPtr=(const struct sctpDataPart*)bp;
 
            dataHdrPtr=(const struct sctpDataPart*)bp;
 

-           ppid = EXTRACT_BE_U_4(&dataHdrPtr->payloadtype);
-           ND_PRINT((ndo, "[TSN: %u] ", EXTRACT_BE_U_4(&dataHdrPtr->TSN)));
-           ND_PRINT((ndo, "[SID: %u] ", EXTRACT_BE_U_2(&dataHdrPtr->streamId)));
-           ND_PRINT((ndo, "[SSEQ %u] ", EXTRACT_BE_U_2(&dataHdrPtr->sequence)));
-           ND_PRINT((ndo, "[PPID %s] ",
-                   tok2str(PayloadProto_idents, "0x%x", ppid)));
+           ppid = GET_BE_U_4(dataHdrPtr->payloadtype);
+           ND_PRINT("[TSN: %u] ", GET_BE_U_4(dataHdrPtr->TSN));
+           ND_PRINT("[SID: %u] ", GET_BE_U_2(dataHdrPtr->streamId));
+           ND_PRINT("[SSEQ %u] ", GET_BE_U_2(dataHdrPtr->sequence));
+           ND_PRINT("[PPID %s] ",
+                   tok2str(PayloadProto_idents, "0x%x", ppid));

 
            if (!isforces) {
                isforces = (ppid == SCTP_PPID_FORCES_HP) ||
 
            if (!isforces) {
                isforces = (ppid == SCTP_PPID_FORCES_HP) ||


@@ -599,27 +594,28 @@ sctp_print(netdissect_options *ndo,
            bp += sizeof(*dataHdrPtr);
            sctpPacketLengthRemaining -= sizeof(*dataHdrPtr);
            chunkLengthRemaining -= sizeof(*dataHdrPtr);
            bp += sizeof(*dataHdrPtr);
            sctpPacketLengthRemaining -= sizeof(*dataHdrPtr);
            chunkLengthRemaining -= sizeof(*dataHdrPtr);

+           ND_ICHECKMSG_U("chunk length", chunkLengthRemaining, ==, 0);

            payload_size = chunkLengthRemaining;
            payload_size = chunkLengthRemaining;

-           if (payload_size == 0) {
-               ND_PRINT((ndo, "bogus chunk length %u]", chunkLength));
-               return;
-           }

 
            if (isforces) {
                forces_print(ndo, bp, payload_size);
 
            if (isforces) {
                forces_print(ndo, bp, payload_size);

+               /* ndo_protocol reassignment after forces_print() call */
+               ndo->ndo_protocol = "sctp";

            } else if (ndo->ndo_vflag >= 2) {   /* if verbose output is specified */
                                        /* at the command line */
                switch (ppid) {
                case SCTP_PPID_M3UA :
                        m3ua_print(ndo, bp, payload_size);
            } else if (ndo->ndo_vflag >= 2) {   /* if verbose output is specified */
                                        /* at the command line */
                switch (ppid) {
                case SCTP_PPID_M3UA :
                        m3ua_print(ndo, bp, payload_size);

+                       /* ndo_protocol reassignment after m3ua_print() call */
+                       ndo->ndo_protocol = "sctp";

                        break;
                default:
                        break;
                default:

-                       ND_PRINT((ndo, "[Payload"));
+                       ND_PRINT("[Payload");

                        if (!ndo->ndo_suppress_default_print) {
                        if (!ndo->ndo_suppress_default_print) {

-                               ND_PRINT((ndo, ":"));
+                               ND_PRINT(":");

                                ND_DEFAULTPRINT(bp, payload_size);
                        }
                                ND_DEFAULTPRINT(bp, payload_size);
                        }

-                       ND_PRINT((ndo, "]"));
+                       ND_PRINT("]");

                        break;
                }
            }
                        break;
                }
            }


@@ -632,56 +628,52 @@ sctp_print(netdissect_options *ndo,
          {
            const struct sctpInitiation *init;
 
          {
            const struct sctpInitiation *init;
 

-           if (chunkLengthRemaining < sizeof(*init)) {
-               ND_PRINT((ndo, "bogus chunk length %u]", chunkLength));
-               return;
-           }
+           ND_ICHECKMSG_ZU("chunk length", chunkLengthRemaining, <,
+                           sizeof(*init));

            init=(const struct sctpInitiation*)bp;
            init=(const struct sctpInitiation*)bp;

-           ND_PRINT((ndo, "[init tag: %u] ", EXTRACT_BE_U_4(&init->initTag)));
-           ND_PRINT((ndo, "[rwnd: %u] ", EXTRACT_BE_U_4(&init->rcvWindowCredit)));
-           ND_PRINT((ndo, "[OS: %u] ", EXTRACT_BE_U_2(&init->NumPreopenStreams)));
-           ND_PRINT((ndo, "[MIS: %u] ", EXTRACT_BE_U_2(&init->MaxInboundStreams)));
-           ND_PRINT((ndo, "[init TSN: %u] ", EXTRACT_BE_U_4(&init->initialTSN)));
+           ND_PRINT("[init tag: %u] ", GET_BE_U_4(init->initTag));
+           ND_PRINT("[rwnd: %u] ", GET_BE_U_4(init->rcvWindowCredit));
+           ND_PRINT("[OS: %u] ", GET_BE_U_2(init->NumPreopenStreams));
+           ND_PRINT("[MIS: %u] ", GET_BE_U_2(init->MaxInboundStreams));
+           ND_PRINT("[init TSN: %u] ", GET_BE_U_4(init->initialTSN));

            bp += sizeof(*init);
            bp += sizeof(*init);

-           sctpPacketLengthRemaining -= sizeof(*init);
+           sctpPacketLengthRemaining -= sizeof(*init);

            chunkLengthRemaining -= sizeof(*init);
 
 #if 0 /* ALC you can add code for optional params here */
            if( chunkLengthRemaining != 0 )
            chunkLengthRemaining -= sizeof(*init);
 
 #if 0 /* ALC you can add code for optional params here */
            if( chunkLengthRemaining != 0 )

-             ND_PRINT((ndo, " @@@@@ UNFINISHED @@@@@@%s\n",
-                    "Optional params present, but not printed."));
+             ND_PRINT(" @@@@@ UNFINISHED @@@@@@%s\n",
+                    "Optional params present, but not printed.");

 #endif
 #endif

-            bp += chunkLengthRemaining;
+           bp += chunkLengthRemaining;

            sctpPacketLengthRemaining -= chunkLengthRemaining;
            sctpPacketLengthRemaining -= chunkLengthRemaining;

-            chunkLengthRemaining = 0;
+           chunkLengthRemaining = 0;

            break;
          }
        case SCTP_INITIATION_ACK :
          {
            const struct sctpInitiation *init;
 
            break;
          }
        case SCTP_INITIATION_ACK :
          {
            const struct sctpInitiation *init;
 

-           if (chunkLengthRemaining < sizeof(*init)) {
-               ND_PRINT((ndo, "bogus chunk length %u]", chunkLength));
-               return;
-           }
+           ND_ICHECKMSG_ZU("chunk length", chunkLengthRemaining, <,
+                           sizeof(*init));

            init=(const struct sctpInitiation*)bp;
            init=(const struct sctpInitiation*)bp;

-           ND_PRINT((ndo, "[init tag: %u] ", EXTRACT_BE_U_4(&init->initTag)));
-           ND_PRINT((ndo, "[rwnd: %u] ", EXTRACT_BE_U_4(&init->rcvWindowCredit)));
-           ND_PRINT((ndo, "[OS: %u] ", EXTRACT_BE_U_2(&init->NumPreopenStreams)));
-           ND_PRINT((ndo, "[MIS: %u] ", EXTRACT_BE_U_2(&init->MaxInboundStreams)));
-           ND_PRINT((ndo, "[init TSN: %u] ", EXTRACT_BE_U_4(&init->initialTSN)));
-            bp += sizeof(*init);
-            sctpPacketLengthRemaining -= sizeof(*init);
-            chunkLengthRemaining -= sizeof(*init);
+           ND_PRINT("[init tag: %u] ", GET_BE_U_4(init->initTag));
+           ND_PRINT("[rwnd: %u] ", GET_BE_U_4(init->rcvWindowCredit));
+           ND_PRINT("[OS: %u] ", GET_BE_U_2(init->NumPreopenStreams));
+           ND_PRINT("[MIS: %u] ", GET_BE_U_2(init->MaxInboundStreams));
+           ND_PRINT("[init TSN: %u] ", GET_BE_U_4(init->initialTSN));
+           bp += sizeof(*init);
+           sctpPacketLengthRemaining -= sizeof(*init);
+           chunkLengthRemaining -= sizeof(*init);

 
 #if 0 /* ALC you can add code for optional params here */
            if( chunkLengthRemaining != 0 )
 
 #if 0 /* ALC you can add code for optional params here */
            if( chunkLengthRemaining != 0 )

-             ND_PRINT((ndo, " @@@@@ UNFINISHED @@@@@@%s\n",
-                    "Optional params present, but not printed."));
+             ND_PRINT(" @@@@@ UNFINISHED @@@@@@%s\n",
+                    "Optional params present, but not printed.");

 #endif
 #endif

-            bp += chunkLengthRemaining;
+           bp += chunkLengthRemaining;

            sctpPacketLengthRemaining -= chunkLengthRemaining;
            sctpPacketLengthRemaining -= chunkLengthRemaining;

-            chunkLengthRemaining = 0;
+           chunkLengthRemaining = 0;

            break;
          }
        case SCTP_SELECTIVE_ACK:
            break;
          }
        case SCTP_SELECTIVE_ACK:


@@ -691,54 +683,47 @@ sctp_print(netdissect_options *ndo,
            u_int fragNo, tsnNo;
            const u_char *dupTSN;
 
            u_int fragNo, tsnNo;
            const u_char *dupTSN;
 

-           if (chunkLengthRemaining < sizeof(*sack)) {
-             ND_PRINT((ndo, "bogus chunk length %u]", chunkLength));
-             return;
-           }
+           ND_ICHECKMSG_ZU("chunk length", chunkLengthRemaining, <,
+                           sizeof(*sack));

            sack=(const struct sctpSelectiveAck*)bp;
            sack=(const struct sctpSelectiveAck*)bp;

-           ND_PRINT((ndo, "[cum ack %u] ", EXTRACT_BE_U_4(&sack->highestConseqTSN)));
-           ND_PRINT((ndo, "[a_rwnd %u] ", EXTRACT_BE_U_4(&sack->updatedRwnd)));
-           ND_PRINT((ndo, "[#gap acks %u] ", EXTRACT_BE_U_2(&sack->numberOfdesc)));
-           ND_PRINT((ndo, "[#dup tsns %u] ", EXTRACT_BE_U_2(&sack->numDupTsns)));
-            bp += sizeof(*sack);
+           ND_PRINT("[cum ack %u] ", GET_BE_U_4(sack->highestConseqTSN));
+           ND_PRINT("[a_rwnd %u] ", GET_BE_U_4(sack->updatedRwnd));
+           ND_PRINT("[#gap acks %u] ", GET_BE_U_2(sack->numberOfdesc));
+           ND_PRINT("[#dup tsns %u] ", GET_BE_U_2(sack->numDupTsns));
+           bp += sizeof(*sack);

            sctpPacketLengthRemaining -= sizeof(*sack);
            sctpPacketLengthRemaining -= sizeof(*sack);

-            chunkLengthRemaining -= sizeof(*sack);
+           chunkLengthRemaining -= sizeof(*sack);

 
 
            /* print gaps */
            for (fragNo=0;
 
 
            /* print gaps */
            for (fragNo=0;

-                chunkLengthRemaining != 0 && fragNo < EXTRACT_BE_U_2(&sack->numberOfdesc);
+                chunkLengthRemaining != 0 && fragNo < GET_BE_U_2(sack->numberOfdesc);

                 bp += sizeof(*frag), sctpPacketLengthRemaining -= sizeof(*frag), chunkLengthRemaining -= sizeof(*frag), fragNo++) {
                 bp += sizeof(*frag), sctpPacketLengthRemaining -= sizeof(*frag), chunkLengthRemaining -= sizeof(*frag), fragNo++) {

-             if (chunkLengthRemaining < sizeof(*frag)) {
-               ND_PRINT((ndo, "bogus chunk length %u]", chunkLength));
-               return;
-             }
+             ND_ICHECKMSG_ZU("chunk length", chunkLengthRemaining, <,
+                           sizeof(*frag));

              frag = (const struct sctpSelectiveFrag *)bp;
              frag = (const struct sctpSelectiveFrag *)bp;

-             ND_PRINT((ndo, "\n\t\t[gap ack block #%u: start = %u, end = %u] ",
+             ND_PRINT("\n\t\t[gap ack block #%u: start = %u, end = %u] ",

                     fragNo+1,
                     fragNo+1,

-                    EXTRACT_BE_U_4(&sack->highestConseqTSN) + EXTRACT_BE_U_2(&frag->fragmentStart),
-                    EXTRACT_BE_U_4(&sack->highestConseqTSN) + EXTRACT_BE_U_2(&frag->fragmentEnd)));
+                    GET_BE_U_4(sack->highestConseqTSN) + GET_BE_U_2(frag->fragmentStart),
+                    GET_BE_U_4(sack->highestConseqTSN) + GET_BE_U_2(frag->fragmentEnd));

            }
 
            /* print duplicate TSNs */
            for (tsnNo=0;
            }
 
            /* print duplicate TSNs */
            for (tsnNo=0;

-                chunkLengthRemaining != 0 && tsnNo<EXTRACT_BE_U_2(&sack->numDupTsns);
+                chunkLengthRemaining != 0 && tsnNo<GET_BE_U_2(sack->numDupTsns);

                 bp += 4, sctpPacketLengthRemaining -= 4, chunkLengthRemaining -= 4, tsnNo++) {
                 bp += 4, sctpPacketLengthRemaining -= 4, chunkLengthRemaining -= 4, tsnNo++) {

-             if (chunkLengthRemaining < 4) {
-               ND_PRINT((ndo, "bogus chunk length %u]", chunkLength));
-               return;
-             }
-              dupTSN = (const u_char *)bp;
-             ND_PRINT((ndo, "\n\t\t[dup TSN #%u: %u] ", tsnNo+1,
-               EXTRACT_BE_U_4(dupTSN)));
+             ND_ICHECKMSG_U("chunk length", chunkLengthRemaining, <, 4);
+             dupTSN = (const u_char *)bp;
+             ND_PRINT("\n\t\t[dup TSN #%u: %u] ", tsnNo+1,
+                      GET_BE_U_4(dupTSN));

            }
            break;
          }
        default :
          {
            }
            break;
          }
        default :
          {

-            bp += chunkLengthRemaining;
-            sctpPacketLengthRemaining -= chunkLengthRemaining;
-            chunkLengthRemaining = 0;
+           bp += chunkLengthRemaining;
+           sctpPacketLengthRemaining -= chunkLengthRemaining;
+           chunkLengthRemaining = 0;

            break;
          }
        }
            break;
          }
        }


@@ -751,7 +736,7 @@ sctp_print(netdissect_options *ndo,
       sctpPacketLengthRemaining -= chunkLengthRemaining;
 
       if (ndo->ndo_vflag < 2)
       sctpPacketLengthRemaining -= chunkLengthRemaining;
 
       if (ndo->ndo_vflag < 2)

-        sep = ", (";
+       sep = ", (";

 
       if (align != 0) {
        /*
 
       if (align != 0) {
        /*


@@ -764,7 +749,6 @@ sctp_print(netdissect_options *ndo,
       }
     }
     return;
       }
     }
     return;

-
-trunc:
-    ND_PRINT((ndo, "[|sctp]"));
+invalid:
+    nd_print_invalid(ndo);

 }
 }