commit 98906275a02ae260fe3f82133bd79054f8315f06
author Hans Dedecker <dedeckeh@gmail.com> Tue Dec 09 22:22:53 2014 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Tue Dec 09 22:22:53 2014 +0000
tree 4f713536fd12ab95119b2660237c2068dfabed63
parent b9ff5c8f435173cfa616e3c398bdc089ef690a07

Fix conntrack with --bind-interfaces

Make sure dst_addr is assigned the correct address in receive_query when OPTNOWILD is
enabled so the assigned mark can be correctly retrieved and set in forward_query when
conntrack is enabled.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

src/forward.c

diff --git a/src/forward.c b/src/forward.c
index 2cf29eb..408a179 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -1048,7 +1048,7 @@
   /* packet buffer overwritten */
   daemon->srv_save = NULL;
   
-  dst_addr_4.s_addr = 0;
+  dst_addr_4.s_addr = dst_addr.addr.addr4.s_addr = 0;
   netmask.s_addr = 0;
   
   if (option_bool(OPT_NOWILD) && listen->iface)
@@ -1057,7 +1057,7 @@
      
       if (listen->family == AF_INET)
 	{
-	  dst_addr_4 = listen->iface->addr.in.sin_addr;
+	  dst_addr_4 = dst_addr.addr.addr4 = listen->iface->addr.in.sin_addr;
 	  netmask = listen->iface->netmask;
 	}
     }