Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 8cdb779da9ed39dd3609de5f841e105d4e51cb3e..89130a373c070e5855b48f35945acff8e04cba7e 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.16 2002-11-09 17:19:26 itojun Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.20 2003-11-19 00:36:08 guy Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -37,7 +37,7 @@ struct ipcomp {
        u_int8_t comp_nxt;      /* Next Header */
        u_int8_t comp_flags;    /* Length of data, in 32bit */
        u_int16_t comp_cpi;     /* Compression parameter index */
        u_int8_t comp_nxt;      /* Next Header */
        u_int8_t comp_flags;    /* Length of data, in 32bit */
        u_int16_t comp_cpi;     /* Compression parameter index */

-} __attribute__((packed));
+};

 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
 #include <zlib.h>
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
 #include <zlib.h>


@@ -45,9 +45,10 @@ struct ipcomp {
 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 
 int
 
 int

-ipcomp_print(register const u_char *bp, int *nhdr)
+ipcomp_print(register const u_char *bp, int *nhdr _U_)

 {
        register const struct ipcomp *ipcomp;
        register const u_char *ep;
 {
        register const struct ipcomp *ipcomp;
        register const u_char *ep;


@@ -57,7 +58,7 @@ ipcomp_print(register const u_char *bp, int *nhdr)
 #endif
 
        ipcomp = (struct ipcomp *)bp;
 #endif
 
        ipcomp = (struct ipcomp *)bp;

-       cpi = (u_int16_t)ntohs(ipcomp->comp_cpi);
+       cpi = EXTRACT_16BITS(&ipcomp->comp_cpi);

 
        /* 'ep' points to the end of available data. */
        ep = snapend;
 
        /* 'ep' points to the end of available data. */
        ep = snapend;


@@ -86,7 +87,5 @@ ipcomp_print(register const u_char *bp, int *nhdr)
 
 #endif
 fail:
 
 #endif
 fail:

-       if (nhdr)
-               *nhdr = -1;
-       return 65536;
+       return -1;

 }
 }