d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gif(4) and stf(4) modernization:

Browse Source 
- Remove gif dependencies from stf.
 - Make gif and stf into modules
 - Make gif cloneable.

PR:		kern/27983
Reviewed by:	ru, ume
Obtained from:	NetBSD
MFC after:	1 week
This commit is contained in:
Brooks Davis 2001-07-02 21:02:09 +00:00
parent 3e61dca08d
commit 53dab5fe7b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=79106
18 changed files with 290 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/alpha/conf/GENERIC
View File

@ -165,7 +165,7 @@ device ppp 1 # Kernel PPP
device tun # Packet tunnel.
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"
device gif 4 # IPv6 and IPv4 tunneling
device gif # IPv6 and IPv4 tunneling
device faith 1 # IPv6-to-IPv4 relaying/(translation)
# The `bpf' device enables the Berkeley Packet Filter.

2
sys/alpha/conf/NOTES
View File

@ -165,7 +165,7 @@ device ppp 1 # Kernel PPP
device tun # Packet tunnel.
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"
device gif 4 # IPv6 and IPv4 tunneling
device gif # IPv6 and IPv4 tunneling
device faith 1 # IPv6-to-IPv4 relaying/(translation)
# The `bpf' device enables the Berkeley Packet Filter.

2
sys/amd64/conf/GENERIC
View File

@ -210,7 +210,7 @@ device ppp 1 # Kernel PPP
device tun # Packet tunnel.
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"
device gif 4 # IPv6 and IPv4 tunneling
device gif # IPv6 and IPv4 tunneling
device faith 1 # IPv6-to-IPv4 relaying (translation)
# The `bpf' device enables the Berkeley Packet Filter.

4
sys/conf/files
View File

@ -896,7 +896,7 @@ net/if_ef.c optional ef
net/if_ethersubr.c optional ether
net/if_faith.c count faith
net/if_fddisubr.c optional fddi
net/if_gif.c count gif
net/if_gif.c optional gif
net/if_iso88025subr.c optional token
net/if_loop.c optional loop
net/if_media.c standard
@ -904,7 +904,7 @@ net/if_mib.c standard
net/if_ppp.c count ppp
net/if_sl.c optional sl
net/if_spppsubr.c optional sppp
net/if_stf.c count stf
net/if_stf.c optional stf
net/if_tun.c optional tun
net/if_tap.c optional tap
net/if_vlan.c count vlan

2
sys/i386/conf/GENERIC
View File

@ -210,7 +210,7 @@ device ppp 1 # Kernel PPP
device tun # Packet tunnel.
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"
device gif 4 # IPv6 and IPv4 tunneling
device gif # IPv6 and IPv4 tunneling
device faith 1 # IPv6-to-IPv4 relaying (translation)
# The `bpf' device enables the Berkeley Packet Filter.

2
sys/ia64/conf/GENERIC
View File

@ -140,7 +140,7 @@ device ppp 1 # Kernel PPP
device tun # Packet tunnel.
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"
device gif 4 # IPv6 and IPv4 tunneling
device gif # IPv6 and IPv4 tunneling
device faith 1 # IPv6-to-IPv4 relaying/(translation)
# The `bpf' device enables the Berkeley Packet Filter.

5
sys/modules/Makefile
View File

@ -7,8 +7,9 @@ _random= random
.endif
SUBDIR= 3dfx accf_data accf_http agp aha amr an aue \
cam ccd cd9660 coda cue dc de digi ed fdescfs fdc fs fxp if_disc if_ef \
if_ppp if_sl if_tap if_tun ip6fw ipfilter ipfw ispfw joy kue lge \
cam ccd cd9660 coda cue dc de digi ed fdescfs fdc fs fxp \
if_disc if_ef if_gif if_ppp if_sl if_stf if_tap if_tun \
ip6fw ipfilter ipfw ispfw joy kue lge \
libmchain linux lnc md mii mlx msdosfs ncp netgraph nfs nge ntfs \
nullfs nwfs pcn portalfs procfs ${_random} \
rl rp sf sis sk sn snp sound sppp ste sym syscons sysvipc ti tl twe \

18
sys/modules/if_gif/Makefile Normal file
View File

@ -0,0 +1,18 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
KMOD= if_gif
SRCS= if_gif.c in_gif.c in6_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
opt_inet6.h:
echo "#define INET6 1" > ${.TARGET}
opt_mrouting.h:
echo "#define MROUTING 1" > ${.TARGET}
.include <bsd.kmod.mk>

15
sys/modules/if_stf/Makefile Normal file
View File

@ -0,0 +1,15 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../net
KMOD= if_stf
SRCS= if_stf.c opt_inet.h opt_inet6.h
NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
opt_inet6.h:
echo "#define INET6 1" > ${.TARGET}
.include <bsd.kmod.mk>

271
sys/net/if_gif.c
View File

@ -44,6 +44,9 @@
#include <sys/time.h>
#include <sys/syslog.h>
#include <sys/protosw.h>
#include <sys/conf.h>
#include <machine/bus.h> /* XXX: Shouldn't really be required! */
#include <sys/rman.h>
#include <machine/cpu.h>
#include <net/if.h>
@ -58,6 +61,8 @@
#ifdef INET
#include <netinet/in_var.h>
#include <netinet/in_gif.h>
#include <netinet/ip_var.h>
#include <netinet/ipprotosw.h>
#endif /* INET */
#ifdef INET6
@ -74,29 +79,47 @@
#include <netinet/ip_encap.h>
#include <net/if_gif.h>
#include "gif.h"
#include "bpf.h"
#define NBPFILTER NBPF
#include <net/net_osdep.h>
#if NGIF > 0
#define GIFNAME "gif"
#define GIFDEV "if_gif"
#define GIF_MAXUNIT 0x7fff /* ifp->if_unit is only 15 bits */
void gifattach __P((void *));
static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface");
static struct rman gifunits[1];
TAILQ_HEAD(gifhead, gif_softc) gifs = TAILQ_HEAD_INITIALIZER(gifs);
int gif_clone_create __P((struct if_clone *, int *));
void gif_clone_destroy __P((struct ifnet *));
struct if_clone gif_cloner =
IF_CLONE_INITIALIZER("gif", gif_clone_create, gif_clone_destroy);
static int gifmodevent __P((module_t, int, void *));
void gif_delete_tunnel __P((struct gif_softc *));
static int gif_encapcheck __P((const struct mbuf *, int, int, void *));
#ifdef INET
extern struct protosw in_gif_protosw;
extern struct domain inetdomain;
struct ipprotosw in_gif_protosw =
{ SOCK_RAW, &inetdomain, 0/*IPPROTO_IPV[46]*/, PR_ATOMIC|PR_ADDR,
in_gif_input, rip_output, 0, rip_ctloutput,
0,
0, 0, 0, 0,
&rip_usrreqs
};
#endif
#ifdef INET6
extern struct ip6protosw in6_gif_protosw;
extern struct domain6 inet6domain;
struct ip6protosw in6_gif_protosw =
{ SOCK_RAW, &inet6domain, 0/*IPPROTO_IPV[46]*/, PR_ATOMIC|PR_ADDR,
in6_gif_input, rip6_output, 0, rip6_ctloutput,
0,
0, 0, 0, 0,
&rip6_usrreqs
};
#endif
/*
* gif global variable definitions
*/
static int ngif; /* number of interfaces */
static struct gif_softc *gif = 0;
#ifndef MAX_GIF_NEST
/*
* This macro controls the upper limitation on nesting of gif tunnels.
@ -110,64 +133,158 @@ static struct gif_softc *gif = 0;
#endif
static int max_gif_nesting = MAX_GIF_NEST;
void
gifattach(dummy)
void *dummy;
int
gif_clone_create(ifc, unit)
struct if_clone *ifc;
int *unit;
{
struct resource *r;
struct gif_softc *sc;
int i;
ngif = NGIF;
gif = sc = malloc(ngif * sizeof(struct gif_softc), M_DEVBUF, M_WAITOK);
bzero(sc, ngif * sizeof(struct gif_softc));
for (i = 0; i < ngif; sc++, i++) {
sc->gif_if.if_name = "gif";
sc->gif_if.if_unit = i;
if (*unit > GIF_MAXUNIT)
return (ENXIO);
sc->encap_cookie4 = sc->encap_cookie6 = NULL;
if (*unit < 0) {
r = rman_reserve_resource(gifunits, 0, GIF_MAXUNIT, 1,
RF_ALLOCATED | RF_ACTIVE, NULL);
if (r == NULL)
return (ENOSPC);
*unit = rman_get_start(r);
} else {
r = rman_reserve_resource(gifunits, *unit, *unit, 1,
RF_ALLOCATED | RF_ACTIVE, NULL);
if (r == NULL)
return (EEXIST);
}
sc = malloc (sizeof(struct gif_softc), M_GIF, M_WAITOK);
bzero(sc, sizeof(struct gif_softc));
sc->gif_if.if_softc = sc;
sc->gif_if.if_name = GIFNAME;
sc->gif_if.if_unit = *unit;
sc->r_unit = r;
sc->encap_cookie4 = sc->encap_cookie6 = NULL;
#ifdef INET
sc->encap_cookie4 = encap_attach_func(AF_INET, -1,
gif_encapcheck, &in_gif_protosw, sc);
if (sc->encap_cookie4 == NULL) {
printf("%s: attach failed\n", if_name(&sc->gif_if));
continue;
}
sc->encap_cookie4 = encap_attach_func(AF_INET, -1,
gif_encapcheck, (struct protosw*)&in_gif_protosw, sc);
if (sc->encap_cookie4 == NULL) {
printf("%s: unable to attach encap4\n", if_name(&sc->gif_if));
free(sc, M_GIF);
return (EIO); /* XXX */
}
#endif
#ifdef INET6
sc->encap_cookie6 = encap_attach_func(AF_INET6, -1,
gif_encapcheck, (struct protosw *)&in6_gif_protosw, sc);
if (sc->encap_cookie6 == NULL) {
if (sc->encap_cookie4) {
encap_detach(sc->encap_cookie4);
sc->encap_cookie4 = NULL;
}
printf("%s: attach failed\n", if_name(&sc->gif_if));
continue;
sc->encap_cookie6 = encap_attach_func(AF_INET6, -1,
gif_encapcheck, (struct protosw *)&in6_gif_protosw, sc);
if (sc->encap_cookie6 == NULL) {
if (sc->encap_cookie4) {
encap_detach(sc->encap_cookie4);
sc->encap_cookie4 = NULL;
}
printf("%s: unable to attach encap6\n", if_name(&sc->gif_if));
free(sc, M_GIF);
return (EIO); /* XXX */
}
#endif
sc->gif_if.if_mtu = GIF_MTU;
sc->gif_if.if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
sc->gif_if.if_mtu = GIF_MTU;
sc->gif_if.if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
#if 0
/* turn off ingress filter */
sc->gif_if.if_flags |= IFF_LINK2;
/* turn off ingress filter */
sc->gif_if.if_flags |= IFF_LINK2;
#endif
sc->gif_if.if_ioctl = gif_ioctl;
sc->gif_if.if_output = gif_output;
sc->gif_if.if_type = IFT_GIF;
sc->gif_if.if_snd.ifq_maxlen = IFQ_MAXLEN;
if_attach(&sc->gif_if);
#if NBPFILTER > 0
#ifdef HAVE_OLD_BPF
bpfattach(&sc->gif_if, DLT_NULL, sizeof(u_int));
#else
bpfattach(&sc->gif_if.if_bpf, &sc->gif_if, DLT_NULL, sizeof(u_int));
#endif
#endif
}
sc->gif_if.if_ioctl = gif_ioctl;
sc->gif_if.if_output = gif_output;
sc->gif_if.if_type = IFT_GIF;
sc->gif_if.if_snd.ifq_maxlen = IFQ_MAXLEN;
if_attach(&sc->gif_if);
bpfattach(&sc->gif_if, DLT_NULL, sizeof(u_int));
TAILQ_INSERT_TAIL(&gifs, sc, gif_link);
return (0);
}
PSEUDO_SET(gifattach, if_gif);
void
gif_clone_destroy(ifp)
struct ifnet *ifp;
{
int err;
struct gif_softc *sc = ifp->if_softc;
gif_delete_tunnel(sc);
TAILQ_REMOVE(&gifs, sc, gif_link);
if (sc->encap_cookie4 != NULL) {
err = encap_detach(sc->encap_cookie4);
KASSERT(err == 0, ("Unexpected error detaching encap_cookie4"));
}
if (sc->encap_cookie6 != NULL) {
err = encap_detach(sc->encap_cookie6);
KASSERT(err == 0, ("Unexpected error detaching encap_cookie6"));
}
bpfdetach(ifp);
if_detach(ifp);
err = rman_release_resource(sc->r_unit);
KASSERT(err == 0, ("Unexpected error freeing resource"));
free(sc, M_GIF);
}
static int
gifmodevent(mod, type, data)
module_t mod;
int type;
void *data;
{
int err;
switch (type) {
case MOD_LOAD:
gifunits->rm_type = RMAN_ARRAY;
gifunits->rm_descr = "configurable if_gif units";
err = rman_init(gifunits);
if (err != 0)
return (err);
err = rman_manage_region(gifunits, 0, GIF_MAXUNIT);
if (err != 0) {
printf("%s: gifunits: rman_manage_region: Failed %d\n",
GIFNAME, err);
rman_fini(gifunits);
return (err);
}
if_clone_attach(&gif_cloner);
#ifdef INET6
ip6_gif_hlim = GIF_HLIM;
#endif
break;
case MOD_UNLOAD:
if_clone_detach(&gif_cloner);
while (!TAILQ_EMPTY(&gifs))
gif_clone_destroy(&TAILQ_FIRST(&gifs)->gif_if);
err = rman_fini(gifunits);
if (err != 0)
return (err);
#ifdef INET6
ip6_gif_hlim = 0;
#endif
break;
}
return 0;
}
static moduledata_t gif_mod = {
"if_gif",
gifmodevent,
0
};
DECLARE_MODULE(if_gif, gif_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
static int
gif_encapcheck(m, off, proto, arg)
@ -261,7 +378,6 @@ gif_output(ifp, m, dst, rt)
goto end;
}
#if NBPFILTER > 0
if (ifp->if_bpf) {
/*
* We need to prepend the address family as
@ -277,13 +393,8 @@ gif_output(ifp, m, dst, rt)
m0.m_len = 4;
m0.m_data = (char *)&af;
#ifdef HAVE_OLD_BPF
bpf_mtap(ifp, &m0);
#else
bpf_mtap(ifp->if_bpf, &m0);
#endif
}
#endif
ifp->if_opackets++;
ifp->if_obytes += m->m_pkthdr.len;
@ -333,7 +444,6 @@ gif_input(m, af, gifp)
m->m_pkthdr.rcvif = gifp;
#if NBPFILTER > 0
if (gifp->if_bpf) {
/*
* We need to prepend the address family as
@ -349,13 +459,8 @@ gif_input(m, af, gifp)
m0.m_len = 4;
m0.m_data = (char *)&af1;
#ifdef HAVE_OLD_BPF
bpf_mtap(gifp, &m0);
#else
bpf_mtap(gifp->if_bpf, &m0);
#endif
}
#endif /*NBPFILTER > 0*/
/*
* Put the packet to the network layer input queue according to the
@ -408,8 +513,8 @@ gif_ioctl(ifp, cmd, data)
int error = 0, size;
struct sockaddr *dst, *src;
struct sockaddr *sa;
int i;
int s;
struct ifnet *ifp2;
struct gif_softc *sc2;
switch (cmd) {
@ -523,8 +628,10 @@ gif_ioctl(ifp, cmd, data)
break;
}
for (i = 0; i < ngif; i++) {
sc2 = gif + i;
TAILQ_FOREACH(ifp2, &ifnet, if_link) {
if (strcmp(ifp2->if_name, GIFNAME) != 0)
continue;
sc2 = ifp2->if_softc;
if (sc2 == sc)
continue;
if (!sc2->gif_pdst || !sc2->gif_psrc)
@ -698,4 +805,20 @@ gif_ioctl(ifp, cmd, data)
bad:
return error;
}
#endif /*NGIF > 0*/
void
gif_delete_tunnel(sc)
struct gif_softc *sc;
{
/* XXX: NetBSD protects this function with splsoftnet() */
if (sc->gif_psrc) {
free((caddr_t)sc->gif_psrc, M_IFADDR);
sc->gif_psrc = NULL;
}
if (sc->gif_pdst) {
free((caddr_t)sc->gif_pdst, M_IFADDR);
sc->gif_pdst = NULL;
}
/* change the IFF_UP flag as well? */
}

2
sys/net/if_gif.h
View File

@ -60,6 +60,8 @@ struct gif_softc {
int gif_flags;
const struct encaptab *encap_cookie4;
const struct encaptab *encap_cookie6;
struct resource *r_unit; /* resource allocated for this unit */
TAILQ_ENTRY(gif_softc) gif_link; /* all gif's are linked */
};
#define gif_ro gifsc_gifscr.gifscr_ro

90
sys/net/if_stf.c
View File

@ -98,12 +98,12 @@
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ipprotosw.h>
#include <netinet/ip_var.h>
#include <netinet/in_var.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/in6_gif.h>
#include <netinet6/in6_var.h>
#include <netinet/ip_ecn.h>
@ -113,23 +113,7 @@
#include <net/net_osdep.h>
#include "bpf.h"
#define NBPFILTER NBPF
#include "stf.h"
#include "gif.h" /*XXX*/
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
#if NGIF > 0
#include <net/if_gif.h>
#endif
#if NSTF > 0
#if NSTF != 1
# error only single stf interface allowed
#endif
#define IN6_IS_ADDR_6TO4(x) (ntohs((x)->s6_addr16[0]) == 0x2002)
#define GET_V4(x) ((struct in_addr *)(&(x)->s6_addr16[1]))
@ -145,17 +129,20 @@ struct stf_softc {
};
static struct stf_softc *stf;
static int nstf;
#if NGIF > 0
extern int ip_gif_ttl; /*XXX*/
#else
static int ip_gif_ttl = 40; /*XXX*/
#endif
static MALLOC_DEFINE(M_STF, "stf", "6to4 Tunnel Interface");
static int ip_stf_ttl = 40;
extern struct protosw in_stf_protosw;
extern struct domain inetdomain;
struct ipprotosw in_stf_protosw =
{ SOCK_RAW, &inetdomain, IPPROTO_IPV6, PR_ATOMIC|PR_ADDR,
in_stf_input, rip_output, 0, rip_ctloutput,
0,
0, 0, 0, 0,
&rip_usrreqs
};
void stfattach __P((void *));
static int stfmodevent __P((module_t, int, void *));
static int stf_encapcheck __P((const struct mbuf *, int, int, void *));
static struct in6_ifaddr *stf_getsrcifa6 __P((struct ifnet *));
static int stf_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
@ -167,31 +154,31 @@ static int stf_checkaddr6 __P((struct stf_softc *, struct in6_addr *,
static void stf_rtrequest __P((int, struct rtentry *, struct sockaddr *));
static int stf_ioctl __P((struct ifnet *, u_long, caddr_t));
void
stfattach(dummy)
void *dummy;
static int
stfmodevent(mod, type, data)
module_t mod;
int type;
void *data;
{
struct stf_softc *sc;
int i;
int err;
const struct encaptab *p;
nstf = NSTF;
stf = malloc(nstf * sizeof(struct stf_softc), M_DEVBUF, M_WAITOK);
bzero(stf, nstf * sizeof(struct stf_softc));
sc = stf;
switch (type) {
case MOD_LOAD:
stf = malloc(sizeof(struct stf_softc), M_STF, M_WAITOK);
bzero(stf, sizeof(struct stf_softc));
sc = stf;
/* XXX just in case... */
for (i = 0; i < nstf; i++) {
sc = &stf[i];
bzero(sc, sizeof(*sc));
sc->sc_if.if_name = "stf";
sc->sc_if.if_unit = i;
sc->sc_if.if_unit = 0;
p = encap_attach_func(AF_INET, IPPROTO_IPV6, stf_encapcheck,
&in_stf_protosw, sc);
if (p == NULL) {
printf("%s: attach failed\n", if_name(&sc->sc_if));
continue;
return (ENOMEM);
}
sc->encap_cookie = p;
@ -206,17 +193,32 @@ stfattach(dummy)
#endif
sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN;
if_attach(&sc->sc_if);
#if NBPFILTER > 0
#ifdef HAVE_OLD_BPF
bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int));
#else
bpfattach(&sc->sc_if.if_bpf, &sc->sc_if, DLT_NULL, sizeof(u_int));
#endif
#endif
break;
case MOD_UNLOAD:
sc = stf;
bpfdetach(&sc->sc_if);
if_detach(&sc->sc_if);
err = encap_detach(sc->encap_cookie);
KASSERT(err == 0, ("Unexpected error detaching encap_cookie"));
free(sc, M_STF);
break;
}
return (0);
}
PSEUDO_SET(stfattach, if_stf);
static moduledata_t stf_mod = {
"if_stf",
stfmodevent,
0
};
DECLARE_MODULE(if_stf, stf_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
static int
stf_encapcheck(m, off, proto, arg)
@ -413,7 +415,7 @@ stf_output(ifp, m, dst, rt)
&ip->ip_src, sizeof(ip->ip_src));
bcopy(in4, &ip->ip_dst, sizeof(ip->ip_dst));
ip->ip_p = IPPROTO_IPV6;
ip->ip_ttl = ip_gif_ttl; /*XXX*/
ip->ip_ttl = ip_stf_ttl;
ip->ip_len = m->m_pkthdr.len; /*host order*/
if (ifp->if_flags & IFF_LINK1)
ip_ecn_ingress(ECN_ALLOWED, &ip->ip_tos, &tos);
@ -607,7 +609,6 @@ in_stf_input(m, va_alist)
m->m_pkthdr.rcvif = ifp;
#if NBPFILTER > 0
if (ifp->if_bpf) {
/*
* We need to prepend the address family as
@ -629,7 +630,6 @@ in_stf_input(m, va_alist)
bpf_mtap(ifp->if_bpf, &m0);
#endif
}
#endif /*NBPFILTER > 0*/
/*
* Put the packet to the network layer input queue according to the
@ -703,5 +703,3 @@ stf_ioctl(ifp, cmd, data)
return error;
}
#endif /* NSTF > 0 */

24
sys/netinet/in_gif.c
View File

@ -67,17 +67,9 @@
#include <net/if_gif.h>
#include "gif.h"
#include <machine/stdarg.h>
#include <net/net_osdep.h>
#if NGIF > 0
int ip_gif_ttl = GIF_TTL;
#else
int ip_gif_ttl = 0;
#endif
SYSCTL_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW,
&ip_gif_ttl, 0, "");
@ -210,26 +202,16 @@ in_gif_output(ifp, family, m, rt)
}
void
#if __STDC__
in_gif_input(struct mbuf *m, ...)
#else
in_gif_input(m, va_alist)
in_gif_input(m, off, proto)
struct mbuf *m;
va_dcl
#endif
int off;
int proto;
{
int off, proto;
struct ifnet *gifp = NULL;
struct ip *ip;
va_list ap;
int af;
u_int8_t otos;
va_start(ap, m);
off = va_arg(ap, int);
proto = va_arg(ap, int);
va_end(ap);
ip = mtod(m, struct ip *);
gifp = (struct ifnet *)encap_getarg(m);

2
sys/netinet/in_gif.h
View File

@ -37,7 +37,7 @@
extern int ip_gif_ttl;
void in_gif_input __P((struct mbuf *, ...));
void in_gif_input __P((struct mbuf *, int off, int proto));
int in_gif_output __P((struct ifnet *, int, struct mbuf *, struct rtentry *));
int gif_encapcheck4 __P((const struct mbuf *, int, int, void *));

30
sys/netinet/in_proto.c
View File

@ -78,16 +78,6 @@
#include <netinet6/ipcomp.h>
#endif /* IPSEC */
#include "gif.h"
#if NGIF > 0
#include <netinet/in_gif.h>
#endif
#include "stf.h"
#if NSTF > 0
#include <net/if_stf.h>
#endif
#ifdef IPXIP
#include <netipx/ipx_ip.h>
#endif
@ -213,26 +203,6 @@ struct ipprotosw inetsw[] = {
},
};
#if NGIF > 0
struct ipprotosw in_gif_protosw =
{ SOCK_RAW, &inetdomain, 0/*IPPROTO_IPV[46]*/, PR_ATOMIC|PR_ADDR,
in_gif_input, rip_output, 0, rip_ctloutput,
0,
0, 0, 0, 0,
&rip_usrreqs
};
#endif /*NGIF*/
#if NSTF > 0
struct ipprotosw in_stf_protosw =
{ SOCK_RAW, &inetdomain, IPPROTO_IPV6, PR_ATOMIC|PR_ADDR,
in_stf_input, rip_output, 0, rip_ctloutput,
0,
0, 0, 0, 0,
&rip_usrreqs
};
#endif /*NSTF*/
extern int in_inithead __P((void **, int));
struct domain inetdomain =

5
sys/netinet6/in6.c
View File

@ -105,11 +105,6 @@
#include <netinet6/in6_pcb.h>
#endif
#include "gif.h"
#if NGIF > 0
#include <net/if_gif.h>
#endif
#include <net/net_osdep.h>
MALLOC_DEFINE(M_IPMADDR, "in6_multi", "internet multicast address");

19
sys/netinet6/in6_proto.c
View File

@ -128,11 +128,6 @@
#include <netinet6/ip6protosw.h>
#include "gif.h"
#if NGIF > 0
#include <netinet6/in6_gif.h>
#endif
#include <net/net_osdep.h>
/*
@ -251,16 +246,6 @@ struct ip6protosw inet6sw[] = {
},
};
#if NGIF > 0
struct ip6protosw in6_gif_protosw =
{ SOCK_RAW, &inet6domain, 0/*IPPROTO_IPV[46]*/, PR_ATOMIC|PR_ADDR,
in6_gif_input, rip6_output, 0, rip6_ctloutput,
0,
0, 0, 0, 0,
&rip6_usrreqs
};
#endif /*NGIF*/
extern int in6_inithead __P((void **, int));
struct domain inet6domain =
@ -299,11 +284,7 @@ int ip6_hdrnestlimit = 50; /* appropriate? */
int ip6_dad_count = 1; /* DupAddrDetectionTransmits */
u_int32_t ip6_flow_seq;
int ip6_auto_flowlabel = 1;
#if NGIF > 0
int ip6_gif_hlim = GIF_HLIM;
#else
int ip6_gif_hlim = 0;
#endif
int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
int ip6_rr_prune = 5; /* router renumbering prefix
* walk list every 5 sec. */

1
sys/netinet6/ip6_input.c
View File

@ -121,7 +121,6 @@
#include <netinet6/ip6protosw.h>
#include "faith.h"
#include "gif.h"
#include <net/net_osdep.h>