d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r260702 (by melifaro):

Browse Source 
Fix ipfw fwd for IPv4 traffic broken by r249894.

  Problem case:
  Original lookup returns route with GW set, so gw points to
  rte->rt_gateway.
  After that we're changing dst and performing lookup another time.
  Since fwd host is most probably directly reachable, resulting
  rte does not contain rt_gateway, so gw is not set. Finally, we
  end with packet transmitted to proper interface but wrong
  link-layer address.
This commit is contained in:
ae 2014-02-06 10:48:55 +00:00
parent d65cbb1877
commit 88938f44a0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet/ip_output.c
View File

@ -200,6 +200,13 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
hlen = ip->ip_hl << 2;
}
/*
* dst/gw handling:
*
* dst can be rewritten but always point to &ro->ro_dst
* gw is readonly but can be pointed either to dst OR rt_gatewy
* therefore we need restore GW if we're re-doing lookup
*/
gw = dst = (struct sockaddr_in *)&ro->ro_dst;
again:
ia = NULL;
@ -219,6 +226,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
RO_RTFREE(ro);
ro->ro_lle = NULL;
rte = NULL;
gw = dst;
}
if (rte == NULL && fwd_tag == NULL) {
bzero(dst, sizeof(*dst));