diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2015-10-29 16:04:11 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2015-10-29 16:04:11 +0000 |
| commit | 081729de741875ee5e0a4cfa0c23ffb47797a252 (patch) | |
| tree | 5e7ea19bf3194aa561b13e2aa6334a5de30c7fac /sys/netinet6/ip6_input.c | |
| parent | 624d86a69ebef6265c8b4d44238003b4c8d82aa1 (diff) | |
RFC 2292 API support was removed 9 years ago, but left in a binary compat
ABI form for the sake of existing programs. no programs from that era have
been able to run for quite some time. Kill it all.
ok deraadt florian millert mpi
(I believe this is my first IPv6 diff. Future, here I come!)
Diffstat (limited to 'sys/netinet6/ip6_input.c')
| -rw-r--r-- | sys/netinet6/ip6_input.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 2be6e58a85d..5fe4f880d5a 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.149 2015/10/23 00:15:07 jsg Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.150 2015/10/29 16:04:10 tedu Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -945,7 +945,6 @@ ip6_unknown_opt(u_int8_t *optp, struct mbuf *m, int off) void ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) { -#define IS2292(x, y) ((in6p->inp_flags & IN6P_RFC2292) ? (x) : (y)) struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); #ifdef SO_TIMESTAMP @@ -969,7 +968,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) pi6.ipi6_ifindex = m ? m->m_pkthdr.ph_ifidx : 0; *mp = sbcreatecontrol((caddr_t) &pi6, sizeof(struct in6_pktinfo), - IS2292(IPV6_2292PKTINFO, IPV6_PKTINFO), IPPROTO_IPV6); + IPV6_PKTINFO, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; } @@ -977,7 +976,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) if ((in6p->inp_flags & IN6P_HOPLIMIT) != 0) { int hlim = ip6->ip6_hlim & 0xff; *mp = sbcreatecontrol((caddr_t) &hlim, sizeof(int), - IS2292(IPV6_2292HOPLIMIT, IPV6_HOPLIMIT), IPPROTO_IPV6); + IPV6_HOPLIMIT, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; } @@ -1039,7 +1038,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) * Note: this constraint is removed in RFC3542. */ *mp = sbcreatecontrol((caddr_t)hbh, hbhlen, - IS2292(IPV6_2292HOPOPTS, IPV6_HOPOPTS), + IPV6_HOPOPTS, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; @@ -1100,7 +1099,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) break; *mp = sbcreatecontrol((caddr_t)ip6e, elen, - IS2292(IPV6_2292DSTOPTS, IPV6_DSTOPTS), + IPV6_DSTOPTS, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; @@ -1111,7 +1110,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) break; *mp = sbcreatecontrol((caddr_t)ip6e, elen, - IS2292(IPV6_2292RTHDR, IPV6_RTHDR), + IPV6_RTHDR, IPPROTO_IPV6); if (*mp) mp = &(*mp)->m_next; |