Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start supporting IPPROTO_MOBILE (55) encapsulation. This is yet 

another tunneling protocol used by the Mobile-IP people. See RFC 2004
for this.
This commit is contained in:
hwr 1998-09-30 05:59:27 +00:00
parent 584dba3f3d
commit eaccb9cd8d
5 changed files with 319 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
sys/net/if_gre.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gre.c,v 1.2 1998/09/13 21:39:49 hwr Exp $ */
/* $NetBSD: if_gre.c,v 1.3 1998/09/30 05:59:27 hwr Exp $ */
/*
* (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@ -41,6 +41,8 @@
* If_gre is compatible with Cisco GRE tunnels, so you can
* have a NetBSD box as the other end of a tunnel interface of a Cisco
* router. See gre(4) for more details.
* Also supported: IP in IP encaps (proto 4) as of RFC 2003
* IP in IP encaps (proto 55) as of RFC 2004
*/
#include "gre.h"
@ -108,13 +110,14 @@
but we should possibly do path mtu discovery
before changing if state to up to find the
correct value */
#define LINK_MASK (IFF_LINK0|IFF_LINK1|IFF_LINK2)
struct gre_softc gre_softc[NGRE];
void gre_compute_route(struct gre_softc *sc);
#ifdef DIAGNOSTIC
void my_inet_ntoa(struct in_addr in);
void gre_inet_ntoa(struct in_addr in);
#endif
void greattach(void)
@ -154,10 +157,11 @@ void greattach(void)
/*
* The output routine. Takes a packet and encapsulates it in the protocol
* given by sc->g_proto. See also RFC 1701 and RFC 2003
* given by sc->g_proto. See also RFC 1701, RFC 2003 and RFC 2004
*/
struct ip ip_h;
struct mobile_h mob_h;
int
gre_output(ifp, m, dst, rt)
@ -170,11 +174,13 @@ gre_output(ifp, m, dst, rt)
struct gre_softc *sc=(struct gre_softc *)(ifp->if_softc);
struct greip *gh;
struct ip *inp;
u_char ttl;
u_short etype;
u_char ttl,osrc;
u_short etype=0;
gh=NULL;
inp=NULL;
osrc=0;
#if 0
#if NBPFILTER >0
@ -206,6 +212,68 @@ gre_output(ifp, m, dst, rt)
m_freem(m);
return(EINVAL);
}
#if 1
} else if (sc->g_proto == IPPROTO_MOBILE) {
if (dst->sa_family == AF_INET) {
struct mbuf *m0;
int msiz;
inp=mtod(m,struct ip *);
memset(&mob_h,0,MOB_H_SIZ_L);
mob_h.proto=(inp->ip_p)<<8;
mob_h.odst=inp->ip_dst.s_addr;
inp->ip_dst.s_addr=sc->g_dst.s_addr;
/*
* If the packet comes from our host, we only change the
* destination address in the IP header. Else we also need
* to save and change the source
*/
if (in_hosteq(inp->ip_src, sc->g_src)) {
msiz=MOB_H_SIZ_S;
} else {
mob_h.proto |= MOB_H_SBIT;
mob_h.osrc=inp->ip_src.s_addr;
inp->ip_src.s_addr=sc->g_src.s_addr;
msiz=MOB_H_SIZ_L;
}
HTONS(mob_h.proto);
mob_h.hcrc=gre_in_cksum((u_short *)&mob_h,msiz);
if ((m->m_data - msiz) < m->m_pktdat) {
/* need new mbuf */
MGETHDR(m0, M_DONTWAIT, MT_HEADER);
if (m0==NULL) {
IF_DROP(&ifp->if_snd);
m_freem(m);
return(ENOBUFS);
}
m0->m_next=m;
m->m_data += sizeof(struct ip);
m->m_len -= sizeof(struct ip);
m0->m_pkthdr.len=m->m_pkthdr.len+msiz;
m0->m_len = msiz + sizeof(struct ip);
m0->m_data += max_linkhdr;
memcpy(mtod(m0, caddr_t), (caddr_t) inp, sizeof(struct ip));
m=m0;
} else { /* we have some spave left in the old one */
m->m_data-=msiz;
m->m_len+=msiz;
m->m_pkthdr.len+=msiz;
ovbcopy((caddr_t) inp, mtod(m, caddr_t), sizeof(struct ip));
}
inp=mtod(m,struct ip *);
memcpy((caddr_t) (inp+1), &mob_h, (unsigned) msiz);
NTOHS(inp->ip_len);
inp->ip_len+=msiz;
} else { /* AF_INET */
IF_DROP(&ifp->if_snd);
m_freem(m);
return(EINVAL);
}
#endif
} else if (sc->g_proto == IPPROTO_GRE) {
switch(dst->sa_family) {
case AF_INET:
@ -253,14 +321,14 @@ gre_output(ifp, m, dst, rt)
/* rest is same for GRE and IPIP and all inner protos */
gh->gi_pr = sc->g_proto;
gh->gi_src = sc->g_src;
gh->gi_dst = sc->g_dst;
((struct ip*)gh)->ip_hl = (sizeof(struct ip)) >> 2;
/* m->m_pkthdr.len is already augmented by
sizeof(struct greip) */
gh->gi_len = m->m_pkthdr.len;
((struct ip*)gh)->ip_ttl=ttl;
((struct ip*)gh)->ip_tos=inp->ip_tos;
if (sc->g_proto != IPPROTO_MOBILE) {
gh->gi_src = sc->g_src;
gh->gi_dst = sc->g_dst;
((struct ip*)gh)->ip_hl = (sizeof(struct ip)) >> 2;
((struct ip*)gh)->ip_ttl=ttl;
((struct ip*)gh)->ip_tos=inp->ip_tos;
gh->gi_len = m->m_pkthdr.len;
}
ifp->if_opackets++;
ifp->if_obytes+=m->m_pkthdr.len;
@ -318,15 +386,22 @@ gre_ioctl(ifp, cmd, data)
(sc->g_src.s_addr== INADDR_ANY))
ifp->if_flags &= ~IFF_UP;
if ((ifr->ifr_flags & IFF_LINK0) == IFF_LINK0) { /* IPIP */
sc->g_proto = IPPROTO_IPIP;
ifp->if_flags |= IFF_LINK0;
break;
} else { /* GRE */
sc->g_proto = IPPROTO_GRE;
ifp->if_flags &= ~IFF_LINK0;
break;
switch(ifr->ifr_flags & LINK_MASK) {
case IFF_LINK0:
sc->g_proto = IPPROTO_GRE;
ifp->if_flags |= IFF_LINK0;
ifp->if_flags &= ~(IFF_LINK1|IFF_LINK2);
break;
case IFF_LINK1:
sc->g_proto = IPPROTO_IPIP;
ifp->if_flags |= IFF_LINK1;
ifp->if_flags &= ~(IFF_LINK0|IFF_LINK2);
break;
case IFF_LINK2:
sc->g_proto = IPPROTO_MOBILE;
ifp->if_flags |= IFF_LINK2;
ifp->if_flags &= ~(IFF_LINK0|IFF_LINK1);
break;
}
break;
case SIOCSIFMTU:
@ -358,17 +433,20 @@ gre_ioctl(ifp, cmd, data)
case GRESPROTO:
sc->g_proto = ifr->ifr_flags;
switch (sc->g_proto) {
case IPPROTO_IPIP :
ifp->if_flags |= IFF_LINK1;
ifp->if_flags &= ~IFF_LINK0;
break;
case IPPROTO_GRE :
ifp->if_flags |= IFF_LINK0;
ifp->if_flags &= ~IFF_LINK1;
ifp->if_flags &= ~(IFF_LINK1|IFF_LINK2);
break;
case IPPROTO_IPIP :
ifp->if_flags |= IFF_LINK1;
ifp->if_flags &= ~(IFF_LINK0|IFF_LINK2);
break;
case IPPROTO_MOBILE :
ifp->if_flags |= IFF_LINK2;
ifp->if_flags &= ~(IFF_LINK1|IFF_LINK2);
break;
default:
ifp->if_flags &= ~IFF_LINK0;
ifp->if_flags &= ~IFF_LINK1;
ifp->if_flags &= ~(IFF_LINK0|IFF_LINK1|IFF_LINK2);
}
break;
case GREGPROTO:
@ -449,7 +527,7 @@ void gre_compute_route(struct gre_softc *sc)
#ifdef DIAGNOSTIC
printf("%s: searching a route to ",sc->sc_if.if_xname);
my_inet_ntoa(((struct sockaddr_in *)&ro->ro_dst)->sin_addr);
gre_inet_ntoa(((struct sockaddr_in *)&ro->ro_dst)->sin_addr);
#endif
rtalloc(ro);
@ -462,15 +540,48 @@ my_inet_ntoa(((struct sockaddr_in *)&ro->ro_dst)->sin_addr);
#ifdef DIAGNOSTIC
printf(", choosing %s with gateway ",ro->ro_rt->rt_ifp->if_xname);
my_inet_ntoa(((struct sockaddr_in *)(ro->ro_rt->rt_gateway))->sin_addr);
gre_inet_ntoa(((struct sockaddr_in *)(ro->ro_rt->rt_gateway))->sin_addr);
printf("\n");
#endif
}
/*
* do a checksum of a buffer - much like in_cksum, which operates on
* mbufs.
*/
u_short
gre_in_cksum(p, len)
u_short *p;
u_int len;
{
u_int sum = 0;
int nwords = len >> 1;
while (nwords-- != 0)
sum += *p++;
if (len & 1) {
union {
u_short w;
u_char c[2];
} u;
u.c[0] = *(u_char *)p;
u.c[1] = 0;
sum += u.w;
}
/* end-around-carry */
sum = (sum >> 16) + (sum & 0xffff);
sum += (sum >> 16);
return (~sum);
}
/* while testing ... */
#ifdef DIAGNOSTIC
void
my_inet_ntoa(in)
gre_inet_ntoa(in)
struct in_addr in;
{
register char *p;

33
sys/net/if_gre.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gre.h,v 1.1 1998/09/13 20:27:47 hwr Exp $ */
/* $NetBSD: if_gre.h,v 1.2 1998/09/30 05:59:28 hwr Exp $ */
/*
* (c) 1998 The NetBSD Foundation, Inc.
@ -119,6 +119,30 @@ struct greioctl {
struct in_addr addr;
};
/* for mobile encaps */
struct mobile_h {
u_int16_t proto; /* protocol and S-bit */
u_int16_t hcrc; /* header checksum */
u_int32_t odst; /* original destination address */
u_int32_t osrc; /* original source addr, if S-bit set */
};
struct mobip_h {
struct ip mi;
struct mobile_h mh;
};
#define MOB_H_SIZ_S (sizeof(struct mobile_h) - sizeof(u_int32_t))
#define MOB_H_SIZ_L (sizeof(struct mobile_h))
#define MOB_H_SBIT 0x0080
/*
* ioctls needed to manipulate the interface
*/
#define GRESADDRS _IOW('i', 101, struct ifreq)
#define GRESADDRD _IOW('i', 102, struct ifreq)
#define GREGADDRS _IOWR('i', 103, struct ifreq)
@ -126,4 +150,11 @@ struct greioctl {
#define GRESPROTO _IOW('i' , 105, struct ifreq)
#define GREGPROTO _IOWR('i', 106, struct ifreq)
/*
* do a checksum of a buffer - much like in_cksum, which operates on
* mbufs.
*/
u_short gre_in_cksum(u_short *p, u_int len);
#endif

9
sys/netinet/in_proto.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in_proto.c,v 1.25 1998/09/13 20:27:48 hwr Exp $ */
/* $NetBSD: in_proto.c,v 1.26 1998/09/30 05:59:28 hwr Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@ -131,7 +131,12 @@ struct protosw inetsw[] = {
#if NGRE > 0
{ SOCK_RAW, &inetdomain, IPPROTO_GRE, PR_ATOMIC|PR_ADDR,
gre_input, rip_output, 0, rip_ctloutput,
rip_usrreq, /* XXX */
rip_usrreq,
0, 0, 0, 0,
},
{ SOCK_RAW, &inetdomain, IPPROTO_MOBILE, PR_ATOMIC|PR_ADDR,
gre_mobile_input, rip_output, 0, rip_ctloutput,
rip_usrreq,
0, 0, 0, 0,
},
#ifndef MROUTING

157
sys/netinet/ip_gre.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_gre.c,v 1.1 1998/09/13 20:27:48 hwr Exp $ */
/* $NetBSD: ip_gre.c,v 1.2 1998/09/30 05:59:28 hwr Exp $ */
/*
* (c) 1998 The NetBSD Foundation, Inc.
@ -37,8 +37,9 @@
*/
/*
* deencapsulate GRE packets and send them on
* deencapsulate tunneled packets and send them on
* output half is in net/ip_gre.[ch]
* This currently handles IPPROTO_IPIP, IPPROTO_GRE, IPPROTO_MOBILE
*
*/
@ -91,8 +92,14 @@ Huh? ip_gre input without IP?
#include "ip_gre.h"
#include <net/if_gre.h>
#if 1
void gre_inet_ntoa(struct in_addr in); /* XXX */
#endif
extern struct gre_softc gre_softc[NGRE];
static int match_tunnel(struct mbuf *m,u_char proto);
/*
* De-encapsulate a packet and feed it back through ip input (this
* routine is called whenever IP gets a packet with proto type
@ -108,12 +115,12 @@ gre_input(m, va_alist)
va_dcl
#endif
{
register int hlen,ret;
register int hlen,ret;
va_list ap;
va_start(ap, m);
hlen = va_arg(ap, int);
va_end(ap);
va_start(ap, m);
hlen = va_arg(ap, int);
va_end(ap);
ret=gre_input2(m,hlen,IPPROTO_GRE);
/*
@ -138,31 +145,22 @@ gre_input(m, va_alist)
int
gre_input2(struct mbuf *m ,int hlen,u_char proto)
{
register struct ip *ip = mtod(m, struct ip *);
register struct greip *gip = mtod(m, struct greip *);
register int s,i;
register struct ifqueue *ifq;
struct gre_softc *sc;
register int s;
register struct ifqueue *ifq;
struct gre_softc *sc = NULL;
u_short flags;
int i;
i=0;
do {
i=match_tunnel(m,proto);
if (i!=-1) { /* found matching tunnel that is up */
sc=&gre_softc[i];
if((sc->g_dst.s_addr == ip->ip_src.s_addr) &&
(sc->g_src.s_addr == ip->ip_dst.s_addr))
break;
i++;
} while(i<NGRE);
if ((i<NGRE) && ((sc->sc_if.if_flags & IFF_UP) == IFF_UP)) {
/* found matching tunnel that is up */
sc->sc_if.if_ipackets++;
sc->sc_if.if_ibytes+=m->m_pkthdr.len;
} else { /* no matching tunnel or match, but tunnel down */
} else { /* no matching tunnel or match, but tunnel down */
return 0;
}
switch (proto) {
case IPPROTO_GRE:
hlen += sizeof (struct gre_h);
@ -211,7 +209,6 @@ gre_input2(struct mbuf *m ,int hlen,u_char proto)
return(0);
}
m->m_data += hlen;
m->m_len -= hlen;
m->m_pkthdr.len -= hlen;
@ -228,6 +225,83 @@ gre_input2(struct mbuf *m ,int hlen,u_char proto)
return(1); /* packet is done, no further processing needed */
}
/*
* input routine for IPPRPOTO_MOBILE
* This is a little bit diffrent from the other modes, as the
* encapsulating header was not prepended, but instead inserted
* between IP header and payload
*/
void
#if __STDC__
gre_mobile_input(struct mbuf *m, ...)
#else
gre_mobile_input(m, va_alist)
struct mbuf *m;
va_dcl
#endif
{
register struct ip *ip = mtod(m, struct ip *);
register struct mobip_h *mip = mtod(m, struct mobip_h *);
register struct ifqueue *ifq;
struct gre_softc *sc = NULL;
register int hlen,s;
va_list ap;
u_char osrc=0;
int i,msiz;
va_start(ap,m);
hlen=va_arg(ap, int);
va_end(ap);
i=match_tunnel(m,IPPROTO_MOBILE);
if (i!=-1) {
sc=&gre_softc[i];
/* found matching tunnel that is up */
sc->sc_if.if_ipackets++;
sc->sc_if.if_ibytes+=m->m_pkthdr.len;
} else { /* no matching tunnel or match, but tunnel down */
m_freem(m);
return;
}
if(ntohs(mip->mh.proto) & MOB_H_SBIT) {
osrc=1;
msiz=MOB_H_SIZ_L;
mip->mi.ip_src.s_addr=mip->mh.osrc;
} else {
msiz=MOB_H_SIZ_S;
}
mip->mi.ip_dst.s_addr=mip->mh.odst;
mip->mi.ip_p=(ntohs(mip->mh.proto) >> 8);
if (gre_in_cksum((u_short*)&mip->mh,msiz)!=0) {
m_freem(m);
return;
}
memmove(ip+(ip->ip_hl<<2),ip+(ip->ip_hl<<2)+msiz,
m->m_len-msiz-(ip->ip_hl<<2));
m->m_len-=msiz;
ip->ip_len-=msiz;
ip->ip_len+=ip->ip_hl<<2; /* ip input "stripped" this off */
HTONS(ip->ip_len);
m->m_pkthdr.len-=msiz;
ip->ip_sum=0;
ip->ip_sum=in_cksum(m,(ip->ip_hl << 2));
ifq = &ipintrq;
s = splimp(); /* possible */
if (IF_QFULL(ifq)) {
IF_DROP(ifq);
m_freem(m);
} else {
IF_ENQUEUE(ifq,m);
}
splx(s);
}
#ifndef MROUTING
@ -266,6 +340,41 @@ ipip_input(m, va_alist)
}
#endif /* ifndef MROUTING */
/*
* go through tunnel interfaces and see if we have a matching one
* returns i where gre_softc[i] is the match on success, -1 otherwise.
*/
static int
match_tunnel(struct mbuf *m,u_char proto)
{
register struct ip *ip = mtod(m, struct ip *);
register int i,r;
struct gre_softc *sc = NULL;
i=0;
do {
sc=&gre_softc[i];
if((sc->g_dst.s_addr == ip->ip_src.s_addr) &&
(sc->g_src.s_addr == ip->ip_dst.s_addr))
break;
i++;
} while(i<NGRE);
if ((i<NGRE) && ((sc->sc_if.if_flags & IFF_UP) == IFF_UP)) {
r=i;
} else {
r=-1;
}
if (sc->g_proto != proto) {
r=-1;
}
return(r);
}
#endif /* if NGRE > 0 */

5
sys/netinet/ip_gre.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_gre.h,v 1.1 1998/09/13 20:27:48 hwr Exp $ */
/* $NetBSD: ip_gre.h,v 1.2 1998/09/30 05:59:29 hwr Exp $ */
/*
* (c) 1998 The NetBSD Foundation, Inc.
@ -39,9 +39,12 @@
#ifdef _KERNEL
void gre_input __P((struct mbuf *, ...));
int gre_input2 __P((struct mbuf *,int hlen,u_char proto));
void gre_mobile_input __P((struct mbuf *, ...));
#ifndef MROUTING
void gre_ipip_input __P((struct mbuf *, ...));
#endif
#endif /* _KERNEL */