Revert partially the commit 21b1273

[tcpdump] / print-sctp.c

diff --git a/print-sctp.c b/print-sctp.c
index 19ffd74b40951b0f8882f6f58eaab630c39c5198..9384a93d2847db82f76e468291ccea278471c8bf 100644 (file)
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -449,9 +449,9 @@ 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)  /* ip packet */

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


@@ -475,8 +475,8 @@ sctp_print(netdissect_options *ndo,
   ND_TCHECK_SIZE(sctpPktHdr);
   sctpPacketLengthRemaining = sctpPacketLength;
 
   ND_TCHECK_SIZE(sctpPktHdr);
   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)


@@ -500,12 +500,12 @@ sctp_print(netdissect_options *ndo,
   }
 
   if (isForCES_port(sourcePort)) {
   }
 
   if (isForCES_port(sourcePort)) {

-         ND_PRINT("[%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("[%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);


@@ -525,14 +525,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("%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_SIZE(chunkDescPtr);
       }
       ND_TCHECK_SIZE(chunkDescPtr);

-      chunkLength = EXTRACT_BE_U_2(chunkDescPtr->chunkLength);
+      chunkLength = GET_BE_U_2(chunkDescPtr->chunkLength);

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

-        ND_PRINT("%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;
 


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

-        ND_PRINT("%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);


@@ -552,9 +552,9 @@ sctp_print(netdissect_options *ndo,
       chunkLengthRemaining -= sizeof(*chunkDescPtr);
 
       ND_PRINT("%s%u) ", sep, chunkCount+1);
       chunkLengthRemaining -= sizeof(*chunkDescPtr);
 
       ND_PRINT("%s%u) ", sep, chunkCount+1);

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

       ND_PRINT("[%s] ", tok2str(sctp_chunkid_str, "Unknown chunk type: 0x%x",
       ND_PRINT("[%s] ", tok2str(sctp_chunkid_str, "Unknown chunk type: 0x%x",

-                                      chunkID));
+              chunkID));

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


@@ -562,9 +562,9 @@ 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)
              ND_PRINT("(U)");
 
            if ((chunkFlg & SCTP_DATA_UNORDERED) == SCTP_DATA_UNORDERED)
              ND_PRINT("(U)");
 


@@ -575,7 +575,7 @@ sctp_print(netdissect_options *ndo,
              ND_PRINT("(E)");
 
            if( ((chunkFlg & SCTP_DATA_UNORDERED) == SCTP_DATA_UNORDERED) ||
              ND_PRINT("(E)");
 
            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) )
              ND_PRINT(" ");
 
                ((chunkFlg & SCTP_DATA_LAST_FRAG) == SCTP_DATA_LAST_FRAG) )
              ND_PRINT(" ");
 


@@ -585,10 +585,10 @@ sctp_print(netdissect_options *ndo,
            }
            dataHdrPtr=(const struct sctpDataPart*)bp;
 
            }
            dataHdrPtr=(const struct sctpDataPart*)bp;
 

-           ppid = EXTRACT_BE_U_4(dataHdrPtr->payloadtype);
-           ND_PRINT("[TSN: %u] ", EXTRACT_BE_U_4(dataHdrPtr->TSN));
-           ND_PRINT("[SID: %u] ", EXTRACT_BE_U_2(dataHdrPtr->streamId));
-           ND_PRINT("[SSEQ %u] ", EXTRACT_BE_U_2(dataHdrPtr->sequence));
+           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));
 
            ND_PRINT("[PPID %s] ",
                    tok2str(PayloadProto_idents, "0x%x", ppid));
 


@@ -609,11 +609,15 @@ sctp_print(netdissect_options *ndo,
 
            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:
                        ND_PRINT("[Payload");
                        break;
                default:
                        ND_PRINT("[Payload");


@@ -639,13 +643,13 @@ sctp_print(netdissect_options *ndo,
                return;
            }
            init=(const struct sctpInitiation*)bp;
                return;
            }
            init=(const struct sctpInitiation*)bp;

-           ND_PRINT("[init tag: %u] ", EXTRACT_BE_U_4(init->initTag));
-           ND_PRINT("[rwnd: %u] ", EXTRACT_BE_U_4(init->rcvWindowCredit));
-           ND_PRINT("[OS: %u] ", EXTRACT_BE_U_2(init->NumPreopenStreams));
-           ND_PRINT("[MIS: %u] ", EXTRACT_BE_U_2(init->MaxInboundStreams));
-           ND_PRINT("[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 */
            chunkLengthRemaining -= sizeof(*init);
 
 #if 0 /* ALC you can add code for optional params here */


@@ -653,9 +657,9 @@ sctp_print(netdissect_options *ndo,
              ND_PRINT(" @@@@@ UNFINISHED @@@@@@%s\n",
                     "Optional params present, but not printed.");
 #endif
              ND_PRINT(" @@@@@ UNFINISHED @@@@@@%s\n",
                     "Optional params present, but not printed.");
 #endif

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

            sctpPacketLengthRemaining -= chunkLengthRemaining;
            sctpPacketLengthRemaining -= chunkLengthRemaining;

-            chunkLengthRemaining = 0;
+           chunkLengthRemaining = 0;

            break;
          }
        case SCTP_INITIATION_ACK :
            break;
          }
        case SCTP_INITIATION_ACK :


@@ -667,23 +671,23 @@ sctp_print(netdissect_options *ndo,
                return;
            }
            init=(const struct sctpInitiation*)bp;
                return;
            }
            init=(const struct sctpInitiation*)bp;

-           ND_PRINT("[init tag: %u] ", EXTRACT_BE_U_4(init->initTag));
-           ND_PRINT("[rwnd: %u] ", EXTRACT_BE_U_4(init->rcvWindowCredit));
-           ND_PRINT("[OS: %u] ", EXTRACT_BE_U_2(init->NumPreopenStreams));
-           ND_PRINT("[MIS: %u] ", EXTRACT_BE_U_2(init->MaxInboundStreams));
-           ND_PRINT("[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 )
              ND_PRINT(" @@@@@ UNFINISHED @@@@@@%s\n",
                     "Optional params present, but not printed.");
 #endif
 
 #if 0 /* ALC you can add code for optional params here */
            if( chunkLengthRemaining != 0 )
              ND_PRINT(" @@@@@ UNFINISHED @@@@@@%s\n",
                     "Optional params present, but not printed.");
 #endif

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

            sctpPacketLengthRemaining -= chunkLengthRemaining;
            sctpPacketLengthRemaining -= chunkLengthRemaining;

-            chunkLengthRemaining = 0;
+           chunkLengthRemaining = 0;

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


@@ -698,18 +702,18 @@ sctp_print(netdissect_options *ndo,
              return;
            }
            sack=(const struct sctpSelectiveAck*)bp;
              return;
            }
            sack=(const struct sctpSelectiveAck*)bp;

-           ND_PRINT("[cum ack %u] ", EXTRACT_BE_U_4(sack->highestConseqTSN));
-           ND_PRINT("[a_rwnd %u] ", EXTRACT_BE_U_4(sack->updatedRwnd));
-           ND_PRINT("[#gap acks %u] ", EXTRACT_BE_U_2(sack->numberOfdesc));
-           ND_PRINT("[#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++) {
              if (chunkLengthRemaining < sizeof(*frag)) {
                ND_PRINT("bogus chunk length %u]", chunkLength);
                 bp += sizeof(*frag), sctpPacketLengthRemaining -= sizeof(*frag), chunkLengthRemaining -= sizeof(*frag), fragNo++) {
              if (chunkLengthRemaining < sizeof(*frag)) {
                ND_PRINT("bogus chunk length %u]", chunkLength);


@@ -718,29 +722,29 @@ sctp_print(netdissect_options *ndo,
              frag = (const struct sctpSelectiveFrag *)bp;
              ND_PRINT("\n\t\t[gap ack block #%u: start = %u, end = %u] ",
                     fragNo+1,
              frag = (const struct sctpSelectiveFrag *)bp;
              ND_PRINT("\n\t\t[gap ack block #%u: start = %u, end = %u] ",
                     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++) {
              if (chunkLengthRemaining < 4) {
                ND_PRINT("bogus chunk length %u]", chunkLength);
                return;
              }
                 bp += 4, sctpPacketLengthRemaining -= 4, chunkLengthRemaining -= 4, tsnNo++) {
              if (chunkLengthRemaining < 4) {
                ND_PRINT("bogus chunk length %u]", chunkLength);
                return;
              }

-              dupTSN = (const u_char *)bp;
+             dupTSN = (const u_char *)bp;

              ND_PRINT("\n\t\t[dup TSN #%u: %u] ", tsnNo+1,
              ND_PRINT("\n\t\t[dup TSN #%u: %u] ", tsnNo+1,

-               EXTRACT_BE_U_4(dupTSN));
+                      GET_BE_U_4(dupTSN));

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

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

            break;
          }
        }
            break;
          }
        }


@@ -753,7 +757,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) {
        /*