Re: kill rtioctl()

2016-11-21 Thread Jonathan Gray
On Mon, Nov 21, 2016 at 10:35:58AM +0100, Martin Pieuchot wrote:
> This stub exists since the original import, time to kill it?

ok jsg@

There was a #ifndef COMPAT_43 here added in '88 and removed in '93
for back when there was no routing socket.

ifndef removed in

commit ff756c89e159c005b14cedd2c7994e61014053c7
Author: Keith Sklower 
Date:   Thu Apr 8 17:12:43 1993 -0700

new conventions for using routing tree

SCCS-vsn: 7.33

NetBSD then pulled this in with 1.10

"Update to 4.4-Lite networking code, with a few local changes."

The ifndef added with

commit eec448be8a6343d991e6414c6701c6c2130fd3fc
Author: Mike Karels 
Date:   Tue Dec 13 13:31:26 1988 -0800

checkpoint semi-working version with routing socket (by sklower)

SCCS-vsn: 7.8

> 
> Index: net/route.c
> ===
> RCS file: /cvs/src/sys/net/route.c,v
> retrieving revision 1.338
> diff -u -p -r1.338 route.c
> --- net/route.c   15 Nov 2016 10:09:28 -  1.338
> +++ net/route.c   21 Nov 2016 09:34:15 -
> @@ -728,12 +728,6 @@ rtflushclone(unsigned int rtableid, stru
>   rtable_walk(rtableid, rt_key(parent)->sa_family, rtflushclone1, parent);
>  }
>  
> -int
> -rtioctl(u_long req, caddr_t data, struct proc *p)
> -{
> - return (EOPNOTSUPP);
> -}
> -
>  struct ifaddr *
>  ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway,
>  u_int rtableid)
> Index: net/route.h
> ===
> RCS file: /cvs/src/sys/net/route.h,v
> retrieving revision 1.148
> diff -u -p -r1.148 route.h
> --- net/route.h   24 Sep 2016 19:27:10 -  1.148
> +++ net/route.h   21 Nov 2016 09:34:15 -
> @@ -403,7 +403,6 @@ intrt_ifa_del(struct ifaddr *, int, st
>  void  rt_ifa_purge(struct ifaddr *);
>  int   rt_ifa_addlocal(struct ifaddr *);
>  int   rt_ifa_dellocal(struct ifaddr *);
> -int   rtioctl(u_long, caddr_t, struct proc *);
>  void  rtredirect(struct sockaddr *, struct sockaddr *, struct sockaddr *, 
> struct rtentry **, unsigned int);
>  int   rtrequest(int, struct rt_addrinfo *, u_int8_t, struct rtentry **,
>u_int);
> Index: kern/sys_socket.c
> ===
> RCS file: /cvs/src/sys/kern/sys_socket.c,v
> retrieving revision 1.23
> diff -u -p -r1.23 sys_socket.c
> --- kern/sys_socket.c 21 Nov 2016 09:09:06 -  1.23
> +++ kern/sys_socket.c 21 Nov 2016 09:34:15 -
> @@ -122,7 +122,7 @@ soo_ioctl(struct file *fp, u_long cmd, c
>   if (IOCGROUP(cmd) == 'i')
>   return (ifioctl(so, cmd, data, p));
>   if (IOCGROUP(cmd) == 'r')
> - return (rtioctl(cmd, data, p));
> + return (EOPNOTSUPP);
>   s = splsoftnet();
>   error = ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, 
>   (struct mbuf *)cmd, (struct mbuf *)data, (struct mbuf *)NULL, p));
> 



kill rtioctl()

2016-11-21 Thread Martin Pieuchot
This stub exists since the original import, time to kill it?

Index: net/route.c
===
RCS file: /cvs/src/sys/net/route.c,v
retrieving revision 1.338
diff -u -p -r1.338 route.c
--- net/route.c 15 Nov 2016 10:09:28 -  1.338
+++ net/route.c 21 Nov 2016 09:34:15 -
@@ -728,12 +728,6 @@ rtflushclone(unsigned int rtableid, stru
rtable_walk(rtableid, rt_key(parent)->sa_family, rtflushclone1, parent);
 }
 
-int
-rtioctl(u_long req, caddr_t data, struct proc *p)
-{
-   return (EOPNOTSUPP);
-}
-
 struct ifaddr *
 ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway,
 u_int rtableid)
Index: net/route.h
===
RCS file: /cvs/src/sys/net/route.h,v
retrieving revision 1.148
diff -u -p -r1.148 route.h
--- net/route.h 24 Sep 2016 19:27:10 -  1.148
+++ net/route.h 21 Nov 2016 09:34:15 -
@@ -403,7 +403,6 @@ int  rt_ifa_del(struct ifaddr *, int, st
 voidrt_ifa_purge(struct ifaddr *);
 int rt_ifa_addlocal(struct ifaddr *);
 int rt_ifa_dellocal(struct ifaddr *);
-int rtioctl(u_long, caddr_t, struct proc *);
 voidrtredirect(struct sockaddr *, struct sockaddr *, struct sockaddr *, 
struct rtentry **, unsigned int);
 int rtrequest(int, struct rt_addrinfo *, u_int8_t, struct rtentry **,
 u_int);
Index: kern/sys_socket.c
===
RCS file: /cvs/src/sys/kern/sys_socket.c,v
retrieving revision 1.23
diff -u -p -r1.23 sys_socket.c
--- kern/sys_socket.c   21 Nov 2016 09:09:06 -  1.23
+++ kern/sys_socket.c   21 Nov 2016 09:34:15 -
@@ -122,7 +122,7 @@ soo_ioctl(struct file *fp, u_long cmd, c
if (IOCGROUP(cmd) == 'i')
return (ifioctl(so, cmd, data, p));
if (IOCGROUP(cmd) == 'r')
-   return (rtioctl(cmd, data, p));
+   return (EOPNOTSUPP);
s = splsoftnet();
error = ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, 
(struct mbuf *)cmd, (struct mbuf *)data, (struct mbuf *)NULL, p));