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

ipip_input() -> mrt_ipip_input().

This commit is contained in:
thorpej 1998-12-22 02:51:32 +00:00
parent 12d0e6e8f7
commit 5f69dedb2c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netinet/in_proto.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in_proto.c,v 1.26 1998/09/30 05:59:28 hwr Exp $ */
/* $NetBSD: in_proto.c,v 1.27 1998/12/22 02:51:32 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@ -123,7 +123,7 @@ struct protosw inetsw[] = {
},
#ifdef MROUTING
{ SOCK_RAW, &inetdomain, IPPROTO_IPIP, PR_ATOMIC|PR_ADDR,
ipip_input, rip_output, 0, rip_ctloutput,
mrt_ipip_input,rip_output, 0, rip_ctloutput,
rip_usrreq, /* XXX */
0, 0, 0, 0,
},

10
sys/netinet/ip_mroute.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_mroute.c,v 1.37 1998/09/13 20:27:48 hwr Exp $ */
/* $NetBSD: ip_mroute.c,v 1.38 1998/12/22 02:51:32 thorpej Exp $ */
/*
* IP multicast forwarding procedures
@ -164,7 +164,7 @@ static vifi_t numvifs = 0;
static int have_encap_tunnel = 0;
/*
* one-back cache used by ipip_input to locate a tunnel's vif
* one-back cache used by mrt_ipip_input to locate a tunnel's vif
* given a datagram's src ip address.
*/
static struct in_addr last_encap_src;
@ -566,7 +566,7 @@ add_vif(m)
/* Prepare cached route entry. */
bzero(&vifp->v_route, sizeof(vifp->v_route));
/* Tell ipip_input() to start looking at encapsulated packets. */
/* Tell mrt_ipip_input() to start looking at encapsulated packets. */
have_encap_tunnel = 1;
} else {
/* Use the physical interface associated with the address. */
@ -1444,9 +1444,9 @@ encap_send(ip, vifp, m)
*/
void
#if __STDC__
ipip_input(struct mbuf *m, ...)
mrt_ipip_input(struct mbuf *m, ...)
#else
ipip_input(m, va_alist)
mrt_ipip_input(m, va_alist)
struct mbuf *m;
va_dcl
#endif

4
sys/netinet/ip_mroute.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_mroute.h,v 1.13 1998/02/10 01:26:57 perry Exp $ */
/* $NetBSD: ip_mroute.h,v 1.14 1998/12/22 02:51:33 thorpej Exp $ */
/*
* Definitions for IP multicast forwarding.
@ -215,7 +215,7 @@ void rsvp_input __P((struct mbuf *, struct ifnet *));
#else
int ip_mforward __P((struct mbuf *, struct ifnet *));
#endif
void ipip_input __P((struct mbuf *, ...));
void mrt_ipip_input __P((struct mbuf *, ...));
#endif /* _KERNEL */