src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch

   1 From 98906275a02ae260fe3f82133bd79054f8315f06 Mon Sep 17 00:00:00 2001
   2 From: Hans Dedecker <dedeckeh@gmail.com>
   3 Date: Tue, 9 Dec 2014 22:22:53 +0000
   4 Subject: [PATCH 08/55] Fix conntrack with --bind-interfaces
   5
   6 Make sure dst_addr is assigned the correct address in receive_query when OPTNOWILD is
   7 enabled so the assigned mark can be correctly retrieved and set in forward_query when
   8 conntrack is enabled.
   9
  10 Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
  11 ---
  12  src/forward.c | 4 ++--
  13  1 file changed, 2 insertions(+), 2 deletions(-)
  14
  15 diff --git a/src/forward.c b/src/forward.c
  16 index 2cf29eba6e26..408a179a20f4 100644
  17 --- a/src/forward.c
  18 +++ b/src/forward.c
  19 @@ -1048,7 +1048,7 @@ void receive_query(struct listener *listen, time_t now)
  20    /* packet buffer overwritten */
  21    daemon->srv_save = NULL;
  22
  23 -  dst_addr_4.s_addr = 0;
  24 +  dst_addr_4.s_addr = dst_addr.addr.addr4.s_addr = 0;
  25    netmask.s_addr = 0;
  26
  27    if (option_bool(OPT_NOWILD) && listen->iface)
  28 @@ -1057,7 +1057,7 @@ void receive_query(struct listener *listen, time_t now)
  29
  30        if (listen->family == AF_INET)
  31         {
  32 -         dst_addr_4 = listen->iface->addr.in.sin_addr;
  33 +         dst_addr_4 = dst_addr.addr.addr4 = listen->iface->addr.in.sin_addr;
  34           netmask = listen->iface->netmask;
  35         }
  36      }
  37 --
  38 2.1.0
  39