aboutsummaryrefslogtreecommitdiffstats
path: root/package/dnsmasq/patches/103-ipv6_fix.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-06-13 16:46:42 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-06-13 16:46:42 +0000
commitb5141ea359b507cc7e4ec0bc841126ee778b8f81 (patch)
tree608206f2507e13790e3cd14c85e1056e7a0a94ed /package/dnsmasq/patches/103-ipv6_fix.patch
parentf3f5cfd4ee440de27319265513d202c159eb8a7a (diff)
downloadupstream-b5141ea359b507cc7e4ec0bc841126ee778b8f81.tar.gz
upstream-b5141ea359b507cc7e4ec0bc841126ee778b8f81.tar.bz2
upstream-b5141ea359b507cc7e4ec0bc841126ee778b8f81.zip
Update to version 2.49 Fixes #5331 and #5286
SVN-Revision: 16436
Diffstat (limited to 'package/dnsmasq/patches/103-ipv6_fix.patch')
-rw-r--r--package/dnsmasq/patches/103-ipv6_fix.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/dnsmasq/patches/103-ipv6_fix.patch b/package/dnsmasq/patches/103-ipv6_fix.patch
index 28a272f84b..33624521d3 100644
--- a/package/dnsmasq/patches/103-ipv6_fix.patch
+++ b/package/dnsmasq/patches/103-ipv6_fix.patch
@@ -1,6 +1,6 @@
--- a/src/netlink.c
+++ b/src/netlink.c
-@@ -116,6 +116,7 @@
+@@ -129,6 +129,7 @@ int iface_enumerate(void *parm, int (*ip
ssize_t len;
static unsigned int seq = 0;
int family = AF_INET;
@@ -8,7 +8,7 @@
struct {
struct nlmsghdr nlh;
-@@ -187,9 +188,12 @@
+@@ -207,9 +208,12 @@ int iface_enumerate(void *parm, int (*ip
rta = RTA_NEXT(rta, len1);
}
@@ -22,7 +22,7 @@
}
#ifdef HAVE_IPV6
else if (ifa->ifa_family == AF_INET6)
-@@ -205,7 +209,7 @@
+@@ -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)))
@@ -33,7 +33,7 @@
}
--- a/src/network.c
+++ b/src/network.c
-@@ -278,7 +278,7 @@
+@@ -296,7 +296,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)