Merge pull request #4 from infrastation/master

[tcpdump] / print-sctp.c

diff --git a/print-sctp.c b/print-sctp.c
index c0fa3087bd0ef0a6ed038f547ed5a68b045b435d..a8990a9ae005049cb57743e6ec95ad197ff6d979 100644 (file)
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -59,9 +59,9 @@ static const char rcsid[] _U_ =
 #include "ip6.h"
 #endif
 
 #include "ip6.h"
 #endif
 

-#define CHAN_HP 6700
-#define CHAN_MP 6701
-#define CHAN_LP 6702
+#define CHAN_HP 6704
+#define CHAN_MP 6705
+#define CHAN_LP 6706

 
 struct tok ForCES_channels[] = {
        { CHAN_HP, "ForCES HP" },
 
 struct tok ForCES_channels[] = {
        { CHAN_HP, "ForCES HP" },


@@ -232,16 +232,16 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
                u_int chunksize = sizeof(struct sctpDataPart)+
                                  sizeof(struct sctpChunkDesc);
                payloadPtr = (const u_char *) (dataHdrPtr + 1);
                u_int chunksize = sizeof(struct sctpDataPart)+
                                  sizeof(struct sctpChunkDesc);
                payloadPtr = (const u_char *) (dataHdrPtr + 1);

-               if (htons(chunkDescPtr->chunkLength) <
+               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]",
                        sizeof(struct sctpDataPart)+
                        sizeof(struct sctpChunkDesc)+1) {
                /* Less than 1 byte of chunk payload */
                        printf("bogus ForCES chunk length %u]",

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

                        return;
                }
 
                        return;
                }
 

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


@@ -251,16 +251,16 @@ void sctp_print(const u_char *bp,        /* beginning of sctp packet */
                if (!suppress_default_print) {
                        payloadPtr = (const u_char *) (++dataHdrPtr);
                        printf(":");
                if (!suppress_default_print) {
                        payloadPtr = (const u_char *) (++dataHdrPtr);
                        printf(":");

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

                            sizeof(struct sctpDataPart)+
                            sizeof(struct sctpChunkDesc)+1) {
                                /* Less than 1 byte of chunk payload */
                                printf("bogus chunk length %u]",
                            sizeof(struct sctpDataPart)+
                            sizeof(struct sctpChunkDesc)+1) {
                                /* Less than 1 byte of chunk payload */
                                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 sctpChunkDesc)));
                } else
                              (sizeof(struct sctpDataPart)+
                              sizeof(struct sctpChunkDesc)));
                } else