diff options
author | sam <sam@FreeBSD.org> | 2005-05-29 18:17:16 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2005-05-29 18:17:16 +0000 |
commit | 777fc78fe5d7142db2a7e4b9fc3ad2f082e02446 (patch) | |
tree | 00ad2d6dd16ad34ea9cdf4e6521ac3fe7179a0f3 /contrib/tcpdump/print-sctp.c | |
parent | 8c6500f369940b5e6f664368df8ecb0ac8e346d7 (diff) | |
parent | 88a191f109e4bbf287e317e4115185aa904a7757 (diff) | |
download | FreeBSD-src-777fc78fe5d7142db2a7e4b9fc3ad2f082e02446.zip FreeBSD-src-777fc78fe5d7142db2a7e4b9fc3ad2f082e02446.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r146773,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/tcpdump/print-sctp.c')
-rw-r--r-- | contrib/tcpdump/print-sctp.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/contrib/tcpdump/print-sctp.c b/contrib/tcpdump/print-sctp.c index deac239..b0e0036 100644 --- a/contrib/tcpdump/print-sctp.c +++ b/contrib/tcpdump/print-sctp.c @@ -35,7 +35,7 @@ #ifndef lint static const char rcsid[] _U_ = -"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.13.2.2 2003/11/16 08:51:44 guy Exp $ (NETLAB/PEL)"; +"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.16 2004/12/15 08:43:23 guy Exp $ (NETLAB/PEL)"; #endif #ifdef HAVE_CONFIG_H @@ -74,6 +74,7 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ int chunkCount; const struct sctpChunkDesc *chunkDescPtr; const void *nextChunk; + const char *sep; sctpPktHdr = (const struct sctpHeader*) bp; endPacketPtr = (const u_char*)sctpPktHdr+sctpPacketLength; @@ -125,9 +126,10 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ } fflush(stdout); - if (vflag < 2) - return; - + if (vflag >= 2) + sep = "\n\t"; + else + sep = " ("; /* cycle through all chunks, printing information on each one */ for (chunkCount = 0, chunkDescPtr = (const struct sctpChunkDesc *) @@ -150,7 +152,7 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ nextChunk = (const void *) (chunkEnd + align); - printf("\n\t%d) ", chunkCount+1); + printf("%s%d) ", sep, chunkCount+1); switch (chunkDescPtr->chunkID) { case SCTP_DATA : @@ -189,7 +191,7 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ printf("[PPID 0x%x] ", EXTRACT_32BITS(&dataHdrPtr->payloadtype)); fflush(stdout); - if (vflag) /* if verbose output is specified */ + if (vflag >= 2) /* if verbose output is specified */ { /* at the command line */ const u_char *payloadPtr; @@ -341,5 +343,8 @@ void sctp_print(const u_char *bp, /* beginning of sctp packet */ printf("[Unknown chunk type: 0x%x]", chunkDescPtr->chunkID); return; } + + if (vflag < 2) + sep = ", ("; } } |