X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/61857ddd22ca4c313f0c4a08217aae723fa914f2..296d466cd6bbf2f7e75e15bb6a01268e88c76ed0:/print-sctp.c diff --git a/print-sctp.c b/print-sctp.c index 519cf518..e49fc41f 100644 --- a/print-sctp.c +++ b/print-sctp.c @@ -35,9 +35,7 @@ /* \summary: Stream Control Transmission Protocol (SCTP) printer */ -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" @@ -293,7 +291,7 @@ struct sctpUnifiedAbortHeavy{ }; /* For the graceful shutdown we must carry - * the tag (in common header) and the highest consequitive acking value + * the tag (in common header) and the highest consecutive acking value */ struct sctpShutdown { nd_uint32_t TSN_Seen; @@ -467,16 +465,16 @@ sctp_print(netdissect_options *ndo, ndo->ndo_protocol = "sctp"; if (sctpPacketLength < sizeof(struct sctpHeader)) { - ND_PRINT("truncated-sctp - %ld bytes missing!", - (long)(sizeof(struct sctpHeader) - sctpPacketLength)); + ND_PRINT("truncated-sctp - %zu bytes missing!", + sizeof(struct sctpHeader) - sctpPacketLength); return; } sctpPktHdr = (const struct sctpHeader*) bp; 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) @@ -486,16 +484,15 @@ sctp_print(netdissect_options *ndo, if (ip6) { ND_PRINT("%s.%u > %s.%u: sctp", - ip6addr_string(ndo, ip6->ip6_src), + GET_IP6ADDR_STRING(ip6->ip6_src), sourcePort, - ip6addr_string(ndo, ip6->ip6_dst), + GET_IP6ADDR_STRING(ip6->ip6_dst), destPort); - } else - { + } else { ND_PRINT("%s.%u > %s.%u: sctp", - ipaddr_string(ndo, ip->ip_src), + GET_IPADDR_STRING(ip->ip_src), sourcePort, - ipaddr_string(ndo, ip->ip_dst), + GET_IPADDR_STRING(ip->ip_dst), destPort); } @@ -529,7 +526,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,19 +549,18 @@ 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) - { + switch (chunkID) { case SCTP_DATA : { 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 +581,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)); @@ -643,11 +639,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); @@ -671,11 +667,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); @@ -702,10 +698,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); @@ -713,7 +709,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); @@ -722,13 +718,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 && tsnNonumDupTsns); + chunkLengthRemaining != 0 && tsnNonumDupTsns); bp += 4, sctpPacketLengthRemaining -= 4, chunkLengthRemaining -= 4, tsnNo++) { if (chunkLengthRemaining < 4) { ND_PRINT("bogus chunk length %u]", chunkLength); @@ -736,7 +732,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; }