explicitly use u_int32_t for DLT_NULL encapsulation.
correct gif address family. from chopps, sync with kame.
This commit is contained in:
parent
cda5e3eb96
commit
ffc12ee678
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_faith.c,v 1.16 2001/01/17 04:05:42 itojun Exp $ */
|
||||
/* $NetBSD: if_faith.c,v 1.17 2001/02/20 07:58:16 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1993
|
||||
|
@ -189,7 +189,7 @@ faithoutput(ifp, m, dst, rt)
|
|||
* try to free it or keep a pointer a to it).
|
||||
*/
|
||||
struct mbuf m0;
|
||||
u_int af = dst->sa_family;
|
||||
u_int32_t af = dst->sa_family;
|
||||
|
||||
m0.m_next = m;
|
||||
m0.m_len = 4;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: if_gif.c,v 1.21 2001/02/20 07:53:31 itojun Exp $ */
|
||||
/* $KAME: if_gif.c,v 1.34 2000/10/07 03:58:53 itojun Exp $ */
|
||||
/* $NetBSD: if_gif.c,v 1.22 2001/02/20 07:58:16 itojun Exp $ */
|
||||
/* $KAME: if_gif.c,v 1.40 2001/02/20 07:41:36 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
|
@ -370,11 +370,11 @@ gif_input(m, af, gifp)
|
|||
* try to free it or keep a pointer a to it).
|
||||
*/
|
||||
struct mbuf m0;
|
||||
u_int af = AF_INET6;
|
||||
u_int32_t af1 = af;
|
||||
|
||||
m0.m_next = m;
|
||||
m0.m_len = 4;
|
||||
m0.m_data = (char *)⁡
|
||||
m0.m_data = (char *)&af1;
|
||||
|
||||
#ifdef HAVE_OLD_BPF
|
||||
bpf_mtap(gifp, &m0);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_gre.c,v 1.16 2001/01/17 00:30:51 thorpej Exp $ */
|
||||
/* $NetBSD: if_gre.c,v 1.17 2001/02/20 07:58:17 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -207,7 +207,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
|
|||
if (ifp->if_bpf) {
|
||||
/* see comment of other if_foo.c files */
|
||||
struct mbuf m0;
|
||||
u_int af = dst->sa_family;
|
||||
u_int32_t af = dst->sa_family;
|
||||
|
||||
m0.m_next = m;
|
||||
m0.m_len = 4;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_loop.c,v 1.36 2001/01/17 04:05:42 itojun Exp $ */
|
||||
/* $NetBSD: if_loop.c,v 1.37 2001/02/20 07:58:17 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
|
@ -197,7 +197,7 @@ looutput(ifp, m, dst, rt)
|
|||
* try to free it or keep a pointer to it).
|
||||
*/
|
||||
struct mbuf m0;
|
||||
u_int af = dst->sa_family;
|
||||
u_int32_t af = dst->sa_family;
|
||||
|
||||
m0.m_next = m;
|
||||
m0.m_len = 4;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_stf.c,v 1.11 2001/02/17 04:29:59 itojun Exp $ */
|
||||
/* $NetBSD: if_stf.c,v 1.12 2001/02/20 07:58:17 itojun Exp $ */
|
||||
/* $KAME: if_stf.c,v 1.53 2001/02/16 03:00:30 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
@ -651,7 +651,7 @@ in_stf_input(m, va_alist)
|
|||
* try to free it or keep a pointer a to it).
|
||||
*/
|
||||
struct mbuf m0;
|
||||
u_int af = AF_INET6;
|
||||
u_int32_t af = AF_INET6;
|
||||
|
||||
m0.m_next = m;
|
||||
m0.m_len = 4;
|
||||
|
|
Loading…
Reference in New Issue