#include <net/net_osdep.h>
+extern u_long route_generation;
+
+static __inline__ void*
+_cast_non_const(const void * ptr) {
+ union {
+ const void* cval;
+ void* val;
+ } ret;
+
+ ret.cval = ptr;
+ return (ret.val);
+}
+
int
-in6_gif_output(ifp, family, m, rt)
- struct ifnet *ifp;
- int family; /* family of the packet to be encapsulate. */
- struct mbuf *m;
- struct rtentry *rt;
+in6_gif_output(
+ struct ifnet *ifp,
+ int family, /* family of the packet to be encapsulate. */
+ struct mbuf *m,
+ __unused struct rtentry *rt)
{
- struct gif_softc *sc = (struct gif_softc*)ifp;
+ struct gif_softc *sc = ifnet_softc(ifp);
struct sockaddr_in6 *dst = (struct sockaddr_in6 *)&sc->gif_ro6.ro_dst;
struct sockaddr_in6 *sin6_src = (struct sockaddr_in6 *)sc->gif_psrc;
struct sockaddr_in6 *sin6_dst = (struct sockaddr_in6 *)sc->gif_pdst;
struct ip *ip;
proto = IPPROTO_IPV4;
- if (m->m_len < sizeof(*ip)) {
+ if (mbuf_len(m) < sizeof(*ip)) {
m = m_pullup(m, sizeof(*ip));
if (!m)
return ENOBUFS;
#if INET6
case AF_INET6:
{
- struct ip6_hdr *ip6;
proto = IPPROTO_IPV6;
- if (m->m_len < sizeof(*ip6)) {
+ if (mbuf_len(m) < sizeof(*ip6)) {
m = m_pullup(m, sizeof(*ip6));
if (!m)
return ENOBUFS;
/* prepend new IP header */
M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT);
- if (m && m->m_len < sizeof(struct ip6_hdr))
+ if (m && mbuf_len(m) < sizeof(struct ip6_hdr))
m = m_pullup(m, sizeof(struct ip6_hdr));
if (m == NULL) {
printf("ENOBUFS in in6_gif_output %d\n", __LINE__);
ip6->ip6_flow |= htonl((u_int32_t)otos << 20);
if (dst->sin6_family != sin6_dst->sin6_family ||
- !IN6_ARE_ADDR_EQUAL(&dst->sin6_addr, &sin6_dst->sin6_addr)) {
+ !IN6_ARE_ADDR_EQUAL(&dst->sin6_addr, &sin6_dst->sin6_addr) ||
+ (sc->gif_ro6.ro_rt != NULL &&
+ (sc->gif_ro6.ro_rt->generation_id != route_generation ||
+ sc->gif_ro6.ro_rt->rt_ifp == ifp))) {
/* cache route doesn't match */
bzero(dst, sizeof(*dst));
dst->sin6_family = sin6_dst->sin6_family;
}
/* if it constitutes infinite encapsulation, punt. */
- if (sc->gif_ro.ro_rt->rt_ifp == ifp) {
+ if (sc->gif_ro6.ro_rt->rt_ifp == ifp) {
m_freem(m);
return ENETUNREACH; /*XXX*/
}
* it is too painful to ask for resend of inner packet, to achieve
* path MTU discovery for encapsulated packets.
*/
- return(ip6_output(m, 0, &sc->gif_ro6, IPV6_MINMTU, 0, NULL));
+ return(ip6_output(m, 0, &sc->gif_ro6, IPV6_MINMTU, 0, NULL, 0));
#else
- return(ip6_output(m, 0, &sc->gif_ro6, 0, 0, NULL));
+ return(ip6_output(m, 0, &sc->gif_ro6, 0, 0, NULL, 0));
#endif
}
ip6 = mtod(m, struct ip6_hdr *);
- gifp = (struct ifnet *)encap_getarg(m);
+ gifp = ((struct gif_softc*)encap_getarg(m))->gif_if;
if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) {
m_freem(m);
u_int8_t otos8;
af = AF_INET;
otos8 = (ntohl(otos) >> 20) & 0xff;
- if (m->m_len < sizeof(*ip)) {
+ if (mbuf_len(m) < sizeof(*ip)) {
m = m_pullup(m, sizeof(*ip));
if (!m)
return IPPROTO_DONE;
#if INET6
case IPPROTO_IPV6:
{
- struct ip6_hdr *ip6;
af = AF_INET6;
- if (m->m_len < sizeof(*ip6)) {
+ if (mbuf_len(m) < sizeof(*ip6)) {
m = m_pullup(m, sizeof(*ip6));
if (!m)
return IPPROTO_DONE;
m_freem(m);
return IPPROTO_DONE;
}
-
- dlil_input(gifp, m, m);
+
+ if (m->m_pkthdr.rcvif) /* replace the rcvif by gifp for ifnet_input to route it correctly */
+ m->m_pkthdr.rcvif = gifp;
+
+ ifnet_input(gifp, m, NULL);
return IPPROTO_DONE;
}
/*
- * we know that we are in IFF_UP, outer address available, and outer family
- * matched the physical addr family. see gif_encapcheck().
+ * validate outer address.
*/
-int
-gif_encapcheck6(m, off, proto, arg)
- const struct mbuf *m;
- int off;
- int proto;
- void *arg;
+static int
+gif_validate6(
+ const struct ip6_hdr *ip6,
+ struct gif_softc *sc,
+ struct ifnet *ifp)
{
- struct ip6_hdr ip6;
- struct gif_softc *sc;
struct sockaddr_in6 *src, *dst;
- int addrmatch;
- /* sanity check done in caller */
- sc = (struct gif_softc *)arg;
src = (struct sockaddr_in6 *)sc->gif_psrc;
dst = (struct sockaddr_in6 *)sc->gif_pdst;
- /* LINTED const cast */
- m_copydata((struct mbuf *)m, 0, sizeof(ip6), (caddr_t)&ip6);
-
- /* check for address match */
- addrmatch = 0;
- if (IN6_ARE_ADDR_EQUAL(&src->sin6_addr, &ip6.ip6_dst))
- addrmatch |= 1;
- if (IN6_ARE_ADDR_EQUAL(&dst->sin6_addr, &ip6.ip6_src))
- addrmatch |= 2;
- if (addrmatch != 3)
+ /*
+ * Check for address match. Note that the check is for an incoming
+ * packet. We should compare the *source* address in our configuration
+ * and the *destination* address of the packet, and vice versa.
+ */
+ if (!IN6_ARE_ADDR_EQUAL(&src->sin6_addr, &ip6->ip6_dst) ||
+ !IN6_ARE_ADDR_EQUAL(&dst->sin6_addr, &ip6->ip6_src))
return 0;
/* martian filters on outer source - done in ip6_input */
/* ingress filters on outer source */
- if ((sc->gif_if.if_flags & IFF_LINK2) == 0 &&
- (m->m_flags & M_PKTHDR) != 0 && m->m_pkthdr.rcvif) {
+ if ((ifnet_flags(sc->gif_if) & IFF_LINK2) == 0 && ifp) {
struct sockaddr_in6 sin6;
struct rtentry *rt;
bzero(&sin6, sizeof(sin6));
sin6.sin6_family = AF_INET6;
sin6.sin6_len = sizeof(struct sockaddr_in6);
- sin6.sin6_addr = ip6.ip6_src;
- /* XXX scopeid */
+ sin6.sin6_addr = ip6->ip6_src;
+#ifndef SCOPEDROUTING
+ sin6.sin6_scope_id = 0; /* XXX */
+#endif
+
rt = rtalloc1((struct sockaddr *)&sin6, 0, 0UL);
- if (!rt || rt->rt_ifp != m->m_pkthdr.rcvif) {
+ if (!rt || rt->rt_ifp != ifp) {
#if 0
log(LOG_WARNING, "%s: packet from %s dropped "
"due to ingress filter\n", if_name(&sc->gif_if),
return 128 * 2;
}
+
+/*
+ * we know that we are in IFF_UP, outer address available, and outer family
+ * matched the physical addr family. see gif_encapcheck().
+ * sanity check for arg should have been done in the caller.
+ */
+int
+gif_encapcheck6(
+ const struct mbuf *m,
+ __unused int off,
+ __unused int proto,
+ void *arg)
+{
+ struct ip6_hdr ip6;
+ struct gif_softc *sc;
+ struct ifnet *ifp;
+
+ /* sanity check done in caller */
+ sc = (struct gif_softc *)arg;
+
+ mbuf_copydata(m, 0, sizeof(ip6), &ip6);
+ ifp = ((m->m_flags & M_PKTHDR) != 0) ? m->m_pkthdr.rcvif : NULL;
+
+ return gif_validate6(&ip6, sc, ifp);
+}
projects / apple / xnu.git / blobdiff