mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

When we have some address to forward (e.g. it was specified with ipfw fwd),

Browse Source 
we should pass it as first argument into in6_selectroute_fib function to
initiate new route lookup.

MFC after:	1 week
This commit is contained in:
Andrey V. Elsukov 2012-12-19 17:28:17 +00:00
parent 16607317b5
commit f8fe3dc9aa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=244441
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/netinet6/ip6_output.c
View File

@ -257,7 +257,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
int segleft_org = 0;
struct secpolicy *sp = NULL;
#endif /* IPSEC */
struct m_tag *fwd_tag;
struct m_tag *fwd_tag = NULL;
ip6 = mtod(m, struct ip6_hdr *);
if (ip6 == NULL) {
@ -636,14 +636,16 @@ skip_ipsec2:;
/* adjust pointer */
ip6 = mtod(m, struct ip6_hdr *);
if (ro->ro_rt) {
if (ro->ro_rt && fwd_tag == NULL) {
rt = ro->ro_rt;
ifp = ro->ro_rt->rt_ifp;
} else {
bzero(&dst_sa, sizeof(dst_sa));
dst_sa.sin6_family = AF_INET6;
dst_sa.sin6_len = sizeof(dst_sa);
dst_sa.sin6_addr = ip6->ip6_dst;
if (fwd_tag == NULL) {
bzero(&dst_sa, sizeof(dst_sa));
dst_sa.sin6_family = AF_INET6;
dst_sa.sin6_len = sizeof(dst_sa);
dst_sa.sin6_addr = ip6->ip6_dst;
}
error = in6_selectroute_fib(&dst_sa, opt, im6o, ro, &ifp,
&rt, inp ? inp->inp_inc.inc_fibnum : M_GETFIB(m));
if (error != 0) {
@ -928,7 +930,7 @@ skip_ipsec2:;
if ((m->m_flags & M_IP6_NEXTHOP) &&
(fwd_tag = m_tag_find(m, PACKET_TAG_IPFORWARD, NULL)) != NULL) {
dst = (struct sockaddr_in6 *)&ro->ro_dst;
bcopy((fwd_tag+1), dst, sizeof(struct sockaddr_in6));
bcopy((fwd_tag+1), &dst_sa, sizeof(struct sockaddr_in6));
m->m_flags |= M_SKIP_FIREWALL;
m->m_flags &= ~M_IP6_NEXTHOP;
m_tag_delete(m, fwd_tag);