From 865730ab9f3f71f4573388612b02b43505f56f19 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sat, 28 Jun 2014 21:49:18 +0200 Subject: [PATCH] zebra: remove rt_ioctl kernel interface None of the BSDs uses ioctls to set routes anymore. Signed-off-by: David Lamparter Acked-by: Greg Troxel Acked-by: Feng Lu Acked-by: Paul Jakma --- configure.ac | 28 +--------------------------- zebra/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/configure.ac b/configure.ac index fb94dff57c..3b3889045b 100755 --- 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 ]) -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 -#include -#include - -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 3263137c13..18e1f9bc09 100644 --- 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 \ -- 2.39.5