Address Michael's comments.

[tcpdump] / print-sctp.c

diff --git a/print-sctp.c b/print-sctp.c
index beb289e9ffc6b8b393e9e6719e4ae6a00781566a..a8990a9ae005049cb57743e6ec95ad197ff6d979 100644 (file)
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -35,7 +35,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.17 2005-04-13 08:30:41 guy Exp $ (NETLAB/PEL)";
+"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.21 2007-09-13 18:03:49 guy Exp $ (NETLAB/PEL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -59,6 +59,29 @@ static const char rcsid[] _U_ =
 #include "ip6.h"
 #endif
 
 #include "ip6.h"
 #endif
 

+#define CHAN_HP 6704
+#define CHAN_MP 6705
+#define CHAN_LP 6706
+
+struct tok ForCES_channels[] = {
+       { CHAN_HP, "ForCES HP" },
+       { CHAN_MP, "ForCES MP" },
+       { CHAN_LP, "ForCES LP" },
+       { 0, NULL }
+};
+
+static inline int isForCES_port(u_short Port)
+{
+       if (Port == CHAN_HP)
+               return 1;
+       if (Port == CHAN_MP)
+               return 1;
+       if (Port == CHAN_LP)
+               return 1;
+
+       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(const u_char *bp,        /* beginning of sctp packet */
                const u_char *bp2,       /* beginning of enclosing */
                u_int sctpPacketLength)  /* ip packet */


@@ -68,13 +91,14 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
 #ifdef INET6
   const struct ip6_hdr *ip6;
 #endif
 #ifdef INET6
   const struct ip6_hdr *ip6;
 #endif

-  const u_char *cp;

   const void *endPacketPtr;
   u_short sourcePort, destPort;
   int chunkCount;
   const struct sctpChunkDesc *chunkDescPtr;
   const void *nextChunk;
   const char *sep;
   const void *endPacketPtr;
   u_short sourcePort, destPort;
   int chunkCount;
   const struct sctpChunkDesc *chunkDescPtr;
   const void *nextChunk;
   const char *sep;

+  int isforces = 0;
+

 
   sctpPktHdr = (const struct sctpHeader*) bp;
   endPacketPtr = (const u_char*)sctpPktHdr+sctpPacketLength;
 
   sctpPktHdr = (const struct sctpHeader*) bp;
   endPacketPtr = (const u_char*)sctpPktHdr+sctpPacketLength;


@@ -88,12 +112,7 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
   else
     ip6 = NULL;
 #endif /*INET6*/
   else
     ip6 = NULL;
 #endif /*INET6*/

-  cp = (const u_char *)(sctpPktHdr + 1);
-  if (cp > snapend)
-    {
-      printf("[|sctp]");
-      return;
-    }
+  TCHECK(*sctpPktHdr);

 
   if (sctpPacketLength < sizeof(struct sctpHeader))
     {
 
   if (sctpPacketLength < sizeof(struct sctpHeader))
     {


@@ -126,6 +145,15 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
   }
   fflush(stdout);
 
   }
   fflush(stdout);
 

+  if (isForCES_port(sourcePort)) {
+         printf("[%s]", tok2str(ForCES_channels, NULL, sourcePort));
+         isforces = 1;
+  }
+  if (isForCES_port(destPort)) {
+         printf("[%s]", tok2str(ForCES_channels, NULL, destPort));
+         isforces = 1;
+  }
+

   if (vflag >= 2)
     sep = "\n\t";
   else
   if (vflag >= 2)
     sep = "\n\t";
   else


@@ -141,12 +169,21 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
 
        chunkDescPtr = (const struct sctpChunkDesc *) nextChunk, chunkCount++)
     {
 
        chunkDescPtr = (const struct sctpChunkDesc *) nextChunk, chunkCount++)
     {

-      u_short align;
+      u_int16_t chunkLength;

       const u_char *chunkEnd;
       const u_char *chunkEnd;

+      u_int16_t align;

 
 

-      chunkEnd = ((const u_char*)chunkDescPtr + EXTRACT_16BITS(&chunkDescPtr->chunkLength));
+      TCHECK(*chunkDescPtr);
+      chunkLength = EXTRACT_16BITS(&chunkDescPtr->chunkLength);
+      if (chunkLength < sizeof(*chunkDescPtr)) {
+       printf("%s%d) [Bad chunk length %u]", sep, chunkCount+1, chunkLength);
+       break;
+      }

 
 

-      align=EXTRACT_16BITS(&chunkDescPtr->chunkLength) % 4;
+      TCHECK2(*((u_int8_t *)chunkDescPtr), chunkLength);
+      chunkEnd = ((const u_char*)chunkDescPtr + chunkLength);
+
+      align=chunkLength % 4;

       if (align != 0)
        align = 4 - align;
 
       if (align != 0)
        align = 4 - align;
 


@@ -190,27 +227,42 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
            printf("[SSEQ %u] ", EXTRACT_16BITS(&dataHdrPtr->sequence));
            printf("[PPID 0x%x] ", EXTRACT_32BITS(&dataHdrPtr->payloadtype));
            fflush(stdout);
            printf("[SSEQ %u] ", EXTRACT_16BITS(&dataHdrPtr->sequence));
            printf("[PPID 0x%x] ", EXTRACT_32BITS(&dataHdrPtr->payloadtype));
            fflush(stdout);

-
-           if (vflag >= 2)        /* if verbose output is specified */
-             {                    /* at the command line */
+           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;
+               }
+
+               forces_print(payloadPtr, EXTRACT_16BITS(&chunkDescPtr->chunkLength)- chunksize);
+          } else if (vflag >= 2) {     /* if verbose output is specified */
+                                       /* at the command line */

                const u_char *payloadPtr;
 
                printf("[Payload");
 
                const u_char *payloadPtr;
 
                printf("[Payload");
 

-               if (!xflag && !qflag) {
+               if (!suppress_default_print) {

                        payloadPtr = (const u_char *) (++dataHdrPtr);
                        printf(":");
                        payloadPtr = (const u_char *) (++dataHdrPtr);
                        printf(":");

-                       if (htons(chunkDescPtr->chunkLength) <
+                       if (EXTRACT_16BITS(&chunkDescPtr->chunkLength) <

                            sizeof(struct sctpDataPart)+
                            sizeof(struct sctpChunkDesc)+1) {
                            sizeof(struct sctpDataPart)+
                            sizeof(struct sctpChunkDesc)+1) {

+                               /* Less than 1 byte of chunk payload */

                                printf("bogus chunk length %u]",
                                printf("bogus chunk length %u]",

-                                   htons(chunkDescPtr->chunkLength));
+                                   EXTRACT_16BITS(&chunkDescPtr->chunkLength));

                                return;
                        }
                        default_print(payloadPtr,
                                return;
                        }
                        default_print(payloadPtr,

-                             htons(chunkDescPtr->chunkLength) -
+                             EXTRACT_16BITS(&chunkDescPtr->chunkLength) -

                              (sizeof(struct sctpDataPart)+
                              (sizeof(struct sctpDataPart)+

-                             sizeof(struct sctpChunkDesc)+1));
+                             sizeof(struct sctpChunkDesc)));

                } else
                        printf("]");
              }
                } else
                        printf("]");
              }


@@ -347,4 +399,9 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
        if (vflag < 2)
          sep = ", (";
     }
        if (vflag < 2)
          sep = ", (";
     }

+    return;
+
+trunc:
+    printf("[|sctp]");
+    return;

 }
 }