From c55e843e6b213d66a3abbe01aa96e83dc2118a9d Mon Sep 17 00:00:00 2001 From: "Angelos D. Keromytis" Date: Fri, 21 Jan 2000 03:15:07 +0000 Subject: Rename the ip4_* routines to ipip_*, make it so GIF tunnels are not affected by net.inet.ipip.allow (the sysctl formerly known as net.inet.ip4.allow), rename the VIF ipip_input to ipip_mroute_input. --- sys/netinet/ip_ipsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/netinet/ip_ipsp.c') diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c index c57f4b8cff8..1cfa5c21bb4 100644 --- a/sys/netinet/ip_ipsp.c +++ b/sys/netinet/ip_ipsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.c,v 1.75 2000/01/13 05:30:11 angelos Exp $ */ +/* $OpenBSD: ip_ipsp.c,v 1.76 2000/01/21 03:15:05 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -139,7 +139,7 @@ struct xformsw xformsw[] = { { XF_IP4, 0, "IPv4 Simple Encapsulation", ipe4_attach, ipe4_init, ipe4_zeroize, (struct mbuf * (*)(struct mbuf *, struct tdb *, int, int))ipe4_input, - ipe4_output, }, + ipip_output, }, { XF_OLD_AH, XFT_AUTH, "Keyed Authentication, RFC 1828/1852", ah_old_attach, ah_old_init, ah_old_zeroize, ah_old_input, ah_old_output, }, @@ -1822,7 +1822,7 @@ ipsp_process_packet(struct mbuf *m, struct mbuf **mp, struct tdb *tdb, int *af, #endif /* INET6 */ /* Encapsulate -- the last two arguments are unused */ - error = ipe4_output(m, tdb, mp, 0, 0); + error = ipip_output(m, tdb, mp, 0, 0); if (((*mp) == NULL) && (!error)) error = EFAULT; if (error) -- cgit v1.2.3