diff options
Diffstat (limited to 'package/network/services/dnsmasq/patches')
| -rw-r--r-- | package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch | 42 | ||||
| -rw-r--r-- | package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch | 49 |
2 files changed, 91 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch b/package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch new file mode 100644 index 0000000000..8ead9afa59 --- /dev/null +++ b/package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch @@ -0,0 +1,42 @@ +From fd05f127909bbf4f6983a4de2dcb611947488dee Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Sun, 12 Aug 2012 17:48:50 +0100 +Subject: [PATCH] Set prefix on-link bit in RAs + +--- + CHANGELOG | 3 +++ + src/radv.c | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 8828694..e1daeef 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -45,6 +45,9 @@ version 2.63 + uk.org.thekelleys.dnsmasq. Thanks to Mathieu + Trudel-Lapierre for the patch. + ++ Set the "prefix on-link" bit in Router ++ Advertisements. Thanks to Gui Iribarren for the patch. ++ + + version 2.62 + Update German translation. Thanks to Conrad Kostecki. +diff --git a/src/radv.c b/src/radv.c +index a3e691a..d1f5268 100644 +--- a/src/radv.c ++++ b/src/radv.c +@@ -412,8 +412,8 @@ static int add_prefixes(struct in6_addr *local, int prefix, + opt->type = ICMP6_OPT_PREFIX; + opt->len = 4; + opt->prefix_len = prefix; +- /* autonomous only if we're not doing dhcp */ +- opt->flags = do_slaac ? 0x40 : 0x00; ++ /* autonomous only if we're not doing dhcp, always set "on-link" */ ++ opt->flags = do_slaac ? 0xC0 : 0x80; + opt->valid_lifetime = htonl(time); + opt->preferred_lifetime = htonl(deprecate ? 0 : time); + opt->reserved = 0; +-- +1.7.10.GIT + diff --git a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch new file mode 100644 index 0000000000..d108a7d3bc --- /dev/null +++ b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch @@ -0,0 +1,49 @@ +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -134,7 +134,7 @@ void dhcp_packet(time_t now, int pxe_fd) + struct iovec iov; + ssize_t sz; + int iface_index = 0, unicast_dest = 0, is_inform = 0; +- struct in_addr iface_addr; ++ struct in_addr iface_addr, *addrp = NULL; + struct iface_param parm; + #ifdef HAVE_LINUX_NETWORK + struct arpreq arp_req; +@@ -246,11 +246,9 @@ void dhcp_packet(time_t now, int pxe_fd) + + ifr.ifr_addr.sa_family = AF_INET; + if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 ) +- iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr; +- else + { +- my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name); +- return; ++ addrp = &iface_addr; ++ iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr; + } + + for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) +@@ -272,7 +270,7 @@ void dhcp_packet(time_t now, int pxe_fd) + parm.current = NULL; + parm.ind = iface_index; + +- if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name)) ++ if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name)) + { + /* If we failed to match the primary address of the interface, see if we've got a --listen-address + for a secondary */ +@@ -291,7 +289,13 @@ void dhcp_packet(time_t now, int pxe_fd) + there is more than one address on the interface in the same subnet */ + complete_context(match.addr, iface_index, match.netmask, match.broadcast, &parm); + } +- ++ ++ if (!addrp) ++ { ++ my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name); ++ return; ++ } ++ + if (!iface_enumerate(AF_INET, &parm, complete_context)) + return; + |