summaryrefslogtreecommitdiffstats
path: root/sys/netinet/in.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet/in.c')
-rw-r--r--sys/netinet/in.c42
1 files changed, 5 insertions, 37 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 4a52884..11e098e 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -827,9 +827,6 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin,
{
register u_long i = ntohl(sin->sin_addr.s_addr);
struct sockaddr_in oldaddr;
- struct rtentry *rt = NULL;
- struct rt_addrinfo info;
- static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
int s = splimp(), flags = RTF_UP, error = 0;
oldaddr = ia->ia_addr;
@@ -927,25 +924,9 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin,
/*
* add a loopback route to self
*/
- if (V_useloopback && !(ifp->if_flags & IFF_LOOPBACK)) {
- bzero(&info, sizeof(info));
- info.rti_ifp = V_loif;
- info.rti_flags = ia->ia_flags | RTF_HOST | RTF_STATIC;
- info.rti_info[RTAX_DST] = (struct sockaddr *)&ia->ia_addr;
- info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl;
- error = rtrequest1_fib(RTM_ADD, &info, &rt, 0);
-
- if (error == 0 && rt != NULL) {
- RT_LOCK(rt);
- ((struct sockaddr_dl *)rt->rt_gateway)->sdl_type =
- rt->rt_ifp->if_type;
- ((struct sockaddr_dl *)rt->rt_gateway)->sdl_index =
- rt->rt_ifp->if_index;
- RT_REMREF(rt);
- RT_UNLOCK(rt);
- } else if (error != 0)
- log(LOG_INFO, "in_ifinit: insertion failed\n");
- }
+ if (V_useloopback && !(ifp->if_flags & IFF_LOOPBACK))
+ error = ifa_add_loopback_route((struct ifaddr *)ia,
+ (struct sockaddr *)&ia->ia_addr);
return (error);
}
@@ -1064,8 +1045,6 @@ in_scrubprefix(struct in_ifaddr *target)
struct in_addr prefix, mask, p;
int error;
struct sockaddr_in prefix0, mask0;
- struct rt_addrinfo info;
- struct sockaddr_dl null_sdl;
/*
* Remove the loopback route to the interface address.
@@ -1079,19 +1058,8 @@ in_scrubprefix(struct in_ifaddr *target)
*/
if ((target->ia_addr.sin_addr.s_addr != INADDR_ANY) &&
!(target->ia_ifp->if_flags & IFF_LOOPBACK)) {
- bzero(&null_sdl, sizeof(null_sdl));
- null_sdl.sdl_len = sizeof(null_sdl);
- null_sdl.sdl_family = AF_LINK;
- null_sdl.sdl_type = V_loif->if_type;
- null_sdl.sdl_index = V_loif->if_index;
- bzero(&info, sizeof(info));
- info.rti_flags = target->ia_flags | RTF_HOST | RTF_STATIC;
- info.rti_info[RTAX_DST] = (struct sockaddr *)&target->ia_addr;
- info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl;
- error = rtrequest1_fib(RTM_DELETE, &info, NULL, 0);
-
- if (error != 0)
- log(LOG_INFO, "in_scrubprefix: deletion failed\n");
+ error = ifa_del_loopback_route((struct ifaddr *)target,
+ (struct sockaddr *)&target->ia_addr);
}
if ((target->ia_flags & IFA_ROUTE) == 0) {
OpenPOWER on IntegriCloud