X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ad7a38341c19e71e3595c17368ac18f08b71482d..refs/pull/433/head:/print-sctp.c diff --git a/print-sctp.c b/print-sctp.c index 171e9fc9..4b595f2e 100644 --- a/print-sctp.c +++ b/print-sctp.c @@ -33,22 +33,13 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] _U_ = -"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.21 2007-09-13 18:03:49 guy Exp $ (NETLAB/PEL)"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include - -#include -#include - #include "interface.h" #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ @@ -124,6 +115,28 @@ static const char rcsid[] _U_ = #define SCTP_RELIABLE_CNTL 0xc1 #define SCTP_RELIABLE_CNTL_ACK 0xc2 +static const struct tok sctp_chunkid_str[] = { + { SCTP_DATA, "DATA" }, + { SCTP_INITIATION, "INIT" }, + { SCTP_INITIATION_ACK, "INIT ACK" }, + { SCTP_SELECTIVE_ACK, "SACK" }, + { SCTP_HEARTBEAT_REQUEST, "HB REQ" }, + { SCTP_HEARTBEAT_ACK, "HB ACK" }, + { SCTP_ABORT_ASSOCIATION, "ABORT" }, + { SCTP_SHUTDOWN, "SHUTDOWN" }, + { SCTP_SHUTDOWN_ACK, "SHUTDOWN ACK" }, + { SCTP_OPERATION_ERR, "OP ERR" }, + { SCTP_COOKIE_ECHO, "COOKIE ECHO" }, + { SCTP_COOKIE_ACK, "COOKIE ACK" }, + { SCTP_ECN_ECHO, "ECN ECHO" }, + { SCTP_ECN_CWR, "ECN CWR" }, + { SCTP_SHUTDOWN_COMPLETE, "SHUTDOWN COMPLETE" }, + { SCTP_FORWARD_CUM_TSN, "FOR CUM TSN" }, + { SCTP_RELIABLE_CNTL, "REL CTRL" }, + { SCTP_RELIABLE_CNTL_ACK, "REL CTRL ACK" }, + { 0, NULL } +}; + /* Data Chuck Specific Flags */ #define SCTP_DATA_FRAG_MASK 0x03 #define SCTP_DATA_MIDDLE_FRAG 0x00 @@ -141,36 +154,36 @@ static const char rcsid[] _U_ = /* the sctp common header */ struct sctpHeader{ - u_int16_t source; - u_int16_t destination; - u_int32_t verificationTag; - u_int32_t adler32; + uint16_t source; + uint16_t destination; + uint32_t verificationTag; + uint32_t adler32; }; /* various descriptor parsers */ struct sctpChunkDesc{ - u_int8_t chunkID; - u_int8_t chunkFlg; - u_int16_t chunkLength; + uint8_t chunkID; + uint8_t chunkFlg; + uint16_t chunkLength; }; struct sctpParamDesc{ - u_int16_t paramType; - u_int16_t paramLength; + uint16_t paramType; + uint16_t paramLength; }; struct sctpRelChunkDesc{ struct sctpChunkDesc chk; - u_int32_t serialNumber; + uint32_t serialNumber; }; struct sctpVendorSpecificParam { struct sctpParamDesc p; /* type must be 0xfffe */ - u_int32_t vendorId; /* vendor ID from RFC 1700 */ - u_int16_t vendorSpecificType; - u_int16_t vendorSpecificLen; + uint32_t vendorId; /* vendor ID from RFC 1700 */ + uint16_t vendorSpecificType; + uint16_t vendorSpecificLen; }; @@ -182,53 +195,53 @@ struct sctpVendorSpecificParam { /* this is used for init ack, too */ struct sctpInitiation{ - 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; + uint32_t initTag; /* tag of mine */ + uint32_t rcvWindowCredit; /* rwnd */ + uint16_t NumPreopenStreams; /* OS */ + uint16_t MaxInboundStreams; /* MIS */ + uint32_t initialTSN; /* optional param's follow in sctpParamDesc form */ }; struct sctpV4IpAddress{ struct sctpParamDesc p; /* type is set to SCTP_IPV4_PARAM_TYPE, len=10 */ - u_int32_t ipAddress; + uint32_t ipAddress; }; struct sctpV6IpAddress{ struct sctpParamDesc p; /* type is set to SCTP_IPV6_PARAM_TYPE, len=22 */ - u_int8_t ipAddress[16]; + uint8_t ipAddress[16]; }; struct sctpDNSName{ struct sctpParamDesc param; - u_int8_t name[1]; + uint8_t name[1]; }; struct sctpCookiePreserve{ struct sctpParamDesc p; /* type is set to SCTP_COOKIE_PRESERVE, len=8 */ - u_int32_t extraTime; + uint32_t extraTime; }; struct sctpTimeStamp{ - u_int32_t ts_sec; - u_int32_t ts_usec; + uint32_t ts_sec; + uint32_t ts_usec; }; /* wire structure of my cookie */ struct cookieMessage{ - u_int32_t TieTag_curTag; /* copied from assoc if present */ - u_int32_t TieTag_hisTag; /* copied from assoc if present */ + uint32_t TieTag_curTag; /* copied from assoc if present */ + uint32_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 */ - u_int32_t addressWhereISent[4]; /* I make this 4 ints so I get 128bits for future */ + uint32_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 */ + uint16_t locScope; /* V6 local scope flag */ + uint16_t siteScope; /* V6 site scope flag */ /* at the end is tacked on the INIT chunk sent in * its entirety and of course our * signature. @@ -260,15 +273,15 @@ struct sctpSendableInit{ */ struct sctpSelectiveAck{ - u_int32_t highestConseqTSN; - u_int32_t updatedRwnd; - u_int16_t numberOfdesc; - u_int16_t numDupTsns; + uint32_t highestConseqTSN; + uint32_t updatedRwnd; + uint16_t numberOfdesc; + uint16_t numDupTsns; }; struct sctpSelectiveFrag{ - u_int16_t fragmentStart; - u_int16_t fragmentEnd; + uint16_t fragmentStart; + uint16_t fragmentEnd; }; @@ -282,8 +295,8 @@ struct sctpUnifiedSack{ */ struct sctpHBrequest { - u_int32_t time_value_1; - u_int32_t time_value_2; + uint32_t time_value_1; + uint32_t time_value_2; }; /* here is what I read and respond with to. */ @@ -299,7 +312,7 @@ struct sctpHBsender{ struct sctpParamDesc hb; struct sctpHBrequest rtt; int8_t addrFmt[SCTP_ADDRMAX]; - u_int16_t userreq; + uint16_t userreq; }; @@ -320,15 +333,15 @@ struct sctpUnifiedAbortLight{ struct sctpUnifiedAbortHeavy{ struct sctpHeader mh; struct sctpChunkDesc uh; - u_int16_t causeCode; - u_int16_t causeLen; + uint16_t causeCode; + uint16_t causeLen; }; /* For the graceful shutdown we must carry * the tag (in common header) and the highest consequitive acking value */ struct sctpShutdown { - u_int32_t TSN_Seen; + uint32_t TSN_Seen; }; struct sctpUnifiedShutdown{ @@ -341,8 +354,8 @@ struct sctpUnifiedShutdown{ * that is defined as a operation error. */ struct sctpOpErrorCause{ - u_int16_t cause; - u_int16_t causeLen; + uint16_t cause; + uint16_t causeLen; }; struct sctpUnifiedOpError{ @@ -354,15 +367,15 @@ struct sctpUnifiedStreamError{ struct sctpHeader mh; struct sctpChunkDesc uh; struct sctpOpErrorCause c; - u_int16_t strmNum; - u_int16_t reserved; + uint16_t strmNum; + uint16_t reserved; }; struct staleCookieMsg{ struct sctpHeader mh; struct sctpChunkDesc uh; struct sctpOpErrorCause c; - u_int32_t moretime; + uint32_t moretime; }; /* the following is used in all sends @@ -375,10 +388,10 @@ struct sctpUnifiedSingleMsg{ }; struct sctpDataPart{ - u_int32_t TSN; - u_int16_t streamId; - u_int16_t sequence; - u_int32_t payloadtype; + uint32_t TSN; + uint16_t streamId; + uint16_t sequence; + uint32_t payloadtype; }; struct sctpUnifiedDatagram{ @@ -388,13 +401,13 @@ struct sctpUnifiedDatagram{ struct sctpECN_echo{ struct sctpChunkDesc uh; - u_int32_t Lowest_TSN; + uint32_t Lowest_TSN; }; struct sctpCWR{ struct sctpChunkDesc uh; - u_int32_t TSN_reduced_at; + uint32_t TSN_reduced_at; }; static const struct tok ForCES_channels[] = { @@ -404,6 +417,68 @@ static const struct tok ForCES_channels[] = { { 0, NULL } }; +/* data chunk's payload protocol identifiers */ + +#define SCTP_PPID_IUA 1 +#define SCTP_PPID_M2UA 2 +#define SCTP_PPID_M3UA 3 +#define SCTP_PPID_SUA 4 +#define SCTP_PPID_M2PA 5 +#define SCTP_PPID_V5UA 6 +#define SCTP_PPID_H248 7 +#define SCTP_PPID_BICC 8 +#define SCTP_PPID_TALI 9 +#define SCTP_PPID_DUA 10 +#define SCTP_PPID_ASAP 11 +#define SCTP_PPID_ENRP 12 +#define SCTP_PPID_H323 13 +#define SCTP_PPID_QIPC 14 +#define SCTP_PPID_SIMCO 15 +#define SCTP_PPID_DDPSC 16 +#define SCTP_PPID_DDPSSC 17 +#define SCTP_PPID_S1AP 18 +#define SCTP_PPID_RUA 19 +#define SCTP_PPID_HNBAP 20 +#define SCTP_PPID_FORCES_HP 21 +#define SCTP_PPID_FORCES_MP 22 +#define SCTP_PPID_FORCES_LP 23 +#define SCTP_PPID_SBC_AP 24 +#define SCTP_PPID_NBAP 25 +/* 26 */ +#define SCTP_PPID_X2AP 27 + +static const struct tok PayloadProto_idents[] = { + { SCTP_PPID_IUA, "ISDN Q.921" }, + { SCTP_PPID_M2UA, "M2UA" }, + { SCTP_PPID_M3UA, "M3UA" }, + { SCTP_PPID_SUA, "SUA" }, + { SCTP_PPID_M2PA, "M2PA" }, + { SCTP_PPID_V5UA, "V5.2" }, + { SCTP_PPID_H248, "H.248" }, + { SCTP_PPID_BICC, "BICC" }, + { SCTP_PPID_TALI, "TALI" }, + { SCTP_PPID_DUA, "DUA" }, + { SCTP_PPID_ASAP, "ASAP" }, + { SCTP_PPID_ENRP, "ENRP" }, + { SCTP_PPID_H323, "H.323" }, + { SCTP_PPID_QIPC, "Q.IPC" }, + { SCTP_PPID_SIMCO, "SIMCO" }, + { SCTP_PPID_DDPSC, "DDPSC" }, + { SCTP_PPID_DDPSSC, "DDPSSC" }, + { SCTP_PPID_S1AP, "S1AP" }, + { SCTP_PPID_RUA, "RUA" }, + { SCTP_PPID_HNBAP, "HNBAP" }, + { SCTP_PPID_FORCES_HP, "ForCES HP" }, + { SCTP_PPID_FORCES_MP, "ForCES MP" }, + { SCTP_PPID_FORCES_LP, "ForCES LP" }, + { SCTP_PPID_SBC_AP, "SBc-AP" }, + { SCTP_PPID_NBAP, "NBAP" }, + /* 26 */ + { SCTP_PPID_X2AP, "X2AP" }, + { 0, NULL } +}; + + static inline int isForCES_port(u_short Port) { if (Port == CHAN_HP) @@ -416,9 +491,10 @@ static inline int isForCES_port(u_short Port) return 0; } -void sctp_print(const u_char *bp, /* beginning of sctp packet */ - const u_char *bp2, /* beginning of enclosing */ - u_int sctpPacketLength) /* ip packet */ +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 struct sctpHeader *sctpPktHdr; const struct ip *ip; @@ -437,8 +513,8 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ sctpPktHdr = (const struct sctpHeader*) bp; endPacketPtr = (const u_char*)sctpPktHdr+sctpPacketLength; - if( (u_long) endPacketPtr > (u_long) snapend) - endPacketPtr = (const void *) snapend; + if( (u_long) endPacketPtr > (u_long) ndo->ndo_snapend) + endPacketPtr = (const void *) ndo->ndo_snapend; ip = (struct ip *)bp2; #ifdef INET6 if (IP_V(ip) == 6) @@ -446,12 +522,12 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ else ip6 = NULL; #endif /*INET6*/ - TCHECK(*sctpPktHdr); + ND_TCHECK(*sctpPktHdr); if (sctpPacketLength < sizeof(struct sctpHeader)) { - (void)printf("truncated-sctp - %ld bytes missing!", - (long)sctpPacketLength-sizeof(struct sctpHeader)); + ND_PRINT((ndo, "truncated-sctp - %ld bytes missing!", + (long)sctpPacketLength-sizeof(struct sctpHeader))); return; } @@ -463,32 +539,31 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ #ifdef INET6 if (ip6) { - (void)printf("%s.%d > %s.%d: sctp", - ip6addr_string(&ip6->ip6_src), + ND_PRINT((ndo, "%s.%d > %s.%d: sctp", + ip6addr_string(ndo, &ip6->ip6_src), sourcePort, - ip6addr_string(&ip6->ip6_dst), - destPort); + ip6addr_string(ndo, &ip6->ip6_dst), + destPort)); } else #endif /*INET6*/ { - (void)printf("%s.%d > %s.%d: sctp", - ipaddr_string(&ip->ip_src), + ND_PRINT((ndo, "%s.%d > %s.%d: sctp", + ipaddr_string(ndo, &ip->ip_src), sourcePort, - ipaddr_string(&ip->ip_dst), - destPort); + ipaddr_string(ndo, &ip->ip_dst), + destPort)); } - fflush(stdout); if (isForCES_port(sourcePort)) { - printf("[%s]", tok2str(ForCES_channels, NULL, sourcePort)); + ND_PRINT((ndo, "[%s]", tok2str(ForCES_channels, NULL, sourcePort))); isforces = 1; } if (isForCES_port(destPort)) { - printf("[%s]", tok2str(ForCES_channels, NULL, destPort)); + ND_PRINT((ndo, "[%s]", tok2str(ForCES_channels, NULL, destPort))); isforces = 1; } - if (vflag >= 2) + if (ndo->ndo_vflag >= 2) sep = "\n\t"; else sep = " ("; @@ -503,18 +578,18 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ chunkDescPtr = (const struct sctpChunkDesc *) nextChunk, chunkCount++) { - u_int16_t chunkLength; + uint16_t chunkLength; const u_char *chunkEnd; - u_int16_t align; + uint16_t align; - TCHECK(*chunkDescPtr); + ND_TCHECK(*chunkDescPtr); chunkLength = EXTRACT_16BITS(&chunkDescPtr->chunkLength); if (chunkLength < sizeof(*chunkDescPtr)) { - printf("%s%d) [Bad chunk length %u]", sep, chunkCount+1, chunkLength); - break; + ND_PRINT((ndo, "%s%d) [Bad chunk length %u]", sep, chunkCount+1, chunkLength)); + break; } - TCHECK2(*((u_int8_t *)chunkDescPtr), chunkLength); + ND_TCHECK2(*((uint8_t *)chunkDescPtr), chunkLength); chunkEnd = ((const u_char*)chunkDescPtr + chunkLength); align=chunkLength % 4; @@ -523,26 +598,29 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ nextChunk = (const void *) (chunkEnd + align); - printf("%s%d) ", sep, chunkCount+1); + ND_PRINT((ndo, "%s%d) ", sep, chunkCount+1)); + ND_PRINT((ndo, "[%s] ", tok2str(sctp_chunkid_str, "Unknown chunk type: 0x%x", + chunkDescPtr->chunkID))); switch (chunkDescPtr->chunkID) { case SCTP_DATA : { const struct sctpDataPart *dataHdrPtr; - - printf("[DATA] "); + uint32_t ppid; + const u_char *payloadPtr; + u_int payload_size; if ((chunkDescPtr->chunkFlg & SCTP_DATA_UNORDERED) == SCTP_DATA_UNORDERED) - printf("(U)"); + ND_PRINT((ndo, "(U)")); if ((chunkDescPtr->chunkFlg & SCTP_DATA_FIRST_FRAG) == SCTP_DATA_FIRST_FRAG) - printf("(B)"); + ND_PRINT((ndo, "(B)")); if ((chunkDescPtr->chunkFlg & SCTP_DATA_LAST_FRAG) == SCTP_DATA_LAST_FRAG) - printf("(E)"); + ND_PRINT((ndo, "(E)")); if( ((chunkDescPtr->chunkFlg & SCTP_DATA_UNORDERED) == SCTP_DATA_UNORDERED) @@ -552,72 +630,68 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ || ((chunkDescPtr->chunkFlg & SCTP_DATA_LAST_FRAG) == SCTP_DATA_LAST_FRAG) ) - printf(" "); + ND_PRINT((ndo, " ")); dataHdrPtr=(const struct sctpDataPart*)(chunkDescPtr+1); - printf("[TSN: %u] ", EXTRACT_32BITS(&dataHdrPtr->TSN)); - printf("[SID: %u] ", EXTRACT_16BITS(&dataHdrPtr->streamId)); - printf("[SSEQ %u] ", EXTRACT_16BITS(&dataHdrPtr->sequence)); - printf("[PPID 0x%x] ", EXTRACT_32BITS(&dataHdrPtr->payloadtype)); - fflush(stdout); - if (isforces) { - const u_char *payloadPtr; - u_int chunksize = sizeof(struct sctpDataPart)+ - sizeof(struct sctpChunkDesc); - payloadPtr = (const u_char *) (dataHdrPtr + 1); - if (EXTRACT_16BITS(&chunkDescPtr->chunkLength) < - sizeof(struct sctpDataPart)+ - sizeof(struct sctpChunkDesc)+1) { - /* Less than 1 byte of chunk payload */ - printf("bogus ForCES chunk length %u]", - EXTRACT_16BITS(&chunkDescPtr->chunkLength)); - return; - } + ppid = EXTRACT_32BITS(&dataHdrPtr->payloadtype); + ND_PRINT((ndo, "[TSN: %u] ", EXTRACT_32BITS(&dataHdrPtr->TSN))); + ND_PRINT((ndo, "[SID: %u] ", EXTRACT_16BITS(&dataHdrPtr->streamId))); + ND_PRINT((ndo, "[SSEQ %u] ", EXTRACT_16BITS(&dataHdrPtr->sequence))); + ND_PRINT((ndo, "[PPID %s] ", + tok2str(PayloadProto_idents, "0x%x", ppid))); + + if (!isforces) { + isforces = (ppid == SCTP_PPID_FORCES_HP) || + (ppid == SCTP_PPID_FORCES_MP) || + (ppid == SCTP_PPID_FORCES_LP); + } + + payloadPtr = (const u_char *) (dataHdrPtr + 1); + if (EXTRACT_16BITS(&chunkDescPtr->chunkLength) < + sizeof(struct sctpDataPart) + sizeof(struct sctpChunkDesc) + 1) { + ND_PRINT((ndo, "bogus chunk length %u]", EXTRACT_16BITS(&chunkDescPtr->chunkLength))); + return; + } + + payload_size = EXTRACT_16BITS(&chunkDescPtr->chunkLength) - + (sizeof(struct sctpDataPart) + sizeof(struct sctpChunkDesc)); - forces_print(payloadPtr, EXTRACT_16BITS(&chunkDescPtr->chunkLength)- chunksize); - } else if (vflag >= 2) { /* if verbose output is specified */ + if (isforces) { + forces_print(ndo, payloadPtr, payload_size); + } else if (ndo->ndo_vflag >= 2) { /* if verbose output is specified */ /* at the command line */ - const u_char *payloadPtr; - - printf("[Payload"); - - if (!suppress_default_print) { - payloadPtr = (const u_char *) (++dataHdrPtr); - printf(":"); - if (EXTRACT_16BITS(&chunkDescPtr->chunkLength) < - sizeof(struct sctpDataPart)+ - sizeof(struct sctpChunkDesc)+1) { - /* Less than 1 byte of chunk payload */ - printf("bogus chunk length %u]", - EXTRACT_16BITS(&chunkDescPtr->chunkLength)); - return; + switch (ppid) { + case SCTP_PPID_M3UA : + m3ua_print(ndo, payloadPtr, payload_size); + break; + default: + ND_PRINT((ndo, "[Payload")); + if (!ndo->ndo_suppress_default_print) { + ND_PRINT((ndo, ":")); + ND_DEFAULTPRINT(payloadPtr, payload_size); } - default_print(payloadPtr, - EXTRACT_16BITS(&chunkDescPtr->chunkLength) - - (sizeof(struct sctpDataPart)+ - sizeof(struct sctpChunkDesc))); - } else - printf("]"); - } + ND_PRINT((ndo, "]")); + break; + } + } break; } case SCTP_INITIATION : { const struct sctpInitiation *init; - printf("[INIT] "); init=(const struct sctpInitiation*)(chunkDescPtr+1); - printf("[init tag: %u] ", EXTRACT_32BITS(&init->initTag)); - printf("[rwnd: %u] ", EXTRACT_32BITS(&init->rcvWindowCredit)); - printf("[OS: %u] ", EXTRACT_16BITS(&init->NumPreopenStreams)); - printf("[MIS: %u] ", EXTRACT_16BITS(&init->MaxInboundStreams)); - printf("[init TSN: %u] ", EXTRACT_32BITS(&init->initialTSN)); + ND_PRINT((ndo, "[init tag: %u] ", EXTRACT_32BITS(&init->initTag))); + ND_PRINT((ndo, "[rwnd: %u] ", EXTRACT_32BITS(&init->rcvWindowCredit))); + ND_PRINT((ndo, "[OS: %u] ", EXTRACT_16BITS(&init->NumPreopenStreams))); + ND_PRINT((ndo, "[MIS: %u] ", EXTRACT_16BITS(&init->MaxInboundStreams))); + ND_PRINT((ndo, "[init TSN: %u] ", EXTRACT_32BITS(&init->initialTSN))); #if(0) /* ALC you can add code for optional params here */ if( (init+1) < chunkEnd ) - printf(" @@@@@ UNFINISHED @@@@@@%s\n", - "Optional params present, but not printed."); + ND_PRINT((ndo, " @@@@@ UNFINISHED @@@@@@%s\n", + "Optional params present, but not printed.")); #endif break; } @@ -625,18 +699,17 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ { const struct sctpInitiation *init; - printf("[INIT ACK] "); init=(const struct sctpInitiation*)(chunkDescPtr+1); - printf("[init tag: %u] ", EXTRACT_32BITS(&init->initTag)); - printf("[rwnd: %u] ", EXTRACT_32BITS(&init->rcvWindowCredit)); - printf("[OS: %u] ", EXTRACT_16BITS(&init->NumPreopenStreams)); - printf("[MIS: %u] ", EXTRACT_16BITS(&init->MaxInboundStreams)); - printf("[init TSN: %u] ", EXTRACT_32BITS(&init->initialTSN)); + ND_PRINT((ndo, "[init tag: %u] ", EXTRACT_32BITS(&init->initTag))); + ND_PRINT((ndo, "[rwnd: %u] ", EXTRACT_32BITS(&init->rcvWindowCredit))); + ND_PRINT((ndo, "[OS: %u] ", EXTRACT_16BITS(&init->NumPreopenStreams))); + ND_PRINT((ndo, "[MIS: %u] ", EXTRACT_16BITS(&init->MaxInboundStreams))); + ND_PRINT((ndo, "[init TSN: %u] ", EXTRACT_32BITS(&init->initialTSN))); #if(0) /* ALC you can add code for optional params here */ if( (init+1) < chunkEnd ) - printf(" @@@@@ UNFINISHED @@@@@@%s\n", - "Optional params present, but not printed."); + ND_PRINT((ndo, " @@@@@ UNFINISHED @@@@@@%s\n", + "Optional params present, but not printed.")); #endif break; } @@ -647,12 +720,11 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ int fragNo, tsnNo; const u_char *dupTSN; - printf("[SACK] "); sack=(const struct sctpSelectiveAck*)(chunkDescPtr+1); - printf("[cum ack %u] ", EXTRACT_32BITS(&sack->highestConseqTSN)); - printf("[a_rwnd %u] ", EXTRACT_32BITS(&sack->updatedRwnd)); - printf("[#gap acks %u] ", EXTRACT_16BITS(&sack->numberOfdesc)); - printf("[#dup tsns %u] ", EXTRACT_16BITS(&sack->numDupTsns)); + ND_PRINT((ndo, "[cum ack %u] ", EXTRACT_32BITS(&sack->highestConseqTSN))); + ND_PRINT((ndo, "[a_rwnd %u] ", EXTRACT_32BITS(&sack->updatedRwnd))); + ND_PRINT((ndo, "[#gap acks %u] ", EXTRACT_16BITS(&sack->numberOfdesc))); + ND_PRINT((ndo, "[#dup tsns %u] ", EXTRACT_16BITS(&sack->numDupTsns))); /* print gaps */ @@ -661,74 +733,28 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ fragNo=0; (const void *)frag < nextChunk && fragNo < EXTRACT_16BITS(&sack->numberOfdesc); frag++, fragNo++) - printf("\n\t\t[gap ack block #%d: start = %u, end = %u] ", + ND_PRINT((ndo, "\n\t\t[gap ack block #%d: start = %u, end = %u] ", fragNo+1, EXTRACT_32BITS(&sack->highestConseqTSN) + EXTRACT_16BITS(&frag->fragmentStart), - EXTRACT_32BITS(&sack->highestConseqTSN) + EXTRACT_16BITS(&frag->fragmentEnd)); + EXTRACT_32BITS(&sack->highestConseqTSN) + EXTRACT_16BITS(&frag->fragmentEnd))); /* print duplicate TSNs */ for (dupTSN = (const u_char *)frag, tsnNo=0; (const void *) dupTSN < nextChunk && tsnNonumDupTsns); dupTSN += 4, tsnNo++) - printf("\n\t\t[dup TSN #%u: %u] ", tsnNo+1, - EXTRACT_32BITS(dupTSN)); + ND_PRINT((ndo, "\n\t\t[dup TSN #%u: %u] ", tsnNo+1, + EXTRACT_32BITS(dupTSN))); break; } - case SCTP_HEARTBEAT_REQUEST : - printf("[HB REQ] "); - break; - case SCTP_HEARTBEAT_ACK : - printf("[HB ACK] "); - break; - case SCTP_ABORT_ASSOCIATION : - printf("[ABORT] "); - break; - case SCTP_SHUTDOWN : - printf("[SHUTDOWN] "); - break; - case SCTP_SHUTDOWN_ACK : - printf("[SHUTDOWN ACK] "); - break; - case SCTP_OPERATION_ERR : - printf("[OP ERR] "); - break; - case SCTP_COOKIE_ECHO : - printf("[COOKIE ECHO] "); - break; - case SCTP_COOKIE_ACK : - printf("[COOKIE ACK] "); - break; - case SCTP_ECN_ECHO : - printf("[ECN ECHO] "); - break; - case SCTP_ECN_CWR : - printf("[ECN CWR] "); - break; - case SCTP_SHUTDOWN_COMPLETE : - printf("[SHUTDOWN COMPLETE] "); - break; - case SCTP_FORWARD_CUM_TSN : - printf("[FOR CUM TSN] "); - break; - case SCTP_RELIABLE_CNTL : - printf("[REL CTRL] "); - break; - case SCTP_RELIABLE_CNTL_ACK : - printf("[REL CTRL ACK] "); - break; - default : - printf("[Unknown chunk type: 0x%x]", chunkDescPtr->chunkID); - return; } - if (vflag < 2) + if (ndo->ndo_vflag < 2) sep = ", ("; } return; trunc: - printf("[|sctp]"); - return; + ND_PRINT((ndo, "[|sctp]")); }