zebra: remove unused code from zebra netlink

diff --git a/zebra/kernel_null.c b/zebra/kernel_null.c
index b90c6f57f9d08ef58b8bf5e89ef721befecea4dc..17b3c7bc8d421a1e25767f8648b897f48bc5ca7d 100644 (file)
--- a/zebra/kernel_null.c
+++ b/zebra/kernel_null.c
@@ -39,9 +39,6 @@ int kernel_add_ipv6 (struct prefix *a, struct rib *b) { return 0; }
 int kernel_update_ipv6 (struct prefix *a, struct rib *b) { return 0; }
 int kernel_delete_ipv6 (struct prefix *a, struct rib *b) { return 0; }
 
-int kernel_add_route (struct prefix_ipv4 *a, struct in_addr *b, int c, int d)
-{ return 0; }
-
 int kernel_address_add_ipv4 (struct interface *a, struct connected *b)
 {
   zlog_debug ("%s", __func__);

diff --git a/zebra/rt.h b/zebra/rt.h
index 4515d56a38f18e0c815f4642ca81ff560d365cd9..46e71fa46e41a5114e5eb5c86ad87cd6ab652e5c 100644 (file)
--- a/zebra/rt.h
+++ b/zebra/rt.h
@@ -30,16 +30,13 @@
 extern int kernel_add_ipv4 (struct prefix *, struct rib *);
 extern int kernel_update_ipv4 (struct prefix *, struct rib *);
 extern int kernel_delete_ipv4 (struct prefix *, struct rib *);
-extern int kernel_add_route (struct prefix_ipv4 *, struct in_addr *, int, int);
+
 extern int kernel_address_add_ipv4 (struct interface *, struct connected *);
 extern int kernel_address_delete_ipv4 (struct interface *, struct connected *);
 extern int kernel_neigh_update (int, int, uint32_t, char *, int);
 
-#ifdef HAVE_IPV6
 extern int kernel_add_ipv6 (struct prefix *, struct rib *);
 extern int kernel_update_ipv6 (struct prefix *, struct rib *);
 extern int kernel_delete_ipv6 (struct prefix *, struct rib *);
 
-#endif /* HAVE_IPV6 */
-
 #endif /* _ZEBRA_RT_H */

diff --git a/zebra/rt_ioctl.c b/zebra/rt_ioctl.c
index 383c5f71ac616d2e0ac62d38bdcb8fb1968b8492..597392c38a16b64dc00393cf1729790f6301faae 100644 (file)
--- a/zebra/rt_ioctl.c
+++ b/zebra/rt_ioctl.c
@@ -46,121 +46,11 @@ kernel_read (int sock)
   return;
 }
 
-#if 0
-/* Initialization prototype of struct sockaddr_in. */
-static struct sockaddr_in sin_proto =
-{
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-  sizeof (struct sockaddr_in), 
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-  AF_INET, 0, {0}, {0}
-};
-#endif /* 0 */
-
 /* Solaris has ortentry. */
 #ifdef HAVE_OLD_RTENTRY
 #define rtentry ortentry
 #endif /* HAVE_OLD_RTENTRY */
 
-/* Interface to ioctl route message. */
-int
-kernel_add_route (struct prefix_ipv4 *dest, struct in_addr *gate,
-                 int index, int flags)
-{
-  int ret;
-  int sock;
-  struct rtentry rtentry;
-  struct sockaddr_in sin_dest, sin_mask, sin_gate;
-
-  memset (&rtentry, 0, sizeof (struct rtentry));
-
-  /* Make destination. */
-  memset (&sin_dest, 0, sizeof (struct sockaddr_in));
-  sin_dest.sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-  sin_dest.sin_len = sizeof (struct sockaddr_in);
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-  sin_dest.sin_addr = dest->prefix;
-
-  /* Make gateway. */
-  if (gate)
-    {
-      memset (&sin_gate, 0, sizeof (struct sockaddr_in));
-      sin_gate.sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-      sin_gate.sin_len = sizeof (struct sockaddr_in);
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-      sin_gate.sin_addr = *gate;
-    }
-
-  memset (&sin_mask, 0, sizeof (struct sockaddr_in));
-  sin_mask.sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-      sin_gate.sin_len = sizeof (struct sockaddr_in);
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-  masklen2ip (dest->prefixlen, &sin_mask.sin_addr);
-
-  /* Set destination address, mask and gateway.*/
-  memcpy (&rtentry.rt_dst, &sin_dest, sizeof (struct sockaddr_in));
-  if (gate)
-    memcpy (&rtentry.rt_gateway, &sin_gate, sizeof (struct sockaddr_in));
-#ifndef SUNOS_5
-  memcpy (&rtentry.rt_genmask, &sin_mask, sizeof (struct sockaddr_in));
-#endif /* SUNOS_5 */
-
-  /* Routing entry flag set. */
-  if (dest->prefixlen == 32)
-    rtentry.rt_flags |= RTF_HOST;
-
-  if (gate && gate->s_addr != INADDR_ANY)
-    rtentry.rt_flags |= RTF_GATEWAY;
-
-  rtentry.rt_flags |= RTF_UP;
-
-  /* Additional flags */
-  rtentry.rt_flags |= flags;
-
-
-  /* For tagging route. */
-  /* rtentry.rt_flags |= RTF_DYNAMIC; */
-
-  /* Open socket for ioctl. */
-  sock = socket (AF_INET, SOCK_DGRAM, 0);
-  if (sock < 0)
-    {
-      zlog_warn ("can't make socket\n");
-      return -1;
-    }
-
-  /* Send message by ioctl(). */
-  ret = ioctl (sock, SIOCADDRT, &rtentry);
-  if (ret < 0)
-    {
-      switch (errno) 
-       {
-       case EEXIST:
-         close (sock);
-         return ZEBRA_ERR_RTEXIST;
-         break;
-       case ENETUNREACH:
-         close (sock);
-         return ZEBRA_ERR_RTUNREACH;
-         break;
-       case EPERM:
-         close (sock);
-         return ZEBRA_ERR_EPERM;
-         break;
-       }
-
-      close (sock);
-      zlog_warn ("write : %s (%d)", safe_strerror (errno), errno);
-      return 1;
-    }
-  close (sock);
-
-  return ret;
-}
-
 /* Interface to ioctl route message. */
 static int
 kernel_ioctl_ipv4 (u_long cmd, struct prefix *p, struct rib *rib, int family)