zebra: remove rt_ioctl kernel interface

None of the BSDs uses ioctls to set routes anymore.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Greg Troxel <gdt@ir.bbn.com>
Acked-by: Feng Lu <lu.feng@6wind.com>
Acked-by: Paul Jakma <paul@jakma.org>

diff --git a/configure.ac b/configure.ac
index fb94dff57c045e4977503ca1ea8aac158469de34..3b3889045be3ae066f37af9f2afaf4259b9f6f01 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -832,36 +832,10 @@ if test x"$opsys" = x"gnu-linux"; then
   AC_DEFINE(HAVE_NETLINK,,netlink)
   netlink=yes
   AC_CHECK_DECLS([IFLA_INFO_SLAVE_KIND], [], [], [#include <linux/if_link.h>])
-elif test x"$opsys" = x"sol2-6";then
-  AC_MSG_RESULT(Route socket)
-  KERNEL_METHOD="kernel_socket.o"
-  RT_METHOD="rt_socket.o"
-elif test x"$opsys" = x"sol8";then
+else
   AC_MSG_RESULT(Route socket)
   KERNEL_METHOD="kernel_socket.o"
   RT_METHOD="rt_socket.o"
-else
-  AC_TRY_RUN([#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-main ()
-{
-  int ac_sock;
-
-  ac_sock = socket (AF_ROUTE, SOCK_RAW, 0);
-  if (ac_sock < 0 && errno == EINVAL)
-    exit (1);
-  exit (0);
-}],
-  [KERNEL_METHOD=kernel_socket.o
-   RT_METHOD=rt_socket.o
-   AC_MSG_RESULT(socket)],
-  [RT_METHOD=rt_ioctl.o
-   AC_MSG_RESULT(ioctl)],
-  [KERNEL_METHOD=kernel_socket.o
-   RT_METHOD=rt_socket.o
-   AC_MSG_RESULT(socket)])
 fi
 AC_SUBST(RT_METHOD)
 AC_SUBST(KERNEL_METHOD)

diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 3263137c135babe8266aa096d04cad186d9c1121..18e1f9bc0905011ee27fc4f41d4b767c2881c723 100644 (file)
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -53,7 +53,7 @@ zebra_DEPENDENCIES = $(otherobj)
 
 EXTRA_DIST = if_ioctl.c if_ioctl_solaris.c if_netlink.c \
         if_sysctl.c ipforward_proc.c \
-       ipforward_solaris.c ipforward_sysctl.c rt_ioctl.c rt_netlink.c \
+       ipforward_solaris.c ipforward_sysctl.c rt_netlink.c \
        rt_socket.c rtread_netlink.c rtread_sysctl.c \
        rtread_getmsg.c kernel_socket.c kernel_netlink.c \
        ioctl.c ioctl_solaris.c \