diff options
| author | Denis Vlasenko | 2008-05-22 17:41:01 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-05-22 17:41:01 +0000 |
| commit | e9b76e1f1e37f91ec9b30274594b7953f1afa6a2 (patch) | |
| tree | 5343576f8522de07b5ff92a91be17b538323b396 /networking | |
| parent | ae84b11467c56316a43de6146100ce22f24cf622 (diff) | |
| download | busybox-e9b76e1f1e37f91ec9b30274594b7953f1afa6a2.zip busybox-e9b76e1f1e37f91ec9b30274594b7953f1afa6a2.tar.gz | |
dnsd: fixes various segfaults.
One was a lib api change that was not updated and another
is a stack buffer overflow.
It also adds support for '*' in dnsd.conf. It resolves all hostnames to
a specific ip address. This is useful if you for example want redirect
all http traffic to your first-boot-web-wizard on you router/firewall.
By Timo Teras
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/dnsd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/networking/dnsd.c b/networking/dnsd.c index cb62d20..97ba2dc 100644 --- a/networking/dnsd.c +++ b/networking/dnsd.c @@ -194,7 +194,8 @@ static int table_lookup(uint16_t type, uint8_t * as, uint8_t * qs) for (i = 1; i <= (int)(d->name[0]); i++) if (tolower(qs[i]) != d->name[i]) break; - if (i > (int)(d->name[0])) { + if (i > (int)(d->name[0]) || + (d->name[0] == 1 && d->name[1] == '*')) { strcpy((char *)as, d->ip); #if DEBUG fprintf(stderr, " OK as:%s\n", as); @@ -202,7 +203,8 @@ static int table_lookup(uint16_t type, uint8_t * as, uint8_t * qs) return 0; } } else if (type == REQ_PTR) { /* search by IP-address */ - if (!strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) { + if ((d->name[0] != 1 || d->name[1] != '*') && + !strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) { strcpy((char *)as, d->name); return 0; } @@ -401,7 +403,7 @@ int dnsd_main(int argc ATTRIBUTE_UNUSED, char **argv) r = process_packet(buf); if (r <= 0) continue; - send_to_from(udps, buf, r, 0, &to->u.sa, &from->u.sa, lsa->len); + send_to_from(udps, buf, r, 0, &from->u.sa, &to->u.sa, lsa->len); } return 0; } |