package/network/services/dnsmasq/patches/0015-fix-ipv6-ipset-bug-in-master.patch

   1 From 3becf468bad699bfdcb2d18d553bc72d4c79e23c Mon Sep 17 00:00:00 2001
   2 From: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
   3 Date: Wed, 12 Dec 2018 12:00:19 +0000
   4 Subject: [PATCH 15/32] fix ipv6 ipset bug in master
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Hi Simon,
  10
  11 Another one fallen out of the openwrt tree shake :-)
  12
  13 ipv6 ipset addresses weren’t being set correctly.  patch attached
  14
  15 Cheers,
  16
  17 Kevin D-B
  18
  19 012C ACB2 28C6 C53E 9775  9123 B3A2 389B 9DE2 334A
  20 From b50fc0491e374186f982b019f293379955afd203 Mon Sep 17 00:00:00 2001
  21 From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
  22 Date: Wed, 12 Dec 2018 11:35:12 +0000
  23 Subject: [PATCH] ipset fix ternary order swap
  24
  25 ee87504 Remove ability to compile without IPv6 support introduced a
  26 ternary operator for ip address size.  Unfortunately the true/false
  27 order was incorrect which meant ipv6 ipset addresses were added
  28 incorrectly.
  29
  30 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
  31 ---
  32  src/ipset.c | 2 +-
  33  1 file changed, 1 insertion(+), 1 deletion(-)
  34
  35 --- a/src/ipset.c
  36 +++ b/src/ipset.c
  37 @@ -120,7 +120,7 @@ static int new_add_to_ipset(const char *
  38    struct my_nfgenmsg *nfg;
  39    struct my_nlattr *nested[2];
  40    uint8_t proto;
  41 -  int addrsz = (af == AF_INET6) ? INADDRSZ : IN6ADDRSZ;
  42 +  int addrsz = (af == AF_INET6) ? IN6ADDRSZ : INADDRSZ;
  43
  44    if (strlen(setname) >= IPSET_MAXNAMELEN)
  45      {