Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-4]: src/sys/net pullup 1.7->1.8 (explorer)
details: https://anonhg.NetBSD.org/src/rev/90f388b7c39b
branches: netbsd-1-4
changeset: 469155:90f388b7c39b
user: perry <perry%NetBSD.org@localhost>
date: Fri Jul 02 16:36:35 1999 +0000
description:
pullup 1.7->1.8 (explorer)
diffstat:
sys/net/if_gre.c | 243 +++++++++++++++++++++++++++---------------------------
1 files changed, 121 insertions(+), 122 deletions(-)
diffs (truncated from 460 to 300 lines):
diff -r 13cd189e9126 -r 90f388b7c39b sys/net/if_gre.c
--- a/sys/net/if_gre.c Fri Jul 02 16:31:50 1999 +0000
+++ b/sys/net/if_gre.c Fri Jul 02 16:36:35 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.7 1999/03/12 22:42:31 perry Exp $ */
+/* $NetBSD: if_gre.c,v 1.7.2.1 1999/07/02 16:36:35 perry Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -120,14 +120,14 @@
void gre_inet_ntoa(struct in_addr in);
#endif
-void greattach(void)
+void
+greattach(void)
{
-
- register struct gre_softc *sc;
- register int i;
+ struct gre_softc *sc;
+ int i;
i = 0 ;
- for (sc=gre_softc ; i < NGRE; sc++ ) {
+ for (sc = gre_softc ; i < NGRE ; sc++ ) {
sprintf(sc->sc_if.if_xname, "gre%d", i++);
sc->sc_if.if_softc = sc;
sc->sc_if.if_type = IFT_OTHER;
@@ -137,13 +137,13 @@
sc->sc_if.if_flags = IFF_POINTOPOINT|IFF_MULTICAST;
sc->sc_if.if_output = gre_output;
sc->sc_if.if_ioctl = gre_ioctl;
- sc->sc_if.if_collisions=0;
- sc->sc_if.if_ierrors=0;
- sc->sc_if.if_oerrors=0;
- sc->sc_if.if_ipackets=0;
- sc->sc_if.if_opackets=0;
- sc->g_dst.s_addr=sc->g_src.s_addr=INADDR_ANY;
- sc->g_proto=IPPROTO_GRE;
+ sc->sc_if.if_collisions = 0;
+ sc->sc_if.if_ierrors = 0;
+ sc->sc_if.if_oerrors = 0;
+ sc->sc_if.if_ipackets = 0;
+ sc->sc_if.if_opackets = 0;
+ sc->g_dst.s_addr = sc->g_src.s_addr=INADDR_ANY;
+ sc->g_proto = IPPROTO_GRE;
if_attach(&sc->sc_if);
#if 0
#if NBPFILTER > 0
@@ -160,27 +160,26 @@
* given by sc->g_proto. See also RFC 1701 and RFC 2004
*/
+#if 0
struct ip ip_h;
+#endif
struct mobile_h mob_h;
int
-gre_output(ifp, m, dst, rt)
- struct ifnet *ifp;
- register struct mbuf *m;
- struct sockaddr *dst;
- register struct rtentry *rt;
+gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
+ struct rtentry *rt)
{
- int error=0;
- struct gre_softc *sc=(struct gre_softc *)(ifp->if_softc);
+ int error = 0;
+ struct gre_softc *sc = (struct gre_softc *)(ifp->if_softc);
struct greip *gh;
struct ip *inp;
- u_char ttl,osrc;
- u_short etype=0;
+ u_char ttl, osrc;
+ u_short etype = 0;
- gh=NULL;
- inp=NULL;
- osrc=0;
+ gh = NULL;
+ inp = NULL;
+ osrc = 0;
#if 0
#if NBPFILTER >0
@@ -190,8 +189,8 @@
struct mbuf m0;
u_int af = dst->sa_family;
- m0.m_next =m;
- m0.m_len =4;
+ m0.m_next = m;
+ m0.m_len = 4;
m0.m_data = (char *)⁡
bpf_mtap(ifp->if_bpf, &m0);
@@ -199,110 +198,111 @@
#endif
#endif
- ttl=255;
+ ttl = 255;
if (sc->g_proto == IPPROTO_MOBILE) {
if (dst->sa_family == AF_INET) {
struct mbuf *m0;
int msiz;
- inp=mtod(m,struct ip *);
+ 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;
+ 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 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;
+ 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;
+ 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);
+ 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 (m0 == NULL) {
IF_DROP(&ifp->if_snd);
m_freem(m);
- return(ENOBUFS);
+ return (ENOBUFS);
}
- m0->m_next=m;
+ 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_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;
- memmove(mtod(m, caddr_t), inp, sizeof(struct ip));
+ 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;
+ memmove(mtod(m, caddr_t), inp,
+ sizeof(struct ip));
}
- inp=mtod(m,struct ip *);
- memcpy((caddr_t) (inp+1), &mob_h, (unsigned) msiz);
+ inp=mtod(m, struct ip *);
+ memcpy((caddr_t)(inp + 1), &mob_h, (unsigned)msiz);
NTOHS(inp->ip_len);
- inp->ip_len+=msiz;
+ inp->ip_len += msiz;
} else { /* AF_INET */
IF_DROP(&ifp->if_snd);
m_freem(m);
- return(EINVAL);
+ return (EINVAL);
}
} else if (sc->g_proto == IPPROTO_GRE) {
switch(dst->sa_family) {
case AF_INET:
- inp=mtod(m,struct ip *);
- ttl=inp->ip_ttl;
- etype=ETHERTYPE_IP;
+ inp = mtod(m, struct ip *);
+ ttl = inp->ip_ttl;
+ etype = ETHERTYPE_IP;
break;
#ifdef NETATALK
case AF_APPLETALK:
- etype=ETHERTYPE_ATALK;
+ etype = ETHERTYPE_ATALK;
break;
#endif
#ifdef NS
case AF_NS:
- etype=ETHERTYPE_NS;
+ etype = ETHERTYPE_NS;
break;
#endif
default:
IF_DROP(&ifp->if_snd);
m_freem(m);
- return(EAFNOSUPPORT);
+ return (EAFNOSUPPORT);
}
- M_PREPEND(m,sizeof(struct greip),M_DONTWAIT);
+ M_PREPEND(m, sizeof(struct greip), M_DONTWAIT);
} else {
- error= EINVAL;
+ error = EINVAL;
IF_DROP(&ifp->if_snd);
m_freem(m);
- return(error);
+ return (error);
}
if (m == NULL) {
IF_DROP(&ifp->if_snd);
- return(ENOBUFS);
+ return (ENOBUFS);
}
- gh=mtod(m,struct greip *);
- if (sc->g_proto == IPPROTO_GRE){
+ gh = mtod(m, struct greip *);
+ if (sc->g_proto == IPPROTO_GRE) {
/* we don't have any GRE flags for now */
- memset((void*)&gh->gi_g,0, sizeof(struct gre_h));
- gh->gi_ptype=htons(etype);
+ memset((void *)&gh->gi_g, 0, sizeof(struct gre_h));
+ gh->gi_ptype = htons(etype);
}
gh->gi_pr = sc->g_proto;
@@ -310,39 +310,35 @@
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;
+ ((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;
+ ifp->if_obytes += m->m_pkthdr.len;
/* send it off */
- error=ip_output(m,NULL,&sc->route,0,NULL);
- if (error) {
+ error = ip_output(m, NULL, &sc->route, 0, NULL);
+ if (error)
ifp->if_oerrors++;
- }
- return(error);
+ return (error);
}
int
-gre_ioctl(ifp, cmd, data)
- struct ifnet *ifp;
- u_long cmd;
- caddr_t data;
+gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
- register struct ifaddr *ifa = (struct ifaddr *)data;
- register struct ifreq *ifr = (struct ifreq *)data;
- register struct in_ifaddr *ia = (struct in_ifaddr *)data;
- register struct gre_softc *sc = ifp->if_softc;
+ struct ifaddr *ifa = (struct ifaddr *)data;
+ struct ifreq *ifr = (struct ifreq *)data;
+ struct in_ifaddr *ia = (struct in_ifaddr *)data;
+ struct gre_softc *sc = ifp->if_softc;
int s;
struct sockaddr_in si;
Home |
Main Index |
Thread Index |
Old Index