Remove deprecated RFC2292 ancillary data convenience functions.

They are obsoleted by the RFC3542 api.

ok mpi@

1 files changed, 1 insertions, 180 deletions

diff --git a/src/lib/libc/net/rthdr.c b/src/lib/libc/net/rthdr.c
index d10334e027..9e917f1009 100644
--- a/src/lib/libc/net/rthdr.c
+++ b/src/lib/libc/net/rthdr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: rthdr.c,v 1.8 2006/12/09 01:12:28 itojun Exp $        */
+/*      $OpenBSD: rthdr.c,v 1.9 2014/06/13 15:41:06 chrisz Exp $        */
 /*      $KAME: rthdr.c,v 1.22 2006/02/09 08:18:58 keiichi Exp $ */
 
 /*
@@ -41,185 +41,6 @@
 #include <stdio.h>
 
 /*
- * RFC2292 API
- */
-
-size_t
-inet6_rthdr_space(int type, int seg)
-{
-        switch (type) {
-        case IPV6_RTHDR_TYPE_0:
-                if (seg < 1 || seg > 23)
-                        return (0);
-                return (CMSG_SPACE(sizeof(struct in6_addr) * seg +
-                    sizeof(struct ip6_rthdr0)));
-        default:
-                return (0);
-        }
-}
-
-struct cmsghdr *
-inet6_rthdr_init(void *bp, int type)
-{
-        struct cmsghdr *ch = (struct cmsghdr *)bp;
-        struct ip6_rthdr *rthdr;
-
-        rthdr = (struct ip6_rthdr *)CMSG_DATA(ch);
-
-        ch->cmsg_level = IPPROTO_IPV6;
-        ch->cmsg_type = IPV6_RTHDR;
-
-        switch (type) {
-        case IPV6_RTHDR_TYPE_0:
-                ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0));
-                bzero(rthdr, sizeof(struct ip6_rthdr0));
-                rthdr->ip6r_type = IPV6_RTHDR_TYPE_0;
-                return (ch);
-        default:
-                return (NULL);
-        }
-}
-
-int
-inet6_rthdr_add(struct cmsghdr *cmsg, const struct in6_addr *addr, u_int flags)
-{
-        struct ip6_rthdr *rthdr;
-
-        rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-        switch (rthdr->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-        {
-                struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-                if (flags != IPV6_RTHDR_LOOSE)
-                        return (-1);
-                if (rt0->ip6r0_segleft == 23)
-                        return (-1);
-                rt0->ip6r0_segleft++;
-                bcopy(addr, (caddr_t)rt0 + ((rt0->ip6r0_len + 1) << 3),
-                    sizeof(struct in6_addr));
-                rt0->ip6r0_len += sizeof(struct in6_addr) >> 3;
-                cmsg->cmsg_len = CMSG_LEN((rt0->ip6r0_len + 1) << 3);
-                break;
-        }
-        default:
-                return (-1);
-        }
-
-        return (0);
-}
-
-int
-inet6_rthdr_lasthop(struct cmsghdr *cmsg, unsigned int flags)
-{
-        struct ip6_rthdr *rthdr;
-
-        rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-        switch (rthdr->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-        {
-                struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-                if (flags != IPV6_RTHDR_LOOSE)
-                        return (-1);
-                if (rt0->ip6r0_segleft > 23)
-                        return (-1);
-                break;
-        }
-        default:
-                return (-1);
-        }
-
-        return (0);
-}
-
-#if 0
-int
-inet6_rthdr_reverse(in, out)
-        const struct cmsghdr *in;
-        struct cmsghdr *out;
-{
-
-        return (-1);
-}
-#endif
-
-int
-inet6_rthdr_segments(const struct cmsghdr *cmsg)
-{
-        struct ip6_rthdr *rthdr;
-
-        rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-        switch (rthdr->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-        {
-                struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-
-                if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-                        return (-1);
-
-                return (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-        }
-
-        default:
-                return (-1);
-        }
-}
-
-struct in6_addr *
-inet6_rthdr_getaddr(struct cmsghdr *cmsg, int index)
-{
-        struct ip6_rthdr *rthdr;
-
-        rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-        switch (rthdr->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-        {
-                struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-                int naddr;
-
-                if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-                        return NULL;
-                naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-                if (index <= 0 || naddr < index)
-                        return NULL;
-                return ((struct in6_addr *)(rt0 + 1)) + index;
-        }
-
-        default:
-                return NULL;
-        }
-}
-
-int
-inet6_rthdr_getflags(const struct cmsghdr *cmsg, int index)
-{
-        struct ip6_rthdr *rthdr;
-
-        rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-        switch (rthdr->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-        {
-                struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-                int naddr;
-
-                if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-                        return (-1);
-                naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-                if (index < 0 || naddr < index)
-                        return (-1);
-                return IPV6_RTHDR_LOOSE;
-        }
-
-        default:
-                return (-1);
-        }
-}
-
-/*
  * RFC3542 (2292bis) API
  */