[dnsmasq] Update to version 2.52

[openwrt/svn-archive/archive.git] / package / dnsmasq / patches / 103-ipv6_fix.patch

diff --git a/package/dnsmasq/patches/103-ipv6_fix.patch b/package/dnsmasq/patches/103-ipv6_fix.patch
deleted file mode 100644 (file)
index 8269b79..0000000
--- a/package/dnsmasq/patches/103-ipv6_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: dnsmasq-2.51/src/netlink.c
-===================================================================
---- dnsmasq-2.51.orig/src/netlink.c
-+++ dnsmasq-2.51/src/netlink.c
-@@ -129,6 +129,7 @@ int iface_enumerate(void *parm, int (*ip
-   ssize_t len;
-   static unsigned int seq = 0;
-   int family = AF_INET;
-+  int ipv4_done = 0;
- 
-   struct {
-     struct nlmsghdr nlh;
-@@ -207,9 +208,12 @@ int iface_enumerate(void *parm, int (*ip
-                   rta = RTA_NEXT(rta, len1);
-                 }
-               
--              if (addr.s_addr && ipv4_callback)
-+              if (addr.s_addr && ipv4_callback) {
-                 if (!((*ipv4_callback)(addr, ifa->ifa_index, netmask, broadcast, parm)))
-                   return 0;
-+                else
-+                  ipv4_done = 1;
-+              }
-             }
- #ifdef HAVE_IPV6
-           else if (ifa->ifa_family == AF_INET6)
-@@ -225,7 +229,7 @@ int iface_enumerate(void *parm, int (*ip
-               
-               if (addrp && ipv6_callback)
-                 if (!((*ipv6_callback)(addrp, ifa->ifa_index, ifa->ifa_index, parm)))
--                  return 0;
-+                  return ipv4_done;
-             }
- #endif
-         }
-Index: dnsmasq-2.51/src/network.c
-===================================================================
---- dnsmasq-2.51.orig/src/network.c
-+++ dnsmasq-2.51/src/network.c
-@@ -302,7 +302,7 @@ static int create_ipv6_listener(struct l
-       bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 ||
-       listen(tcpfd, 5) == -1 ||
-       bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1) 
--    return 0;
-+    return 1;
-       
-   l = safe_malloc(sizeof(struct listener));
-   l->fd = fd;