mirror of
https://git.FreeBSD.org/src.git
synced 2024-11-30 08:19:09 +00:00
Overhaul if_gif(4):
o convert to if_transmit; o use rmlock to protect access to gif_softc; o use sx lock to protect from concurrent ioctls; o remove a lot of unneeded and duplicated code; o remove cached route support (it won't work with concurrent io); o style fixes. Reviewed by: melifaro Obtained from: Yandex LLC MFC after: 1 month Sponsored by: Yandex LLC
This commit is contained in:
Andrey V. Elsukov
parent
f7b9150ee9
commit
0b9f5f8a5f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=273087
@ -29,7 +29,7 @@
|
||||
.\"
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd August 1, 2011
|
||||
.Dd October 14, 2014
|
||||
.Dt GIF 4
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -160,16 +160,6 @@ routed network.
|
||||
It can be turned off by
|
||||
.Dv IFF_LINK2
|
||||
bit.
|
||||
.Ss Route caching
|
||||
Processing each packet requires two route lookups: first on the
|
||||
packet itself, and second on the tunnel destination.
|
||||
This second route can be cached, increasing tunnel performance.
|
||||
However, in a dynamically routed network, the tunnel will stick
|
||||
to the cached route, ignoring routing table updates.
|
||||
Route caching can be enabled with the
|
||||
.Dv IFF_LINK0
|
||||
flag.
|
||||
.\"
|
||||
.Ss Miscellaneous
|
||||
By default,
|
||||
.Nm
|
||||
|
||||
943
sys/net/if_gif.c
943
sys/net/if_gif.c
File diff suppressed because it is too large
Load Diff
@ -30,21 +30,17 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* if_gif.h
|
||||
*/
|
||||
|
||||
#ifndef _NET_IF_GIF_H_
|
||||
#define _NET_IF_GIF_H_
|
||||
|
||||
|
||||
#ifdef _KERNEL
|
||||
#include "opt_inet.h"
|
||||
#include "opt_inet6.h"
|
||||
|
||||
#include <netinet/in.h>
|
||||
/* xxx sigh, why route have struct route instead of pointer? */
|
||||
|
||||
struct ip;
|
||||
struct ip6_hdr;
|
||||
struct encaptab;
|
||||
|
||||
extern void (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp,
|
||||
@ -56,35 +52,38 @@ extern void (*ng_gif_attach_p)(struct ifnet *ifp);
|
||||
extern void (*ng_gif_detach_p)(struct ifnet *ifp);
|
||||
|
||||
struct gif_softc {
|
||||
struct ifnet *gif_ifp;
|
||||
struct mtx gif_mtx;
|
||||
struct sockaddr *gif_psrc; /* Physical src addr */
|
||||
struct sockaddr *gif_pdst; /* Physical dst addr */
|
||||
struct ifnet *gif_ifp;
|
||||
struct rmlock gif_lock;
|
||||
const struct encaptab *gif_ecookie;
|
||||
int gif_family;
|
||||
int gif_flags;
|
||||
u_int gif_fibnum;
|
||||
u_int gif_options;
|
||||
void *gif_netgraph; /* netgraph node info */
|
||||
union {
|
||||
struct route gifscr_ro; /* xxx */
|
||||
void *hdr;
|
||||
struct ip *iphdr;
|
||||
#ifdef INET6
|
||||
struct route_in6 gifscr_ro6; /* xxx */
|
||||
struct ip6_hdr *ip6hdr;
|
||||
#endif
|
||||
} gifsc_gifscr;
|
||||
int gif_flags;
|
||||
u_int gif_fibnum;
|
||||
const struct encaptab *encap_cookie4;
|
||||
const struct encaptab *encap_cookie6;
|
||||
void *gif_netgraph; /* ng_gif(4) netgraph node info */
|
||||
u_int gif_options;
|
||||
LIST_ENTRY(gif_softc) gif_list; /* all gif's are linked */
|
||||
} gif_uhdr;
|
||||
LIST_ENTRY(gif_softc) gif_list; /* all gif's are linked */
|
||||
};
|
||||
#define GIF2IFP(sc) ((sc)->gif_ifp)
|
||||
#define GIF_LOCK_INIT(sc) mtx_init(&(sc)->gif_mtx, "gif softc", \
|
||||
NULL, MTX_DEF)
|
||||
#define GIF_LOCK_DESTROY(sc) mtx_destroy(&(sc)->gif_mtx)
|
||||
#define GIF_LOCK(sc) mtx_lock(&(sc)->gif_mtx)
|
||||
#define GIF_UNLOCK(sc) mtx_unlock(&(sc)->gif_mtx)
|
||||
#define GIF_LOCK_ASSERT(sc) mtx_assert(&(sc)->gif_mtx, MA_OWNED)
|
||||
#define GIF_LOCK_INIT(sc) rm_init(&(sc)->gif_lock, "gif softc")
|
||||
#define GIF_LOCK_DESTROY(sc) rm_destroy(&(sc)->gif_lock)
|
||||
#define GIF_RLOCK_TRACKER struct rm_priotracker gif_tracker
|
||||
#define GIF_RLOCK(sc) rm_rlock(&(sc)->gif_lock, &gif_tracker)
|
||||
#define GIF_RUNLOCK(sc) rm_runlock(&(sc)->gif_lock, &gif_tracker)
|
||||
#define GIF_RLOCK_ASSERT(sc) rm_assert(&(sc)->gif_lock, RA_RLOCKED)
|
||||
#define GIF_WLOCK(sc) rm_wlock(&(sc)->gif_lock)
|
||||
#define GIF_WUNLOCK(sc) rm_wunlock(&(sc)->gif_lock)
|
||||
#define GIF_WLOCK_ASSERT(sc) rm_assert(&(sc)->gif_lock, RA_WLOCKED)
|
||||
|
||||
#define gif_ro gifsc_gifscr.gifscr_ro
|
||||
#define gif_iphdr gif_uhdr.iphdr
|
||||
#define gif_hdr gif_uhdr.hdr
|
||||
#ifdef INET6
|
||||
#define gif_ro6 gifsc_gifscr.gifscr_ro6
|
||||
#define gif_ip6hdr gif_uhdr.ip6hdr
|
||||
#endif
|
||||
|
||||
#define GIF_MTU (1280) /* Default MTU */
|
||||
@ -111,12 +110,9 @@ struct etherip_header {
|
||||
#define ETHERIP_ALIGN 2
|
||||
|
||||
/* Prototypes */
|
||||
void gif_input(struct mbuf *, int, struct ifnet *);
|
||||
void gif_input(struct mbuf *, struct ifnet *, int, uint8_t);
|
||||
int gif_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
|
||||
struct route *);
|
||||
int gif_ioctl(struct ifnet *, u_long, caddr_t);
|
||||
int gif_set_tunnel(struct ifnet *, struct sockaddr *, struct sockaddr *);
|
||||
void gif_delete_tunnel(struct ifnet *);
|
||||
int gif_encapcheck(const struct mbuf *, int, int, void *);
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
* All rights reserved.
|
||||
@ -27,16 +25,19 @@
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include "opt_mrouting.h"
|
||||
#include "opt_inet.h"
|
||||
#include "opt_inet6.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/lock.h>
|
||||
#include <sys/rmlock.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/sockio.h>
|
||||
@ -65,11 +66,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <netinet/ip6.h>
|
||||
#endif
|
||||
|
||||
#ifdef MROUTING
|
||||
#include <netinet/ip_mroute.h>
|
||||
#endif /* MROUTING */
|
||||
|
||||
#include <net/if_gif.h>
|
||||
#include <net/if_gif.h>
|
||||
|
||||
static int gif_validate4(const struct ip *, struct gif_softc *,
|
||||
struct ifnet *);
|
||||
@ -92,127 +89,26 @@ SYSCTL_VNET_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW,
|
||||
&VNET_NAME(ip_gif_ttl), 0, "");
|
||||
|
||||
int
|
||||
in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
|
||||
in_gif_output(struct ifnet *ifp, struct mbuf *m, int proto, uint8_t ecn)
|
||||
{
|
||||
GIF_RLOCK_TRACKER;
|
||||
struct gif_softc *sc = ifp->if_softc;
|
||||
struct sockaddr_in *dst = (struct sockaddr_in *)&sc->gif_ro.ro_dst;
|
||||
struct sockaddr_in *sin_src = (struct sockaddr_in *)sc->gif_psrc;
|
||||
struct sockaddr_in *sin_dst = (struct sockaddr_in *)sc->gif_pdst;
|
||||
struct ip iphdr; /* capsule IP header, host byte ordered */
|
||||
struct etherip_header eiphdr;
|
||||
int error, len, proto;
|
||||
u_int8_t tos;
|
||||
|
||||
GIF_LOCK_ASSERT(sc);
|
||||
|
||||
if (sin_src == NULL || sin_dst == NULL ||
|
||||
sin_src->sin_family != AF_INET ||
|
||||
sin_dst->sin_family != AF_INET) {
|
||||
m_freem(m);
|
||||
return EAFNOSUPPORT;
|
||||
}
|
||||
|
||||
switch (family) {
|
||||
#ifdef INET
|
||||
case AF_INET:
|
||||
{
|
||||
struct ip *ip;
|
||||
|
||||
proto = IPPROTO_IPV4;
|
||||
if (m->m_len < sizeof(*ip)) {
|
||||
m = m_pullup(m, sizeof(*ip));
|
||||
if (!m)
|
||||
return ENOBUFS;
|
||||
}
|
||||
ip = mtod(m, struct ip *);
|
||||
tos = ip->ip_tos;
|
||||
break;
|
||||
}
|
||||
#endif /* INET */
|
||||
#ifdef INET6
|
||||
case AF_INET6:
|
||||
{
|
||||
struct ip6_hdr *ip6;
|
||||
proto = IPPROTO_IPV6;
|
||||
if (m->m_len < sizeof(*ip6)) {
|
||||
m = m_pullup(m, sizeof(*ip6));
|
||||
if (!m)
|
||||
return ENOBUFS;
|
||||
}
|
||||
ip6 = mtod(m, struct ip6_hdr *);
|
||||
tos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
|
||||
break;
|
||||
}
|
||||
#endif /* INET6 */
|
||||
case AF_LINK:
|
||||
proto = IPPROTO_ETHERIP;
|
||||
|
||||
/*
|
||||
* GIF_SEND_REVETHIP (disabled by default) intentionally
|
||||
* sends an EtherIP packet with revered version field in
|
||||
* the header. This is a knob for backward compatibility
|
||||
* with FreeBSD 7.2R or prior.
|
||||
*/
|
||||
if ((sc->gif_options & GIF_SEND_REVETHIP)) {
|
||||
eiphdr.eip_ver = 0;
|
||||
eiphdr.eip_resvl = ETHERIP_VERSION;
|
||||
eiphdr.eip_resvh = 0;
|
||||
} else {
|
||||
eiphdr.eip_ver = ETHERIP_VERSION;
|
||||
eiphdr.eip_resvl = 0;
|
||||
eiphdr.eip_resvh = 0;
|
||||
}
|
||||
/* prepend Ethernet-in-IP header */
|
||||
M_PREPEND(m, sizeof(struct etherip_header), M_NOWAIT);
|
||||
if (m && m->m_len < sizeof(struct etherip_header))
|
||||
m = m_pullup(m, sizeof(struct etherip_header));
|
||||
if (m == NULL)
|
||||
return ENOBUFS;
|
||||
bcopy(&eiphdr, mtod(m, struct etherip_header *),
|
||||
sizeof(struct etherip_header));
|
||||
tos = 0;
|
||||
break;
|
||||
|
||||
default:
|
||||
#ifdef DEBUG
|
||||
printf("in_gif_output: warning: unknown family %d passed\n",
|
||||
family);
|
||||
#endif
|
||||
m_freem(m);
|
||||
return EAFNOSUPPORT;
|
||||
}
|
||||
|
||||
bzero(&iphdr, sizeof(iphdr));
|
||||
iphdr.ip_src = sin_src->sin_addr;
|
||||
/* bidirectional configured tunnel mode */
|
||||
if (sin_dst->sin_addr.s_addr != INADDR_ANY)
|
||||
iphdr.ip_dst = sin_dst->sin_addr;
|
||||
else {
|
||||
m_freem(m);
|
||||
return ENETUNREACH;
|
||||
}
|
||||
iphdr.ip_p = proto;
|
||||
/* version will be set in ip_output() */
|
||||
iphdr.ip_ttl = V_ip_gif_ttl;
|
||||
iphdr.ip_len = htons(m->m_pkthdr.len + sizeof(struct ip));
|
||||
ip_ecn_ingress((ifp->if_flags & IFF_LINK1) ? ECN_ALLOWED : ECN_NOCARE,
|
||||
&iphdr.ip_tos, &tos);
|
||||
struct ip *ip;
|
||||
int len;
|
||||
|
||||
/* prepend new IP header */
|
||||
len = sizeof(struct ip);
|
||||
#ifndef __NO_STRICT_ALIGNMENT
|
||||
if (family == AF_LINK)
|
||||
if (proto == IPPROTO_ETHERIP)
|
||||
len += ETHERIP_ALIGN;
|
||||
#endif
|
||||
M_PREPEND(m, len, M_NOWAIT);
|
||||
if (m != NULL && m->m_len < len)
|
||||
m = m_pullup(m, len);
|
||||
if (m == NULL) {
|
||||
printf("ENOBUFS in in_gif_output %d\n", __LINE__);
|
||||
return ENOBUFS;
|
||||
}
|
||||
if (m == NULL)
|
||||
return (ENOBUFS);
|
||||
#ifndef __NO_STRICT_ALIGNMENT
|
||||
if (family == AF_LINK) {
|
||||
if (proto == IPPROTO_ETHERIP) {
|
||||
len = mtod(m, vm_offset_t) & 3;
|
||||
KASSERT(len == 0 || len == ETHERIP_ALIGN,
|
||||
("in_gif_output: unexpected misalignment"));
|
||||
@ -220,147 +116,50 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
|
||||
m->m_len -= ETHERIP_ALIGN;
|
||||
}
|
||||
#endif
|
||||
bcopy(&iphdr, mtod(m, struct ip *), sizeof(struct ip));
|
||||
|
||||
M_SETFIB(m, sc->gif_fibnum);
|
||||
|
||||
if (dst->sin_family != sin_dst->sin_family ||
|
||||
dst->sin_addr.s_addr != sin_dst->sin_addr.s_addr) {
|
||||
/* cache route doesn't match */
|
||||
bzero(dst, sizeof(*dst));
|
||||
dst->sin_family = sin_dst->sin_family;
|
||||
dst->sin_len = sizeof(struct sockaddr_in);
|
||||
dst->sin_addr = sin_dst->sin_addr;
|
||||
if (sc->gif_ro.ro_rt) {
|
||||
RTFREE(sc->gif_ro.ro_rt);
|
||||
sc->gif_ro.ro_rt = NULL;
|
||||
}
|
||||
#if 0
|
||||
GIF2IFP(sc)->if_mtu = GIF_MTU;
|
||||
#endif
|
||||
ip = mtod(m, struct ip *);
|
||||
GIF_RLOCK(sc);
|
||||
if (sc->gif_family != AF_INET) {
|
||||
m_freem(m);
|
||||
GIF_RUNLOCK(sc);
|
||||
return (ENETDOWN);
|
||||
}
|
||||
bcopy(sc->gif_iphdr, ip, sizeof(struct ip));
|
||||
GIF_RUNLOCK(sc);
|
||||
|
||||
if (sc->gif_ro.ro_rt == NULL) {
|
||||
in_rtalloc_ign(&sc->gif_ro, 0, sc->gif_fibnum);
|
||||
if (sc->gif_ro.ro_rt == NULL) {
|
||||
m_freem(m);
|
||||
return ENETUNREACH;
|
||||
}
|
||||
ip->ip_p = proto;
|
||||
/* version will be set in ip_output() */
|
||||
ip->ip_ttl = V_ip_gif_ttl;
|
||||
ip->ip_len = htons(m->m_pkthdr.len);
|
||||
ip->ip_tos = ecn;
|
||||
|
||||
/* if it constitutes infinite encapsulation, punt. */
|
||||
if (sc->gif_ro.ro_rt->rt_ifp == ifp) {
|
||||
m_freem(m);
|
||||
return ENETUNREACH; /* XXX */
|
||||
}
|
||||
#if 0
|
||||
ifp->if_mtu = sc->gif_ro.ro_rt->rt_ifp->if_mtu
|
||||
- sizeof(struct ip);
|
||||
#endif
|
||||
}
|
||||
|
||||
m->m_flags &= ~(M_BCAST|M_MCAST);
|
||||
error = ip_output(m, NULL, &sc->gif_ro, 0, NULL, NULL);
|
||||
|
||||
if (!(GIF2IFP(sc)->if_flags & IFF_LINK0) &&
|
||||
sc->gif_ro.ro_rt != NULL) {
|
||||
RTFREE(sc->gif_ro.ro_rt);
|
||||
sc->gif_ro.ro_rt = NULL;
|
||||
}
|
||||
|
||||
return (error);
|
||||
return (ip_output(m, NULL, NULL, 0, NULL, NULL));
|
||||
}
|
||||
|
||||
int
|
||||
in_gif_input(struct mbuf **mp, int *offp, int proto)
|
||||
{
|
||||
struct mbuf *m;
|
||||
struct ifnet *gifp = NULL;
|
||||
struct mbuf *m = *mp;
|
||||
struct gif_softc *sc;
|
||||
struct ifnet *gifp;
|
||||
struct ip *ip;
|
||||
int af;
|
||||
int off;
|
||||
u_int8_t otos;
|
||||
uint8_t ecn;
|
||||
|
||||
m = *mp;
|
||||
ip = mtod(m, struct ip *);
|
||||
off = *offp;
|
||||
*mp = NULL;
|
||||
|
||||
sc = (struct gif_softc *)encap_getarg(m);
|
||||
sc = encap_getarg(m);
|
||||
if (sc == NULL) {
|
||||
m_freem(m);
|
||||
KMOD_IPSTAT_INC(ips_nogif);
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
|
||||
gifp = GIF2IFP(sc);
|
||||
if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) {
|
||||
m_freem(m);
|
||||
KMOD_IPSTAT_INC(ips_nogif);
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
|
||||
otos = ip->ip_tos;
|
||||
m_adj(m, off);
|
||||
|
||||
switch (proto) {
|
||||
#ifdef INET
|
||||
case IPPROTO_IPV4:
|
||||
{
|
||||
struct ip *ip;
|
||||
af = AF_INET;
|
||||
if (m->m_len < sizeof(*ip)) {
|
||||
m = m_pullup(m, sizeof(*ip));
|
||||
if (!m)
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
if ((gifp->if_flags & IFF_UP) != 0) {
|
||||
ip = mtod(m, struct ip *);
|
||||
if (ip_ecn_egress((gifp->if_flags & IFF_LINK1) ?
|
||||
ECN_ALLOWED : ECN_NOCARE,
|
||||
&otos, &ip->ip_tos) == 0) {
|
||||
m_freem(m);
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
#ifdef INET6
|
||||
case IPPROTO_IPV6:
|
||||
{
|
||||
struct ip6_hdr *ip6;
|
||||
u_int8_t itos, oitos;
|
||||
|
||||
af = AF_INET6;
|
||||
if (m->m_len < sizeof(*ip6)) {
|
||||
m = m_pullup(m, sizeof(*ip6));
|
||||
if (!m)
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
ip6 = mtod(m, struct ip6_hdr *);
|
||||
itos = oitos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
|
||||
if (ip_ecn_egress((gifp->if_flags & IFF_LINK1) ?
|
||||
ECN_ALLOWED : ECN_NOCARE,
|
||||
&otos, &itos) == 0) {
|
||||
m_freem(m);
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
if (itos != oitos) {
|
||||
ip6->ip6_flow &= ~htonl(0xff << 20);
|
||||
ip6->ip6_flow |= htonl((u_int32_t)itos << 20);
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif /* INET6 */
|
||||
case IPPROTO_ETHERIP:
|
||||
af = AF_LINK;
|
||||
break;
|
||||
|
||||
default:
|
||||
KMOD_IPSTAT_INC(ips_nogif);
|
||||
ecn = ip->ip_tos;
|
||||
m_adj(m, *offp);
|
||||
gif_input(m, gifp, proto, ecn);
|
||||
} else {
|
||||
m_freem(m);
|
||||
return (IPPROTO_DONE);
|
||||
KMOD_IPSTAT_INC(ips_nogif);
|
||||
}
|
||||
gif_input(m, af, gifp);
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
|
||||
@ -370,23 +169,23 @@ in_gif_input(struct mbuf **mp, int *offp, int proto)
|
||||
static int
|
||||
gif_validate4(const struct ip *ip, struct gif_softc *sc, struct ifnet *ifp)
|
||||
{
|
||||
struct sockaddr_in *src, *dst;
|
||||
struct in_ifaddr *ia4;
|
||||
|
||||
src = (struct sockaddr_in *)sc->gif_psrc;
|
||||
dst = (struct sockaddr_in *)sc->gif_pdst;
|
||||
GIF_RLOCK_ASSERT(sc);
|
||||
|
||||
/* check for address match */
|
||||
if (src->sin_addr.s_addr != ip->ip_dst.s_addr ||
|
||||
dst->sin_addr.s_addr != ip->ip_src.s_addr)
|
||||
return 0;
|
||||
if (sc->gif_iphdr->ip_src.s_addr != ip->ip_dst.s_addr ||
|
||||
sc->gif_iphdr->ip_dst.s_addr != ip->ip_src.s_addr)
|
||||
return (0);
|
||||
|
||||
/* martian filters on outer source - NOT done in ip_input! */
|
||||
if (IN_MULTICAST(ntohl(ip->ip_src.s_addr)))
|
||||
return 0;
|
||||
return (0);
|
||||
switch ((ntohl(ip->ip_src.s_addr) & 0xff000000) >> 24) {
|
||||
case 0: case 127: case 255:
|
||||
return 0;
|
||||
case 0:
|
||||
case 127:
|
||||
case 255:
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* reject packets with broadcast on source */
|
||||
@ -397,7 +196,7 @@ gif_validate4(const struct ip *ip, struct gif_softc *sc, struct ifnet *ifp)
|
||||
continue;
|
||||
if (ip->ip_src.s_addr == ia4->ia_broadaddr.sin_addr.s_addr) {
|
||||
IN_IFADDR_RUNLOCK();
|
||||
return 0;
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
IN_IFADDR_RUNLOCK();
|
||||
@ -415,19 +214,13 @@ gif_validate4(const struct ip *ip, struct gif_softc *sc, struct ifnet *ifp)
|
||||
rt = in_rtalloc1((struct sockaddr *)&sin, 0,
|
||||
0UL, sc->gif_fibnum);
|
||||
if (!rt || rt->rt_ifp != ifp) {
|
||||
#if 0
|
||||
log(LOG_WARNING, "%s: packet from 0x%x dropped "
|
||||
"due to ingress filter\n", if_name(GIF2IFP(sc)),
|
||||
(u_int32_t)ntohl(sin.sin_addr.s_addr));
|
||||
#endif
|
||||
if (rt)
|
||||
RTFREE_LOCKED(rt);
|
||||
return 0;
|
||||
return (0);
|
||||
}
|
||||
RTFREE_LOCKED(rt);
|
||||
}
|
||||
|
||||
return 32 * 2;
|
||||
return (32 * 2);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -435,7 +228,7 @@ gif_validate4(const struct ip *ip, struct gif_softc *sc, struct ifnet *ifp)
|
||||
* matched the physical addr family. see gif_encapcheck().
|
||||
*/
|
||||
int
|
||||
gif_encapcheck4(const struct mbuf *m, int off, int proto, void *arg)
|
||||
in_gif_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
|
||||
{
|
||||
struct ip ip;
|
||||
struct gif_softc *sc;
|
||||
@ -443,31 +236,21 @@ gif_encapcheck4(const struct mbuf *m, int off, int proto, void *arg)
|
||||
|
||||
/* sanity check done in caller */
|
||||
sc = (struct gif_softc *)arg;
|
||||
GIF_RLOCK_ASSERT(sc);
|
||||
|
||||
/* LINTED const cast */
|
||||
m_copydata(m, 0, sizeof(ip), (caddr_t)&ip);
|
||||
ifp = ((m->m_flags & M_PKTHDR) != 0) ? m->m_pkthdr.rcvif : NULL;
|
||||
|
||||
return gif_validate4(&ip, sc, ifp);
|
||||
return (gif_validate4(&ip, sc, ifp));
|
||||
}
|
||||
|
||||
int
|
||||
in_gif_attach(struct gif_softc *sc)
|
||||
{
|
||||
sc->encap_cookie4 = encap_attach_func(AF_INET, -1, gif_encapcheck,
|
||||
|
||||
KASSERT(sc->gif_ecookie == NULL, ("gif_ecookie isn't NULL"));
|
||||
sc->gif_ecookie = encap_attach_func(AF_INET, -1, gif_encapcheck,
|
||||
&in_gif_protosw, sc);
|
||||
if (sc->encap_cookie4 == NULL)
|
||||
return EEXIST;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
in_gif_detach(struct gif_softc *sc)
|
||||
{
|
||||
int error;
|
||||
|
||||
error = encap_detach(sc->encap_cookie4);
|
||||
if (error == 0)
|
||||
sc->encap_cookie4 = NULL;
|
||||
return error;
|
||||
if (sc->gif_ecookie == NULL)
|
||||
return (EEXIST);
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -37,9 +37,8 @@
|
||||
|
||||
struct gif_softc;
|
||||
int in_gif_input(struct mbuf **, int *, int);
|
||||
int in_gif_output(struct ifnet *, int, struct mbuf *);
|
||||
int gif_encapcheck4(const struct mbuf *, int, int, void *);
|
||||
int in_gif_output(struct ifnet *, struct mbuf *, int, uint8_t);
|
||||
int in_gif_encapcheck(const struct mbuf *, int, int, void *);
|
||||
int in_gif_attach(struct gif_softc *);
|
||||
int in_gif_detach(struct gif_softc *);
|
||||
|
||||
#endif /*_NETINET_IN_GIF_H_*/
|
||||
|
||||
@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
|
||||
#include "opt_inet6.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/lock.h>
|
||||
#include <sys/rmlock.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/sockio.h>
|
||||
@ -95,113 +97,26 @@ struct protosw in6_gif_protosw = {
|
||||
};
|
||||
|
||||
int
|
||||
in6_gif_output(struct ifnet *ifp,
|
||||
int family, /* family of the packet to be encapsulate */
|
||||
struct mbuf *m)
|
||||
in6_gif_output(struct ifnet *ifp, struct mbuf *m, int proto, uint8_t ecn)
|
||||
{
|
||||
GIF_RLOCK_TRACKER;
|
||||
struct gif_softc *sc = ifp->if_softc;
|
||||
struct sockaddr_in6 *dst = (struct sockaddr_in6 *)&sc->gif_ro6.ro_dst;
|
||||
struct sockaddr_in6 *sin6_src = (struct sockaddr_in6 *)sc->gif_psrc;
|
||||
struct sockaddr_in6 *sin6_dst = (struct sockaddr_in6 *)sc->gif_pdst;
|
||||
struct ip6_hdr *ip6;
|
||||
struct etherip_header eiphdr;
|
||||
int error, len, proto;
|
||||
u_int8_t itos, otos;
|
||||
|
||||
GIF_LOCK_ASSERT(sc);
|
||||
|
||||
if (sin6_src == NULL || sin6_dst == NULL ||
|
||||
sin6_src->sin6_family != AF_INET6 ||
|
||||
sin6_dst->sin6_family != AF_INET6) {
|
||||
m_freem(m);
|
||||
return EAFNOSUPPORT;
|
||||
}
|
||||
|
||||
switch (family) {
|
||||
#ifdef INET
|
||||
case AF_INET:
|
||||
{
|
||||
struct ip *ip;
|
||||
|
||||
proto = IPPROTO_IPV4;
|
||||
if (m->m_len < sizeof(*ip)) {
|
||||
m = m_pullup(m, sizeof(*ip));
|
||||
if (!m)
|
||||
return ENOBUFS;
|
||||
}
|
||||
ip = mtod(m, struct ip *);
|
||||
itos = ip->ip_tos;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
#ifdef INET6
|
||||
case AF_INET6:
|
||||
{
|
||||
struct ip6_hdr *ip6;
|
||||
proto = IPPROTO_IPV6;
|
||||
if (m->m_len < sizeof(*ip6)) {
|
||||
m = m_pullup(m, sizeof(*ip6));
|
||||
if (!m)
|
||||
return ENOBUFS;
|
||||
}
|
||||
ip6 = mtod(m, struct ip6_hdr *);
|
||||
itos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
case AF_LINK:
|
||||
proto = IPPROTO_ETHERIP;
|
||||
|
||||
/*
|
||||
* GIF_SEND_REVETHIP (disabled by default) intentionally
|
||||
* sends an EtherIP packet with revered version field in
|
||||
* the header. This is a knob for backward compatibility
|
||||
* with FreeBSD 7.2R or prior.
|
||||
*/
|
||||
if ((sc->gif_options & GIF_SEND_REVETHIP)) {
|
||||
eiphdr.eip_ver = 0;
|
||||
eiphdr.eip_resvl = ETHERIP_VERSION;
|
||||
eiphdr.eip_resvh = 0;
|
||||
} else {
|
||||
eiphdr.eip_ver = ETHERIP_VERSION;
|
||||
eiphdr.eip_resvl = 0;
|
||||
eiphdr.eip_resvh = 0;
|
||||
}
|
||||
/* prepend Ethernet-in-IP header */
|
||||
M_PREPEND(m, sizeof(struct etherip_header), M_NOWAIT);
|
||||
if (m && m->m_len < sizeof(struct etherip_header))
|
||||
m = m_pullup(m, sizeof(struct etherip_header));
|
||||
if (m == NULL)
|
||||
return ENOBUFS;
|
||||
bcopy(&eiphdr, mtod(m, struct etherip_header *),
|
||||
sizeof(struct etherip_header));
|
||||
itos = 0;
|
||||
break;
|
||||
|
||||
default:
|
||||
#ifdef DEBUG
|
||||
printf("in6_gif_output: warning: unknown family %d passed\n",
|
||||
family);
|
||||
#endif
|
||||
m_freem(m);
|
||||
return EAFNOSUPPORT;
|
||||
}
|
||||
int len;
|
||||
|
||||
/* prepend new IP header */
|
||||
len = sizeof(struct ip6_hdr);
|
||||
#ifndef __NO_STRICT_ALIGNMENT
|
||||
if (family == AF_LINK)
|
||||
if (proto == IPPROTO_ETHERIP)
|
||||
len += ETHERIP_ALIGN;
|
||||
#endif
|
||||
M_PREPEND(m, len, M_NOWAIT);
|
||||
if (m != NULL && m->m_len < len)
|
||||
m = m_pullup(m, len);
|
||||
if (m == NULL) {
|
||||
printf("ENOBUFS in in6_gif_output %d\n", __LINE__);
|
||||
return ENOBUFS;
|
||||
}
|
||||
if (m == NULL)
|
||||
return (ENOBUFS);
|
||||
#ifndef __NO_STRICT_ALIGNMENT
|
||||
if (family == AF_LINK) {
|
||||
if (proto == IPPROTO_ETHERIP) {
|
||||
len = mtod(m, vm_offset_t) & 3;
|
||||
KASSERT(len == 0 || len == ETHERIP_ALIGN,
|
||||
("in6_gif_output: unexpected misalignment"));
|
||||
@ -211,166 +126,52 @@ in6_gif_output(struct ifnet *ifp,
|
||||
#endif
|
||||
|
||||
ip6 = mtod(m, struct ip6_hdr *);
|
||||
ip6->ip6_flow = 0;
|
||||
ip6->ip6_vfc &= ~IPV6_VERSION_MASK;
|
||||
ip6->ip6_vfc |= IPV6_VERSION;
|
||||
ip6->ip6_plen = htons((u_short)m->m_pkthdr.len);
|
||||
GIF_RLOCK(sc);
|
||||
if (sc->gif_family != AF_INET6) {
|
||||
m_freem(m);
|
||||
GIF_RUNLOCK(sc);
|
||||
return (ENETDOWN);
|
||||
}
|
||||
bcopy(sc->gif_ip6hdr, ip6, sizeof(struct ip6_hdr));
|
||||
GIF_RUNLOCK(sc);
|
||||
|
||||
ip6->ip6_flow |= htonl((uint32_t)ecn << 20);
|
||||
ip6->ip6_nxt = proto;
|
||||
ip6->ip6_hlim = V_ip6_gif_hlim;
|
||||
ip6->ip6_src = sin6_src->sin6_addr;
|
||||
/* bidirectional configured tunnel mode */
|
||||
if (!IN6_IS_ADDR_UNSPECIFIED(&sin6_dst->sin6_addr))
|
||||
ip6->ip6_dst = sin6_dst->sin6_addr;
|
||||
else {
|
||||
m_freem(m);
|
||||
return ENETUNREACH;
|
||||
}
|
||||
ip_ecn_ingress((ifp->if_flags & IFF_LINK1) ? ECN_ALLOWED : ECN_NOCARE,
|
||||
&otos, &itos);
|
||||
ip6->ip6_flow &= ~htonl(0xff << 20);
|
||||
ip6->ip6_flow |= htonl((u_int32_t)otos << 20);
|
||||
|
||||
M_SETFIB(m, sc->gif_fibnum);
|
||||
|
||||
if (dst->sin6_family != sin6_dst->sin6_family ||
|
||||
!IN6_ARE_ADDR_EQUAL(&dst->sin6_addr, &sin6_dst->sin6_addr)) {
|
||||
/* cache route doesn't match */
|
||||
bzero(dst, sizeof(*dst));
|
||||
dst->sin6_family = sin6_dst->sin6_family;
|
||||
dst->sin6_len = sizeof(struct sockaddr_in6);
|
||||
dst->sin6_addr = sin6_dst->sin6_addr;
|
||||
if (sc->gif_ro6.ro_rt) {
|
||||
RTFREE(sc->gif_ro6.ro_rt);
|
||||
sc->gif_ro6.ro_rt = NULL;
|
||||
}
|
||||
#if 0
|
||||
GIF2IFP(sc)->if_mtu = GIF_MTU;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (sc->gif_ro6.ro_rt == NULL) {
|
||||
in6_rtalloc(&sc->gif_ro6, sc->gif_fibnum);
|
||||
if (sc->gif_ro6.ro_rt == NULL) {
|
||||
m_freem(m);
|
||||
return ENETUNREACH;
|
||||
}
|
||||
|
||||
/* if it constitutes infinite encapsulation, punt. */
|
||||
if (sc->gif_ro.ro_rt->rt_ifp == ifp) {
|
||||
m_freem(m);
|
||||
return ENETUNREACH; /*XXX*/
|
||||
}
|
||||
#if 0
|
||||
ifp->if_mtu = sc->gif_ro6.ro_rt->rt_ifp->if_mtu
|
||||
- sizeof(struct ip6_hdr);
|
||||
#endif
|
||||
}
|
||||
|
||||
m->m_flags &= ~(M_BCAST|M_MCAST);
|
||||
#ifdef IPV6_MINMTU
|
||||
/*
|
||||
* force fragmentation to minimum MTU, to avoid path MTU discovery.
|
||||
* it is too painful to ask for resend of inner packet, to achieve
|
||||
* path MTU discovery for encapsulated packets.
|
||||
*/
|
||||
error = ip6_output(m, 0, &sc->gif_ro6, IPV6_MINMTU, 0, NULL, NULL);
|
||||
#else
|
||||
error = ip6_output(m, 0, &sc->gif_ro6, 0, 0, NULL, NULL);
|
||||
#endif
|
||||
|
||||
if (!(GIF2IFP(sc)->if_flags & IFF_LINK0) &&
|
||||
sc->gif_ro6.ro_rt != NULL) {
|
||||
RTFREE(sc->gif_ro6.ro_rt);
|
||||
sc->gif_ro6.ro_rt = NULL;
|
||||
}
|
||||
|
||||
return (error);
|
||||
return (ip6_output(m, 0, NULL, IPV6_MINMTU, 0, NULL, NULL));
|
||||
}
|
||||
|
||||
int
|
||||
in6_gif_input(struct mbuf **mp, int *offp, int proto)
|
||||
{
|
||||
struct mbuf *m = *mp;
|
||||
struct ifnet *gifp = NULL;
|
||||
struct ifnet *gifp;
|
||||
struct gif_softc *sc;
|
||||
struct ip6_hdr *ip6;
|
||||
int af = 0;
|
||||
u_int32_t otos;
|
||||
uint8_t ecn;
|
||||
|
||||
ip6 = mtod(m, struct ip6_hdr *);
|
||||
|
||||
sc = (struct gif_softc *)encap_getarg(m);
|
||||
sc = encap_getarg(m);
|
||||
if (sc == NULL) {
|
||||
m_freem(m);
|
||||
IP6STAT_INC(ip6s_nogif);
|
||||
return IPPROTO_DONE;
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
|
||||
gifp = GIF2IFP(sc);
|
||||
if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) {
|
||||
m_freem(m);
|
||||
IP6STAT_INC(ip6s_nogif);
|
||||
return IPPROTO_DONE;
|
||||
}
|
||||
|
||||
otos = ip6->ip6_flow;
|
||||
m_adj(m, *offp);
|
||||
|
||||
switch (proto) {
|
||||
#ifdef INET
|
||||
case IPPROTO_IPV4:
|
||||
{
|
||||
struct ip *ip;
|
||||
u_int8_t otos8;
|
||||
af = AF_INET;
|
||||
otos8 = (ntohl(otos) >> 20) & 0xff;
|
||||
if (m->m_len < sizeof(*ip)) {
|
||||
m = m_pullup(m, sizeof(*ip));
|
||||
if (!m)
|
||||
return IPPROTO_DONE;
|
||||
}
|
||||
ip = mtod(m, struct ip *);
|
||||
if (ip_ecn_egress((gifp->if_flags & IFF_LINK1) ?
|
||||
ECN_ALLOWED : ECN_NOCARE,
|
||||
&otos8, &ip->ip_tos) == 0) {
|
||||
m_freem(m);
|
||||
return IPPROTO_DONE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif /* INET */
|
||||
#ifdef INET6
|
||||
case IPPROTO_IPV6:
|
||||
{
|
||||
struct ip6_hdr *ip6;
|
||||
af = AF_INET6;
|
||||
if (m->m_len < sizeof(*ip6)) {
|
||||
m = m_pullup(m, sizeof(*ip6));
|
||||
if (!m)
|
||||
return IPPROTO_DONE;
|
||||
}
|
||||
if ((gifp->if_flags & IFF_UP) != 0) {
|
||||
ip6 = mtod(m, struct ip6_hdr *);
|
||||
if (ip6_ecn_egress((gifp->if_flags & IFF_LINK1) ?
|
||||
ECN_ALLOWED : ECN_NOCARE,
|
||||
&otos, &ip6->ip6_flow) == 0) {
|
||||
m_freem(m);
|
||||
return IPPROTO_DONE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
case IPPROTO_ETHERIP:
|
||||
af = AF_LINK;
|
||||
break;
|
||||
|
||||
default:
|
||||
IP6STAT_INC(ip6s_nogif);
|
||||
ecn = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
|
||||
m_adj(m, *offp);
|
||||
gif_input(m, gifp, proto, ecn);
|
||||
} else {
|
||||
m_freem(m);
|
||||
return IPPROTO_DONE;
|
||||
IP6STAT_INC(ip6s_nogif);
|
||||
}
|
||||
|
||||
gif_input(m, af, gifp);
|
||||
return IPPROTO_DONE;
|
||||
return (IPPROTO_DONE);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -380,19 +181,16 @@ static int
|
||||
gif_validate6(const struct ip6_hdr *ip6, struct gif_softc *sc,
|
||||
struct ifnet *ifp)
|
||||
{
|
||||
struct sockaddr_in6 *src, *dst;
|
||||
|
||||
src = (struct sockaddr_in6 *)sc->gif_psrc;
|
||||
dst = (struct sockaddr_in6 *)sc->gif_pdst;
|
||||
|
||||
GIF_RLOCK_ASSERT(sc);
|
||||
/*
|
||||
* Check for address match. Note that the check is for an incoming
|
||||
* packet. We should compare the *source* address in our configuration
|
||||
* and the *destination* address of the packet, and vice versa.
|
||||
*/
|
||||
if (!IN6_ARE_ADDR_EQUAL(&src->sin6_addr, &ip6->ip6_dst) ||
|
||||
!IN6_ARE_ADDR_EQUAL(&dst->sin6_addr, &ip6->ip6_src))
|
||||
return 0;
|
||||
if (!IN6_ARE_ADDR_EQUAL(&sc->gif_ip6hdr->ip6_src, &ip6->ip6_dst) ||
|
||||
!IN6_ARE_ADDR_EQUAL(&sc->gif_ip6hdr->ip6_dst, &ip6->ip6_src))
|
||||
return (0);
|
||||
|
||||
/* martian filters on outer source - done in ip6_input */
|
||||
|
||||
@ -410,29 +208,22 @@ gif_validate6(const struct ip6_hdr *ip6, struct gif_softc *sc,
|
||||
rt = in6_rtalloc1((struct sockaddr *)&sin6, 0, 0UL,
|
||||
sc->gif_fibnum);
|
||||
if (!rt || rt->rt_ifp != ifp) {
|
||||
#if 0
|
||||
char ip6buf[INET6_ADDRSTRLEN];
|
||||
log(LOG_WARNING, "%s: packet from %s dropped "
|
||||
"due to ingress filter\n", if_name(GIF2IFP(sc)),
|
||||
ip6_sprintf(ip6buf, &sin6.sin6_addr));
|
||||
#endif
|
||||
if (rt)
|
||||
RTFREE_LOCKED(rt);
|
||||
return 0;
|
||||
return (0);
|
||||
}
|
||||
RTFREE_LOCKED(rt);
|
||||
}
|
||||
|
||||
return 128 * 2;
|
||||
return (128 * 2);
|
||||
}
|
||||
|
||||
/*
|
||||
* we know that we are in IFF_UP, outer address available, and outer family
|
||||
* matched the physical addr family. see gif_encapcheck().
|
||||
* sanity check for arg should have been done in the caller.
|
||||
*/
|
||||
int
|
||||
gif_encapcheck6(const struct mbuf *m, int off, int proto, void *arg)
|
||||
in6_gif_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
|
||||
{
|
||||
struct ip6_hdr ip6;
|
||||
struct gif_softc *sc;
|
||||
@ -440,31 +231,21 @@ gif_encapcheck6(const struct mbuf *m, int off, int proto, void *arg)
|
||||
|
||||
/* sanity check done in caller */
|
||||
sc = (struct gif_softc *)arg;
|
||||
GIF_RLOCK_ASSERT(sc);
|
||||
|
||||
/* LINTED const cast */
|
||||
m_copydata(m, 0, sizeof(ip6), (caddr_t)&ip6);
|
||||
ifp = ((m->m_flags & M_PKTHDR) != 0) ? m->m_pkthdr.rcvif : NULL;
|
||||
|
||||
return gif_validate6(&ip6, sc, ifp);
|
||||
return (gif_validate6(&ip6, sc, ifp));
|
||||
}
|
||||
|
||||
int
|
||||
in6_gif_attach(struct gif_softc *sc)
|
||||
{
|
||||
sc->encap_cookie6 = encap_attach_func(AF_INET6, -1, gif_encapcheck,
|
||||
|
||||
KASSERT(sc->gif_ecookie == NULL, ("gif_ecookie isn't NULL"));
|
||||
sc->gif_ecookie = encap_attach_func(AF_INET6, -1, gif_encapcheck,
|
||||
(void *)&in6_gif_protosw, sc);
|
||||
if (sc->encap_cookie6 == NULL)
|
||||
return EEXIST;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
in6_gif_detach(struct gif_softc *sc)
|
||||
{
|
||||
int error;
|
||||
|
||||
error = encap_detach(sc->encap_cookie6);
|
||||
if (error == 0)
|
||||
sc->encap_cookie6 = NULL;
|
||||
return error;
|
||||
if (sc->gif_ecookie == NULL)
|
||||
return (EEXIST);
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -37,9 +37,8 @@
|
||||
|
||||
struct gif_softc;
|
||||
int in6_gif_input(struct mbuf **, int *, int);
|
||||
int in6_gif_output(struct ifnet *, int, struct mbuf *);
|
||||
int gif_encapcheck6(const struct mbuf *, int, int, void *);
|
||||
int in6_gif_output(struct ifnet *, struct mbuf *, int, uint8_t);
|
||||
int in6_gif_encapcheck(const struct mbuf *, int, int, void *);
|
||||
int in6_gif_attach(struct gif_softc *);
|
||||
int in6_gif_detach(struct gif_softc *);
|
||||
|
||||
#endif /* _NETINET6_IN6_GIF_H_ */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user