Revert partially the commit 21b1273

[tcpdump] / print-sctp.c

diff --git a/print-sctp.c b/print-sctp.c
index d8db2d82e51e96c6a047f54a6a5cb3aabad12781..9384a93d2847db82f76e468291ccea278471c8bf 100644 (file)
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -475,8 +475,8 @@ sctp_print(netdissect_options *ndo,
   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)
@@ -529,7 +529,7 @@ sctp_print(netdissect_options *ndo,
        break;
       }
       ND_TCHECK_SIZE(chunkDescPtr);
-      chunkLength = EXTRACT_BE_U_2(chunkDescPtr->chunkLength);
+      chunkLength = GET_BE_U_2(chunkDescPtr->chunkLength);
       if (chunkLength < sizeof(*chunkDescPtr)) {
        ND_PRINT("%s%u) [Bad chunk length %u, < size of chunk descriptor]", sep, chunkCount+1, chunkLength);
        break;
@@ -552,7 +552,7 @@ sctp_print(netdissect_options *ndo,
       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",
               chunkID));
       switch (chunkID)
@@ -562,9 +562,9 @@ sctp_print(netdissect_options *ndo,
            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)");
 
@@ -585,10 +585,10 @@ sctp_print(netdissect_options *ndo,
            }
            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));
 
@@ -609,11 +609,15 @@ sctp_print(netdissect_options *ndo,
 
            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);
+                       /* ndo_protocol reassignment after m3ua_print() call */
+                       ndo->ndo_protocol = "sctp";
                        break;
                default:
                        ND_PRINT("[Payload");
@@ -639,11 +643,11 @@ sctp_print(netdissect_options *ndo,
                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);
            sctpPacketLengthRemaining -= sizeof(*init);
            chunkLengthRemaining -= sizeof(*init);
@@ -667,11 +671,11 @@ sctp_print(netdissect_options *ndo,
                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);
            sctpPacketLengthRemaining -= sizeof(*init);
            chunkLengthRemaining -= sizeof(*init);
@@ -698,10 +702,10 @@ sctp_print(netdissect_options *ndo,
              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));
+           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);
            chunkLengthRemaining -= sizeof(*sack);
@@ -709,7 +713,7 @@ sctp_print(netdissect_options *ndo,
 
            /* 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);
@@ -718,13 +722,13 @@ 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,
-                    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;
-                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);
@@ -732,7 +736,7 @@ sctp_print(netdissect_options *ndo,
              }
              dupTSN = (const u_char *)bp;
              ND_PRINT("\n\t\t[dup TSN #%u: %u] ", tsnNo+1,
-                      EXTRACT_BE_U_4(dupTSN));
+                      GET_BE_U_4(dupTSN));
            }
            break;
          }