diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2005-05-26 22:37:36 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2005-05-26 22:37:36 +0000 |
| commit | 21aa28c09910dc1ea64699bda2eb5f37bdcf9fd3 (patch) | |
| tree | 691ed47c1c1d155cfdbffe71988b67faca35f5ee | |
| parent | bd086bbbec0e1e5c131e5afc53c559054af32499 (diff) | |
remove last races of SIOCADDRT and SIOCDELRT, the 4.3BSD routing table ioctls
theo ok
| -rw-r--r-- | sys/net/route.h | 18 | ||||
| -rw-r--r-- | sys/sys/sockio.h | 5 |
2 files changed, 2 insertions, 21 deletions
diff --git a/sys/net/route.h b/sys/net/route.h index 79604cf3396..8f4260dd23b 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.26 2004/09/16 22:31:30 henning Exp $ */ +/* $OpenBSD: route.h,v 1.27 2005/05/26 22:37:34 henning Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -120,20 +120,6 @@ struct rtentry { }; #define rt_use rt_rmx.rmx_pksent -/* - * Following structure necessary for 4.3 compatibility; - * We should eventually move it to a compat file. - */ -struct ortentry { - u_int32_t rt_hash; /* to speed lookups */ - struct sockaddr rt_dst; /* key */ - struct sockaddr rt_gateway; /* value */ - int16_t rt_flags; /* up/down?, host/net */ - int16_t rt_refcnt; /* # held references */ - u_int32_t rt_ouse; /* raw # packets forwarded (was: rt_use) */ - struct ifnet *rt_ifp; /* the answer: interface to use */ -}; - #define RTF_UP 0x1 /* route usable */ #define RTF_GATEWAY 0x2 /* destination is a gateway */ #define RTF_HOST 0x4 /* host entry (net otherwise) */ @@ -198,8 +184,6 @@ struct rt_msghdr { #define RTM_REDIRECT 0x6 /* Told to use different route */ #define RTM_MISS 0x7 /* Lookup failed on this address */ #define RTM_LOCK 0x8 /* fix specified metrics */ -#define RTM_OLDADD 0x9 /* caused by SIOCADDRT */ -#define RTM_OLDDEL 0xa /* caused by SIOCDELRT */ #define RTM_RESOLVE 0xb /* req to resolve dst to LL addr */ #define RTM_NEWADDR 0xc /* address being added to iface */ #define RTM_DELADDR 0xd /* address being removed from iface */ diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h index 8f0addf91cf..2c584f487f8 100644 --- a/sys/sys/sockio.h +++ b/sys/sys/sockio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sockio.h,v 1.33 2005/03/30 02:55:37 tedu Exp $ */ +/* $OpenBSD: sockio.h,v 1.34 2005/05/26 22:37:35 henning Exp $ */ /* $NetBSD: sockio.h,v 1.5 1995/08/23 00:40:47 thorpej Exp $ */ /*- @@ -46,9 +46,6 @@ #define SIOCSPGRP _IOW('s', 8, int) /* set process group */ #define SIOCGPGRP _IOR('s', 9, int) /* get process group */ -#define SIOCADDRT _IOW('r', 10, struct ortentry) /* add route */ -#define SIOCDELRT _IOW('r', 11, struct ortentry) /* delete route */ - #define SIOCSIFADDR _IOW('i', 12, struct ifreq) /* set ifnet address */ #define OSIOCGIFADDR _IOWR('i', 13, struct ifreq) /* get ifnet address */ #define SIOCGIFADDR _IOWR('i', 33, struct ifreq) /* get ifnet address */ |