summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2014-04-23 09:30:57 +0000
committermpi <mpi@openbsd.org>2014-04-23 09:30:57 +0000
commita7d6e3ba1229d0f7f9c38710653eb22958597dd3 (patch)
tree58ee5f9452d7558dc10df5bde981577c09c80465
parentMerge traceroute6 into traceroute. (diff)
downloadwireguard-openbsd-a7d6e3ba1229d0f7f9c38710653eb22958597dd3.tar.xz
wireguard-openbsd-a7d6e3ba1229d0f7f9c38710653eb22958597dd3.zip
You don't want to use ifa_ifwithroute(), it exists for to the routing
crazyness only.
-rw-r--r--sys/net/if_var.h4
-rw-r--r--sys/net/route.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index a63e0a94be6..34061ae5862 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_var.h,v 1.8 2014/04/19 15:57:25 henning Exp $ */
+/* $OpenBSD: if_var.h,v 1.9 2014/04/23 09:30:57 mpi Exp $ */
/* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */
/*
@@ -425,8 +425,6 @@ void ifnewlladdr(struct ifnet *);
struct ifaddr *ifa_ifwithaddr(struct sockaddr *, u_int);
struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *, u_int);
struct ifaddr *ifa_ifwithnet(struct sockaddr *, u_int);
-struct ifaddr *ifa_ifwithroute(int, struct sockaddr *,
- struct sockaddr *, u_int);
struct ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *);
void ifafree(struct ifaddr *);
void link_rtrequest(int, struct rtentry *);
diff --git a/sys/net/route.c b/sys/net/route.c
index 6442a7661dc..49f73e5afd8 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.162 2014/04/22 12:35:00 mpi Exp $ */
+/* $OpenBSD: route.c,v 1.163 2014/04/23 09:30:57 mpi Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
@@ -151,6 +151,9 @@ int rtflushclone1(struct radix_node *, void *, u_int);
void rtflushclone(struct radix_node_head *, struct rtentry *);
int rt_if_remove_rtdelete(struct radix_node *, void *, u_int);
+struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *,
+ u_int);
+
#define LABELID_MAX 50000
struct rt_label {