Revert all the bits of the autocreate 127.0.0.1 on lo(4) creation for now.

This needs to go back to the drawing board.

2 files changed, 2 insertions, 59 deletions

diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 24f8b4ca5d2..60b02a4656c 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.c,v 1.146 2018/02/10 08:47:37 claudio Exp $	*/
+/*	$OpenBSD: in.c,v 1.147 2018/03/02 15:52:11 claudio Exp $	*/
 /*	$NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $	*/
 
 /*
@@ -609,62 +609,6 @@ in_broadcast(struct in_addr in, u_int rtableid)
 #undef ia
 }
 
-int
-in_up_loopback(struct ifnet *ifp)
-{
-	struct in_ifaddr *ia;
-	struct rt_addrinfo info;
-	int error;
-
-	if ((ifp->if_flags & IFF_LOOPBACK) == 0)
-		return (0);
-
-	/* configure 127.0.0.1 on the loopback interface */
-	ia = malloc(sizeof *ia, M_IFADDR, M_WAITOK | M_ZERO);
-	ia->ia_addr.sin_family = AF_INET;
-	ia->ia_addr.sin_len = sizeof(ia->ia_addr);
-	ia->ia_addr.sin_addr.s_addr = INADDR_LOOPBACK;
-	ia->ia_ifa.ifa_addr = sintosa(&ia->ia_addr);
-	ia->ia_ifa.ifa_dstaddr = sintosa(&ia->ia_dstaddr);
-	ia->ia_ifa.ifa_netmask = sintosa(&ia->ia_sockmask);
-	ia->ia_netmask = IN_CLASSA_NET;
-	ia->ia_sockmask.sin_len = 8;
-	ia->ia_sockmask.sin_addr.s_addr = ia->ia_netmask;
-	ia->ia_ifp = ifp;
-
-	if (ifaof_ifpforaddr(ia->ia_ifa.ifa_addr, ifp) != NULL) {
-		free(ia, M_IFADDR, sizeof *ia);
-		return (0);
-	}
-
-	/*
-	 * Add the address to the local list and the global tree.  If an
-	 * error occured, cleanup.
-	 */
-	ifa_add(ifp, &ia->ia_ifa);
-	error = rt_ifa_addlocal(&ia->ia_ifa);
-	if (error)
-		goto out;
-
-	ia->ia_net = ia->ia_addr.sin_addr.s_addr & ia->ia_netmask;
-	in_socktrim(&ia->ia_sockmask);
-
-	/* Now insert a reject route for 127.0.0.0/8 */
-	bzero(&info, sizeof(info));
-	info.rti_flags = RTF_GATEWAY | RTF_REJECT | RTF_STATIC;
-	info.rti_ifa = &ia->ia_ifa;
-	info.rti_info[RTAX_DST] = ia->ia_ifa.ifa_addr;
-	info.rti_info[RTAX_NETMASK] = ia->ia_ifa.ifa_netmask;
-	info.rti_info[RTAX_GATEWAY] = ia->ia_ifa.ifa_addr;
-
-	error = rtrequest(RTM_ADD, &info, 0, NULL, ifp->if_rdomain);
-
-out:
-	if (error)
-		in_purgeaddr(&ia->ia_ifa);
-	return (error);
-}
-
 /*
  * Add an address to the list of IP multicast addresses for a given interface.
  */
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 02233bb3d08..588c724e771 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.h,v 1.128 2018/02/10 05:32:21 claudio Exp $	*/
+/*	$OpenBSD: in.h,v 1.129 2018/03/02 15:52:11 claudio Exp $	*/
 /*	$NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $	*/
 
 /*
@@ -811,7 +811,6 @@ int	   in_cksum(struct mbuf *, int);
 int	   in4_cksum(struct mbuf *, u_int8_t, int, int);
 void	   in_proto_cksum_out(struct mbuf *, struct ifnet *);
 void	   in_ifdetach(struct ifnet *);
-int	   in_up_loopback(struct ifnet *);
 int	   in_mask2len(struct in_addr *);
 void	   in_len2mask(struct in_addr *, int);
 int	   in_nam2sin(const struct mbuf *, struct sockaddr_in **);