Pointers into packet data should usually be pointers to unsigned 1-byte

[tcpdump] / print-sctp.c

diff --git a/print-sctp.c b/print-sctp.c
index 1b93714467bd3f07543eee5465b3909c427157e4..d38cfde2d6755ddcb276b621346ddbbb2a0c4bc4 100644 (file)
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -34,31 +34,20 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.1 2001-05-09 00:34:35 fenner Exp $ (NETLAB/PEL)";
+static const char rcsid[] _U_ =
+"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.20 2005-07-07 01:22:20 guy Exp $ (NETLAB/PEL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
+#include <tcpdump-stdinc.h>

 
 

-#include <unistd.h>

 #include "sctpHeader.h"
 #include "sctpConstants.h"
 #include <assert.h>
 
 #include "sctpHeader.h"
 #include "sctpConstants.h"
 #include <assert.h>
 

-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-#include <net/if.h>
-
-#include <netinet/in.h>
-

 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 


@@ -73,169 +62,174 @@ struct rtentry;
 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 */

-{ 
+{

   const struct sctpHeader *sctpPktHdr;
   const struct ip *ip;
 #ifdef INET6
   const struct ip6_hdr *ip6;
 #endif
   const struct sctpHeader *sctpPktHdr;
   const struct ip *ip;
 #ifdef INET6
   const struct ip6_hdr *ip6;
 #endif

-  const u_char *cp;
-  void *endPacketPtr;
+  const void *endPacketPtr;

   u_short sourcePort, destPort;
   int chunkCount;
   u_short sourcePort, destPort;
   int chunkCount;

-  struct sctpChunkDesc *chunkDescPtr;
-  void *nextChunk;
+  const struct sctpChunkDesc *chunkDescPtr;
+  const void *nextChunk;
+  const char *sep;
+
+  sctpPktHdr = (const struct sctpHeader*) bp;
+  endPacketPtr = (const u_char*)sctpPktHdr+sctpPacketLength;

 
 

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

   if( (u_long) endPacketPtr > (u_long) snapend)
   if( (u_long) endPacketPtr > (u_long) snapend)

-    endPacketPtr = (void *) snapend;
+    endPacketPtr = (const void *) snapend;

   ip = (struct ip *)bp2;
 #ifdef INET6
   if (IP_V(ip) == 6)
   ip = (struct ip *)bp2;
 #ifdef INET6
   if (IP_V(ip) == 6)

-    ip6 = (struct ip6_hdr *)bp2;
+    ip6 = (const struct ip6_hdr *)bp2;

   else
     ip6 = NULL;
 #endif /*INET6*/
   else
     ip6 = NULL;
 #endif /*INET6*/

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

     {
     {

-      (void)printf("truncated-sctp - %d bytes missing!", 
-                  sctpPacketLength-sizeof(struct sctpHeader));
+      (void)printf("truncated-sctp - %ld bytes missing!",
+                  (long)sctpPacketLength-sizeof(struct sctpHeader));

       return;
     }
       return;
     }

-  
+

   /*    sctpPacketLength -= sizeof(struct sctpHeader);  packet length  */
   /*                         is now only as long as the payload  */
 
   /*    sctpPacketLength -= sizeof(struct sctpHeader);  packet length  */
   /*                         is now only as long as the payload  */
 

-  sourcePort = ntohs(sctpPktHdr->source);
-  destPort = ntohs(sctpPktHdr->destination);
-  
+  sourcePort = EXTRACT_16BITS(&sctpPktHdr->source);
+  destPort = EXTRACT_16BITS(&sctpPktHdr->destination);
+

 #ifdef INET6
   if (ip6) {
 #ifdef INET6
   if (ip6) {

-    if (ip6->ip6_nxt == IPPROTO_SCTP) {
-      (void)printf("%s.%d > %s.%d: sctp",
-        ip6addr_string(&ip6->ip6_src),
-        sourcePort,
-        ip6addr_string(&ip6->ip6_dst),
-        destPort);
-    } else {
-      (void)printf("%d > %d: sctp",
-        sourcePort, destPort);
-    }
+    (void)printf("%s.%d > %s.%d: sctp",
+      ip6addr_string(&ip6->ip6_src),
+      sourcePort,
+      ip6addr_string(&ip6->ip6_dst),
+      destPort);

   } else
 #endif /*INET6*/
   {
   } else
 #endif /*INET6*/
   {

-    if (ip->ip_p == IPPROTO_SCTP) {
-      (void)printf("%s.%d > %s.%d: sctp",
-        ipaddr_string(&ip->ip_src),
-        sourcePort,
-        ipaddr_string(&ip->ip_dst),
-        destPort);
-    } else {
-      (void)printf("%d > %d: sctp",
-        sourcePort, destPort);
-    }
+    (void)printf("%s.%d > %s.%d: sctp",
+      ipaddr_string(&ip->ip_src),
+      sourcePort,
+      ipaddr_string(&ip->ip_dst),
+      destPort);

   }
   fflush(stdout);
 
   }
   fflush(stdout);
 

-  if (vflag < 2)
-       return;
-  
+  if (vflag >= 2)
+    sep = "\n\t";
+  else
+    sep = " (";

   /* cycle through all chunks, printing information on each one */
   /* cycle through all chunks, printing information on each one */

-  for (chunkCount = 0, 
-        chunkDescPtr = (struct sctpChunkDesc *) ( (u_char*) sctpPktHdr +
-                                                  sizeof(struct sctpHeader));
+  for (chunkCount = 0,
+        chunkDescPtr = (const struct sctpChunkDesc *)
+           ((const u_char*) sctpPktHdr + sizeof(struct sctpHeader));

        chunkDescPtr != NULL &&
        chunkDescPtr != NULL &&

-        ( (void *)  ((u_char *) chunkDescPtr + sizeof(struct sctpChunkDesc))
+        ( (const void *)
+           ((const u_char *) chunkDescPtr + sizeof(struct sctpChunkDesc))

           <= endPacketPtr);
           <= endPacketPtr);

-       
-       chunkDescPtr = (struct sctpChunkDesc *) nextChunk, chunkCount++)
+
+       chunkDescPtr = (const struct sctpChunkDesc *) nextChunk, chunkCount++)

     {
     {

-      u_short align;
-      u_char *chunkEnd;
-      
-      chunkEnd = ((u_char*)chunkDescPtr + ntohs(chunkDescPtr->chunkLength));
-      
-      align=ntohs(chunkDescPtr->chunkLength) % 4;
+      u_int16_t chunkLength;
+      const u_char *chunkEnd;
+      u_int16_t align;
+
+      TCHECK(*chunkDescPtr);
+      chunkLength = EXTRACT_16BITS(&chunkDescPtr->chunkLength);
+      if (chunkLength < sizeof(*chunkDescPtr)) {
+       printf("%s%d) [Bad chunk length %u]", sep, chunkCount+1, chunkLength);
+       break;
+      }
+
+      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;
 

-      nextChunk = (void *) (chunkEnd + align);
+      nextChunk = (const void *) (chunkEnd + align);

 
 

-      printf("\n\t%d) ", chunkCount+1);
+      printf("%s%d) ", sep, chunkCount+1);

       switch (chunkDescPtr->chunkID)
        {
        case SCTP_DATA :
          {
       switch (chunkDescPtr->chunkID)
        {
        case SCTP_DATA :
          {

-           struct sctpDataPart *dataHdrPtr;
-           
+           const struct sctpDataPart *dataHdrPtr;
+

            printf("[DATA] ");
            printf("[DATA] ");

-           
-           if ((chunkDescPtr->chunkFlg & SCTP_DATA_UNORDERED) 
+
+           if ((chunkDescPtr->chunkFlg & SCTP_DATA_UNORDERED)

                == SCTP_DATA_UNORDERED)
              printf("(U)");
 
                == SCTP_DATA_UNORDERED)
              printf("(U)");
 

-           if ((chunkDescPtr->chunkFlg & SCTP_DATA_FIRST_FRAG) 
+           if ((chunkDescPtr->chunkFlg & SCTP_DATA_FIRST_FRAG)

                == SCTP_DATA_FIRST_FRAG)
              printf("(B)");
                == SCTP_DATA_FIRST_FRAG)
              printf("(B)");

-           
-           if ((chunkDescPtr->chunkFlg & SCTP_DATA_LAST_FRAG) 
+
+           if ((chunkDescPtr->chunkFlg & SCTP_DATA_LAST_FRAG)

                == SCTP_DATA_LAST_FRAG)
              printf("(E)");
 
                == SCTP_DATA_LAST_FRAG)
              printf("(E)");
 

-           if( ((chunkDescPtr->chunkFlg & SCTP_DATA_UNORDERED) 
-                == SCTP_DATA_UNORDERED) 
+           if( ((chunkDescPtr->chunkFlg & SCTP_DATA_UNORDERED)
+                == SCTP_DATA_UNORDERED)

                ||
                ||

-               ((chunkDescPtr->chunkFlg & SCTP_DATA_FIRST_FRAG) 
+               ((chunkDescPtr->chunkFlg & SCTP_DATA_FIRST_FRAG)

                 == SCTP_DATA_FIRST_FRAG)
                ||
                 == SCTP_DATA_FIRST_FRAG)
                ||

-               ((chunkDescPtr->chunkFlg & SCTP_DATA_LAST_FRAG) 
+               ((chunkDescPtr->chunkFlg & SCTP_DATA_LAST_FRAG)

                 == SCTP_DATA_LAST_FRAG) )
              printf(" ");
 
                 == SCTP_DATA_LAST_FRAG) )
              printf(" ");
 

-           dataHdrPtr=(struct sctpDataPart*)(chunkDescPtr+1);
-                            
-           printf("[TSN: %lu] ", ntohl(dataHdrPtr->TSN));
-           printf("[SID: %u] ", ntohs(dataHdrPtr->streamId));
-           printf("[SSEQ %u] ", ntohs(dataHdrPtr->sequence));
-           printf("[PPID 0x%x] ", ntohl(dataHdrPtr->payloadtype));
+           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);
 
            fflush(stdout);
 

-           if (vflag)          /* if verbose output is specified */
+           if (vflag >= 2)        /* if verbose output is specified */

              {                    /* at the command line */
              {                    /* at the command line */

-               char *payloadPtr;
-               
-               printf("[Payload: {");
-               fflush(stdout);
-
-               payloadPtr = (char *) (++dataHdrPtr);
-               write(STDOUT_FILENO, payloadPtr, 
-                     htons(chunkDescPtr->chunkLength)-1 -
-                     sizeof(struct sctpDataPart)-sizeof(struct sctpChunkDesc));
-               printf("}] ");
-               fflush(stdout);
+               const u_char *payloadPtr;
+
+               printf("[Payload");
+
+               if (!suppress_default_print) {
+                       payloadPtr = (const u_char *) (++dataHdrPtr);
+                       printf(":");
+                       if (htons(chunkDescPtr->chunkLength) <
+                           sizeof(struct sctpDataPart)+
+                           sizeof(struct sctpChunkDesc)+1) {
+                               printf("bogus chunk length %u]",
+                                   htons(chunkDescPtr->chunkLength));
+                               return;
+                       }
+                       default_print(payloadPtr,
+                             htons(chunkDescPtr->chunkLength) -
+                             (sizeof(struct sctpDataPart)+
+                             sizeof(struct sctpChunkDesc)+1));
+               } else
+                       printf("]");

              }
            break;
          }
        case SCTP_INITIATION :
          {
              }
            break;
          }
        case SCTP_INITIATION :
          {

-           struct sctpInitiation *init;
+           const struct sctpInitiation *init;

 
            printf("[INIT] ");
 
            printf("[INIT] ");

-           init=(struct sctpInitiation*)(chunkDescPtr+1);
-           printf("[init tag: %lu] ", ntohl(init->initTag));
-           printf("[rwnd: %lu] ", ntohl(init->rcvWindowCredit));
-           printf("[OS: %u] ", ntohs(init->NumPreopenStreams));
-           printf("[MIS: %u] ", ntohs(init->MaxInboundStreams));
-           printf("[init TSN: %lu] ", ntohl(init->initialTSN));
+           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));

 
 #if(0) /* ALC you can add code for optional params here */
            if( (init+1) < chunkEnd )
 
 #if(0) /* ALC you can add code for optional params here */
            if( (init+1) < chunkEnd )


@@ -246,16 +240,16 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
          }
        case SCTP_INITIATION_ACK :
          {
          }
        case SCTP_INITIATION_ACK :
          {

-           struct sctpInitiation *init;
-           
+           const struct sctpInitiation *init;
+

            printf("[INIT ACK] ");
            printf("[INIT ACK] ");

-           init=(struct sctpInitiation*)(chunkDescPtr+1);
-           printf("[init tag: %lu] ", ntohl(init->initTag));
-           printf("[rwnd: %lu] ", ntohl(init->rcvWindowCredit));
-           printf("[OS: %u] ", ntohs(init->NumPreopenStreams));
-           printf("[MIS: %u] ", ntohs(init->MaxInboundStreams));
-           printf("[init TSN: %lu] ", ntohl(init->initialTSN));
-           
+           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));
+

 #if(0) /* ALC you can add code for optional params here */
            if( (init+1) < chunkEnd )
              printf(" @@@@@ UNFINISHED @@@@@@%s\n",
 #if(0) /* ALC you can add code for optional params here */
            if( (init+1) < chunkEnd )
              printf(" @@@@@ UNFINISHED @@@@@@%s\n",


@@ -265,47 +259,48 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
          }
        case SCTP_SELECTIVE_ACK:
          {
          }
        case SCTP_SELECTIVE_ACK:
          {

-           struct sctpSelectiveAck *sack;
-           struct sctpSelectiveFrag *frag; 
+           const struct sctpSelectiveAck *sack;
+           const struct sctpSelectiveFrag *frag;

            int fragNo, tsnNo;
            int fragNo, tsnNo;

-           u_long *dupTSN;
+           const u_char *dupTSN;

 
            printf("[SACK] ");
 
            printf("[SACK] ");

-           sack=(struct sctpSelectiveAck*)(chunkDescPtr+1);
-           printf("[cum ack %lu] ", ntohl(sack->highestConseqTSN));
-           printf("[a_rwnd %lu] ", ntohl(sack->updatedRwnd));
-           printf("[#gap acks %u] ", ntohs(sack->numberOfdesc));
-           printf("[#dup tsns %u] ", ntohs(sack->numDupTsns));
-           
-           
+           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));
+
+

            /* print gaps */
            /* print gaps */

-           for (frag = ( (struct sctpSelectiveFrag *)
-                         ((struct sctpSelectiveAck *) sack+1)),
+           for (frag = ( (const struct sctpSelectiveFrag *)
+                         ((const struct sctpSelectiveAck *) sack+1)),

                   fragNo=0;
                   fragNo=0;

-                (void *)frag < nextChunk && fragNo < ntohs(sack->numberOfdesc);
+                (const void *)frag < nextChunk && fragNo < EXTRACT_16BITS(&sack->numberOfdesc);

                 frag++, fragNo++)
                 frag++, fragNo++)

-             printf("\n\t\t[gap ack block #%d: start = %u, end = %u] ", 
+             printf("\n\t\t[gap ack block #%d: start = %u, end = %u] ",

                     fragNo+1,
                     fragNo+1,

-                    ntohl(sack->highestConseqTSN) + ntohs(frag->fragmentStart),
-                    ntohl(sack->highestConseqTSN) + ntohs(frag->fragmentEnd));
-           
+                    EXTRACT_32BITS(&sack->highestConseqTSN) + EXTRACT_16BITS(&frag->fragmentStart),
+                    EXTRACT_32BITS(&sack->highestConseqTSN) + EXTRACT_16BITS(&frag->fragmentEnd));
+

 
            /* print duplicate TSNs */
 
            /* print duplicate TSNs */

-           for (dupTSN = (u_long*)frag, tsnNo=0; 
-                (void *) dupTSN < nextChunk && tsnNo<ntohs(sack->numDupTsns);
-                dupTSN++, tsnNo++)
-             printf("\n\t\t[dup TSN #%u: %lu] ", tsnNo+1, ntohl(*dupTSN));
+           for (dupTSN = (const u_char *)frag, tsnNo=0;
+                (const void *) dupTSN < nextChunk && tsnNo<EXTRACT_16BITS(&sack->numDupTsns);
+                dupTSN += 4, tsnNo++)
+             printf("\n\t\t[dup TSN #%u: %u] ", tsnNo+1,
+                 EXTRACT_32BITS(dupTSN));

 
            break;
          }
        case SCTP_HEARTBEAT_REQUEST :
          {
 
            break;
          }
        case SCTP_HEARTBEAT_REQUEST :
          {

-           struct sctpHBsender *hb;
+           const struct sctpHBsender *hb;

 
 

-           hb=(struct sctpHBsender*)chunkDescPtr;
+           hb=(const struct sctpHBsender*)chunkDescPtr;

 
            printf("[HB REQ] ");
 
            printf("[HB REQ] ");

-           
+

            break;
          }
        case SCTP_HEARTBEAT_ACK :
            break;
          }
        case SCTP_HEARTBEAT_ACK :


@@ -332,7 +327,7 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
        case SCTP_ECN_ECHO :
          printf("[ECN ECHO] ");
          break;
        case SCTP_ECN_ECHO :
          printf("[ECN ECHO] ");
          break;

-       case SCTP_ECN_CWR : 
+       case SCTP_ECN_CWR :

          printf("[ECN CWR] ");
          break;
        case SCTP_SHUTDOWN_COMPLETE :
          printf("[ECN CWR] ");
          break;
        case SCTP_SHUTDOWN_COMPLETE :


@@ -351,5 +346,13 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
          printf("[Unknown chunk type: 0x%x]", chunkDescPtr->chunkID);
          return;
        }
          printf("[Unknown chunk type: 0x%x]", chunkDescPtr->chunkID);
          return;
        }

+
+       if (vflag < 2)
+         sep = ", (";

     }
     }

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

 }
 }