version 1.108.2.1, 2007/08/15 13:49:51 |
version 1.109.4.3, 2007/10/31 23:14:11 |
Line 148 struct pfil_head inet6_pfil_hook; |
|
Line 148 struct pfil_head inet6_pfil_hook; |
|
|
|
struct ip6stat ip6stat; |
struct ip6stat ip6stat; |
|
|
static void ip6_init2 __P((void *)); |
static void ip6_init2(void *); |
static struct m_tag *ip6_setdstifaddr __P((struct mbuf *, struct in6_ifaddr *)); |
static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *); |
|
|
static int ip6_hopopts_input __P((u_int32_t *, u_int32_t *, struct mbuf **, int *)); |
static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *); |
static struct mbuf *ip6_pullexthdr __P((struct mbuf *, size_t, int)); |
static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int); |
|
|
/* |
/* |
* IP6 initialization: fill in IP6 protocol switch table. |
* IP6 initialization: fill in IP6 protocol switch table. |
Line 590 ip6_input(struct mbuf *m) |
|
Line 590 ip6_input(struct mbuf *m) |
|
* as our interface address (e.g. multicast addresses, addresses |
* as our interface address (e.g. multicast addresses, addresses |
* within FAITH prefixes and such). |
* within FAITH prefixes and such). |
*/ |
*/ |
if (deliverifp && !ip6_getdstifaddr(m)) { |
if (deliverifp && ip6_getdstifaddr(m) == NULL) { |
struct in6_ifaddr *ia6; |
struct in6_ifaddr *ia6; |
|
|
ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); |
ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); |
if (ia6) { |
if (ia6 != NULL && ip6_setdstifaddr(m, ia6) == NULL) { |
if (!ip6_setdstifaddr(m, ia6)) { |
/* |
/* |
* XXX maybe we should drop the packet here, |
* XXX maybe we should drop the packet here, |
* as we could not provide enough information |
* as we could not provide enough information |
* to the upper layers. |
* to the upper layers. |
*/ |
*/ |
|
} |
|
} |
} |
} |
} |
|
|
Line 810 ip6_input(struct mbuf *m) |
|
Line 808 ip6_input(struct mbuf *m) |
|
/* XXX error stat??? */ |
/* XXX error stat??? */ |
error = EINVAL; |
error = EINVAL; |
DPRINTF(("ip6_input: no SP, packet discarded\n"));/*XXX*/ |
DPRINTF(("ip6_input: no SP, packet discarded\n"));/*XXX*/ |
goto bad; |
|
} |
} |
splx(s); |
splx(s); |
if (error) |
if (error) |
Line 830 ip6_input(struct mbuf *m) |
|
Line 827 ip6_input(struct mbuf *m) |
|
* set/grab in6_ifaddr correspond to IPv6 destination address. |
* set/grab in6_ifaddr correspond to IPv6 destination address. |
*/ |
*/ |
static struct m_tag * |
static struct m_tag * |
ip6_setdstifaddr(struct mbuf *m, struct in6_ifaddr *ia6) |
ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia) |
{ |
{ |
struct m_tag *mtag; |
struct m_tag *mtag; |
|
|
mtag = ip6_addaux(m); |
mtag = ip6_addaux(m); |
if (mtag) |
if (mtag != NULL) { |
((struct ip6aux *)(mtag + 1))->ip6a_dstia6 = ia6; |
struct ip6aux *ip6a; |
|
|
|
ip6a = (struct ip6aux *)(mtag + 1); |
|
in6_setscope(&ip6a->ip6a_src, ia->ia_ifp, &ip6a->ip6a_scope_id); |
|
ip6a->ip6a_src = ia->ia_addr.sin6_addr; |
|
ip6a->ip6a_flags = ia->ia6_flags; |
|
} |
return mtag; /* NULL if failed to set */ |
return mtag; /* NULL if failed to set */ |
} |
} |
|
|
struct in6_ifaddr * |
const struct ip6aux * |
ip6_getdstifaddr(struct mbuf *m) |
ip6_getdstifaddr(struct mbuf *m) |
{ |
{ |
struct m_tag *mtag; |
struct m_tag *mtag; |
|
|
mtag = ip6_findaux(m); |
mtag = ip6_findaux(m); |
if (mtag) |
if (mtag != NULL) |
return ((struct ip6aux *)(mtag + 1))->ip6a_dstia6; |
return (struct ip6aux *)(mtag + 1); |
else |
else |
return NULL; |
return NULL; |
} |
} |