More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 6509f9eddacfde588a1b28700d119e1408f5722e..344ccc804f1b6ae6f7b41d0eeed3e4dd4b4eb10e 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,22 +19,12 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.13 2000-12-12 09:58:41 itojun Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <string.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>
 
 #include <stdio.h>
 
@@ -50,9 +40,10 @@ struct ipcomp {
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
 
 int
-ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
+ipcomp_print(register const u_char *bp, int *nhdr _U_)
 {
        register const struct ipcomp *ipcomp;
        register const u_char *ep;
@@ -62,7 +53,7 @@ ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
 #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;
@@ -91,7 +82,5 @@ ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
 
 #endif
 fail:
-       if (nhdr)
-               *nhdr = -1;
-       return 65536;
+       return -1;
 }