s/u_short/u_int16_t/ and others (just to be sure)
This commit is contained in:
parent
f886376518
commit
c4c4038edf
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: print-mobile.c,v 1.2 1998/09/30 08:57:01 hwr Exp $ */
|
||||
/* $NetBSD: print-mobile.c,v 1.3 1999/07/26 06:11:57 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: print-mobile.c,v 1.2 1998/09/30 08:57:01 hwr Exp $");
|
||||
__RCSID("$NetBSD: print-mobile.c,v 1.3 1999/07/26 06:11:57 itojun Exp $");
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@ -60,15 +60,15 @@ __RCSID("$NetBSD: print-mobile.c,v 1.2 1998/09/30 08:57:01 hwr Exp $");
|
|||
#define MOBILE_SIZE (8)
|
||||
|
||||
struct mobile_ip {
|
||||
u_short proto;
|
||||
u_short hcheck;
|
||||
u_int16_t proto;
|
||||
u_int16_t hcheck;
|
||||
u_int32_t odst;
|
||||
u_int32_t osrc;
|
||||
};
|
||||
|
||||
#define OSRC_PRES 0x0080 /* old source is present */
|
||||
|
||||
static u_short mob_in_cksum(u_short *p, int len);
|
||||
static u_int16_t mob_in_cksum(u_short *p, int len);
|
||||
|
||||
/*
|
||||
* Deencapsulate and print a mobile-tunneled IP datagram
|
||||
|
@ -113,9 +113,9 @@ mobile_print(const u_char *bp, u_int length)
|
|||
return;
|
||||
}
|
||||
|
||||
static u_short mob_in_cksum(u_short *p, int len)
|
||||
static u_int16_t mob_in_cksum(u_short *p, int len)
|
||||
{
|
||||
u_int sum = 0;
|
||||
u_int32_t sum = 0;
|
||||
int nwords = len >> 1;
|
||||
|
||||
while (nwords-- != 0)
|
||||
|
@ -123,8 +123,8 @@ static u_short mob_in_cksum(u_short *p, int len)
|
|||
|
||||
if (len & 1) {
|
||||
union {
|
||||
u_short w;
|
||||
u_char c[2];
|
||||
u_int16_t w;
|
||||
u_int32_t c[2];
|
||||
} u;
|
||||
u.c[0] = *(u_char *)p;
|
||||
u.c[1] = 0;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: print-ppp.c,v 1.7 1999/07/02 11:31:35 itojun Exp $ */
|
||||
/* $NetBSD: print-ppp.c,v 1.8 1999/07/26 06:11:57 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
|
||||
|
@ -27,7 +27,7 @@
|
|||
static const char rcsid[] =
|
||||
"@(#) Header: print-ppp.c,v 1.26 97/06/12 14:21:29 leres Exp (LBL)";
|
||||
#else
|
||||
__RCSID("$NetBSD: print-ppp.c,v 1.7 1999/07/02 11:31:35 itojun Exp $");
|
||||
__RCSID("$NetBSD: print-ppp.c,v 1.8 1999/07/26 06:11:57 itojun Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@ -105,6 +105,7 @@ ppp_if_print(u_char *user, const struct pcap_pkthdr *h,
|
|||
break;
|
||||
#ifdef INET6
|
||||
case ETHERTYPE_IPV6:
|
||||
case PPP_IPV6:
|
||||
ip6_print((const u_char *)ip, length);
|
||||
break;
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue