aiden
/
freshtomato-arm
mirror of https://bitbucket.org/pedro311/freshtomato-arm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dnsmasq: update to v2.91rc4

Browse Source
arm-master
pedro 8 months ago
parent 5c828a8b9b
commit 099420fbe8
3 changed files with 103 additions and 97 deletions
Show Stats Download Patch File Download Diff File

2
release/src-rt-6.x.4708/router/dnsmasq/VERSION
Unescape Escape View File

@ -1 +1 @@
(HEAD -> master, tag: v2.91rc2) (tag: v2.91rc4)

176
release/src-rt-6.x.4708/router/dnsmasq/src/bpf.c
Unescape Escape View File

@ -126,112 +126,110 @@ int iface_enumerate(int family, void *parm, callback_t callback)
for (addrs = head; addrs; addrs = addrs->ifa_next) for (addrs = head; addrs; addrs = addrs->ifa_next)
{ {
if (addrs->ifa_addr->sa_family == family) int iface_index = if_nametoindex(addrs->ifa_name);
if (iface_index == 0 || !addrs->ifa_addr ||
addrs->ifa_addr->sa_family != family ||
(!addrs->ifa_netmask && family != AF_LINK))
continue;
if (family == AF_INET)
{ {
int iface_index = if_nametoindex(addrs->ifa_name); struct in_addr addr, netmask, broadcast;
addr = ((struct sockaddr_in *) addrs->ifa_addr)->sin_addr;
if (iface_index == 0 || !addrs->ifa_addr ||
(!addrs->ifa_netmask && family != AF_LINK))
continue;
if (family == AF_INET)
{
struct in_addr addr, netmask, broadcast;
addr = ((struct sockaddr_in *) addrs->ifa_addr)->sin_addr;
#ifdef HAVE_BSD_NETWORK #ifdef HAVE_BSD_NETWORK
if (del_family == AF_INET && del_addr.addr4.s_addr == addr.s_addr) if (del_family == AF_INET && del_addr.addr4.s_addr == addr.s_addr)
continue; continue;
#endif #endif
netmask = ((struct sockaddr_in *) addrs->ifa_netmask)->sin_addr; netmask = ((struct sockaddr_in *) addrs->ifa_netmask)->sin_addr;
if (addrs->ifa_broadaddr) if (addrs->ifa_broadaddr)
broadcast = ((struct sockaddr_in *) addrs->ifa_broadaddr)->sin_addr; broadcast = ((struct sockaddr_in *) addrs->ifa_broadaddr)->sin_addr;
else else
broadcast.s_addr = 0; broadcast.s_addr = 0;
if (!callback.af_inet(addr, iface_index, NULL, netmask, broadcast, parm)) if (!callback.af_inet(addr, iface_index, NULL, netmask, broadcast, parm))
goto err; goto err;
} }
else if (family == AF_INET6) else if (family == AF_INET6)
{ {
struct in6_addr *addr = &((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_addr; struct in6_addr *addr = &((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_addr;
unsigned char *netmask = (unsigned char *) &((struct sockaddr_in6 *) addrs->ifa_netmask)->sin6_addr; unsigned char *netmask = (unsigned char *) &((struct sockaddr_in6 *) addrs->ifa_netmask)->sin6_addr;
int scope_id = ((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_scope_id; int scope_id = ((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_scope_id;
int i, j, prefix = 0; int i, j, prefix = 0;
u32 valid = 0xffffffff, preferred = 0xffffffff; u32 valid = 0xffffffff, preferred = 0xffffffff;
int flags = 0; int flags = 0;
#ifdef HAVE_BSD_NETWORK #ifdef HAVE_BSD_NETWORK
if (del_family == AF_INET6 && IN6_ARE_ADDR_EQUAL(&del_addr.addr6, addr)) if (del_family == AF_INET6 && IN6_ARE_ADDR_EQUAL(&del_addr.addr6, addr))
continue; continue;
#endif #endif
#if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__)
struct in6_ifreq ifr6; struct in6_ifreq ifr6;
memset(&ifr6, 0, sizeof(ifr6)); memset(&ifr6, 0, sizeof(ifr6));
safe_strncpy(ifr6.ifr_name, addrs->ifa_name, sizeof(ifr6.ifr_name)); safe_strncpy(ifr6.ifr_name, addrs->ifa_name, sizeof(ifr6.ifr_name));
ifr6.ifr_addr = *((struct sockaddr_in6 *) addrs->ifa_addr);
if (fd != -1 && ioctl(fd, SIOCGIFAFLAG_IN6, &ifr6) != -1)
{
if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_TENTATIVE)
flags |= IFACE_TENTATIVE;
if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_DEPRECATED)
flags |= IFACE_DEPRECATED;
ifr6.ifr_addr = *((struct sockaddr_in6 *) addrs->ifa_addr);
if (fd != -1 && ioctl(fd, SIOCGIFAFLAG_IN6, &ifr6) != -1)
{
if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_TENTATIVE)
flags |= IFACE_TENTATIVE;
if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_DEPRECATED)
flags |= IFACE_DEPRECATED;
#ifdef IN6_IFF_TEMPORARY #ifdef IN6_IFF_TEMPORARY
if (!(ifr6.ifr_ifru.ifru_flags6 & (IN6_IFF_AUTOCONF | IN6_IFF_TEMPORARY))) if (!(ifr6.ifr_ifru.ifru_flags6 & (IN6_IFF_AUTOCONF | IN6_IFF_TEMPORARY)))
flags |= IFACE_PERMANENT; flags |= IFACE_PERMANENT;
#endif
#ifdef IN6_IFF_PRIVACY
if (!(ifr6.ifr_ifru.ifru_flags6 & (IN6_IFF_AUTOCONF | IN6_IFF_PRIVACY)))
flags |= IFACE_PERMANENT;
#endif #endif
}
ifr6.ifr_addr = *((struct sockaddr_in6 *) addrs->ifa_addr); #ifdef IN6_IFF_PRIVACY
if (fd != -1 && ioctl(fd, SIOCGIFALIFETIME_IN6, &ifr6) != -1) if (!(ifr6.ifr_ifru.ifru_flags6 & (IN6_IFF_AUTOCONF | IN6_IFF_PRIVACY)))
{ flags |= IFACE_PERMANENT;
valid = ifr6.ifr_ifru.ifru_lifetime.ia6t_vltime;
preferred = ifr6.ifr_ifru.ifru_lifetime.ia6t_pltime;
}
#endif #endif
for (i = 0; i < IN6ADDRSZ; i++, prefix += 8)
if (netmask[i] != 0xff)
break;
if (i != IN6ADDRSZ && netmask[i])
for (j = 7; j > 0; j--, prefix++)
if ((netmask[i] & (1 << j)) == 0)
break;
/* voodoo to clear interface field in address */
if (!option_bool(OPT_NOWILD) && IN6_IS_ADDR_LINKLOCAL(addr))
{
addr->s6_addr[2] = 0;
addr->s6_addr[3] = 0;
}
if (!callback.af_inet6(addr, prefix, scope_id, iface_index, flags,
(unsigned int) preferred, (unsigned int)valid, parm))
goto err;
} }
#ifdef HAVE_DHCP6 ifr6.ifr_addr = *((struct sockaddr_in6 *) addrs->ifa_addr);
else if (family == AF_LINK) if (fd != -1 && ioctl(fd, SIOCGIFALIFETIME_IN6, &ifr6) != -1)
{ {
/* Assume ethernet again here */ valid = ifr6.ifr_ifru.ifru_lifetime.ia6t_vltime;
struct sockaddr_dl *sdl = (struct sockaddr_dl *) addrs->ifa_addr; preferred = ifr6.ifr_ifru.ifru_lifetime.ia6t_pltime;
if (sdl->sdl_alen != 0 &&
!callback.af_local(iface_index, ARPHRD_ETHER, LLADDR(sdl), sdl->sdl_alen, parm))
goto err;
} }
#endif #endif
for (i = 0; i < IN6ADDRSZ; i++, prefix += 8)
if (netmask[i] != 0xff)
break;
if (i != IN6ADDRSZ && netmask[i])
for (j = 7; j > 0; j--, prefix++)
if ((netmask[i] & (1 << j)) == 0)
break;
/* voodoo to clear interface field in address */
if (!option_bool(OPT_NOWILD) && IN6_IS_ADDR_LINKLOCAL(addr))
{
addr->s6_addr[2] = 0;
addr->s6_addr[3] = 0;
}
if (!callback.af_inet6(addr, prefix, scope_id, iface_index, flags,
(unsigned int) preferred, (unsigned int)valid, parm))
goto err;
}
#ifdef HAVE_DHCP6
else if (family == AF_LINK)
{
/* Assume ethernet again here */
struct sockaddr_dl *sdl = (struct sockaddr_dl *) addrs->ifa_addr;
if (sdl->sdl_alen != 0 &&
!callback.af_local(iface_index, ARPHRD_ETHER, LLADDR(sdl), sdl->sdl_alen, parm))
goto err;
} }
#endif
} }
ret = 1; ret = 1;
err: err:
errsave = errno; errsave = errno;
freeifaddrs(head); freeifaddrs(head);

22
release/src-rt-6.x.4708/router/dnsmasq/src/forward.c
Unescape Escape View File

@ -197,12 +197,17 @@ static void forward_query(int udpfd, union mysockaddr *udpaddr,
FREC_HAS_PHEADER | FREC_DNSKEY_QUERY | FREC_DS_QUERY | FREC_NO_CACHE))) FREC_HAS_PHEADER | FREC_DNSKEY_QUERY | FREC_DS_QUERY | FREC_NO_CACHE)))
{ {
struct frec_src *src; struct frec_src *src;
struct dns_header *saved_header;
unsigned int casediff = 0; unsigned int casediff = 0;
unsigned int *bitvector = NULL; unsigned int *bitvector = NULL;
unsigned short id = ntohs(header->id); /* Retrieve the id from the new query before we overwrite it. */
/* Get the case-scambled version of the query to resend. This is important because we
may fall through below and forward the query in the packet buffer again and we
want to use the same case scrambling as the first time. */
blockdata_retrieve(forward->stash, forward->stash_len, (void *)header);
for (src = &forward->frec_src; src; src = src->next) for (src = &forward->frec_src; src; src = src->next)
if (src->orig_id == ntohs(header->id) && if (src->orig_id == id &&
sockaddr_isequal(&src->source, udpaddr)) sockaddr_isequal(&src->source, udpaddr))
break; break;
@ -242,7 +247,7 @@ static void forward_query(int udpfd, union mysockaddr *udpaddr,
goto reply; goto reply;
} }
/* Find a bitmap of case differences between the query send upstream and this one, /* Find a bitmap of case differences between the query sent upstream and this one,
so we can reply to each query with the correct case pattern. so we can reply to each query with the correct case pattern.
Since we need this to get back the exact case pattern of each query when doing Since we need this to get back the exact case pattern of each query when doing
query combining, we have to handle the (rare) case that there are case differences query combining, we have to handle the (rare) case that there are case differences
@ -253,9 +258,12 @@ static void forward_query(int udpfd, union mysockaddr *udpaddr,
we only scramble the first 32 letters for security reasons. we only scramble the first 32 letters for security reasons.
Note the two names are guaranteed to be the same length and differ only in the case Note the two names are guaranteed to be the same length and differ only in the case
of letters. */ of letters at this point.
if ((saved_header = blockdata_retrieve(forward->stash, forward->stash_len, NULL)) &&
extract_request(saved_header, forward->stash_len, daemon->workspacename, NULL)) The original query we sent is now in packet buffer and the query name in the
new instance is on daemon->namebuff. */
if (extract_request(header, forward->stash_len, daemon->workspacename, NULL))
{ {
unsigned int i, gobig = 0; unsigned int i, gobig = 0;
char *s1, *s2; char *s1, *s2;
@ -294,7 +302,7 @@ static void forward_query(int udpfd, union mysockaddr *udpaddr,
daemon->free_frec_src = src->next; daemon->free_frec_src = src->next;
src->next = forward->frec_src.next; src->next = forward->frec_src.next;
forward->frec_src.next = src; forward->frec_src.next = src;
src->orig_id = ntohs(header->id); src->orig_id = id;
src->source = *udpaddr; src->source = *udpaddr;
src->dest = *dst_addr; src->dest = *dst_addr;
src->log_id = daemon->log_id; src->log_id = daemon->log_id;

Write Preview
Loading…
Cancel
Save