diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:54 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:54 +0200 |
commit | c408a4ecbee60a9d512930972c09c6f9e365a671 (patch) | |
tree | 6bc428653d8da4cc181eb017e76601a2273e212d /net | |
parent | 45019dc10b217d249c07cd47bc342f04317d1a7d (diff) | |
parent | 8bbc1064c78cdf658c837b996170b8eab8cbcb3d (diff) | |
download | barebox-c408a4ecbee60a9d512930972c09c6f9e365a671.tar.gz barebox-c408a4ecbee60a9d512930972c09c6f9e365a671.tar.xz |
Merge branch 'for-next/net'
Diffstat (limited to 'net')
-rw-r--r-- | net/dns.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -116,9 +116,8 @@ static int dns_send(char *name) return ret; } -static void dns_handler(void *ctx, char *packet, unsigned len) +static void dns_recv(struct header *header, unsigned len) { - struct header *header; unsigned char *p, *e, *s; u16 type; int found, stop, dlen; @@ -127,7 +126,6 @@ static void dns_handler(void *ctx, char *packet, unsigned len) debug("%s\n", __func__); /* We sent 1 query. We want to see more that 1 answer. */ - header = (struct header *)net_eth_to_udp_payload(packet); if (ntohs(header->nqueries) != 1) return; @@ -140,7 +138,7 @@ static void dns_handler(void *ctx, char *packet, unsigned len) /* Skip host name */ s = &header->data[0]; - e = packet + len; + e = ((uint8_t *)header) + len; for (p = s; p < e && *p != '\0'; p++) continue; @@ -194,6 +192,13 @@ static void dns_handler(void *ctx, char *packet, unsigned len) } } +static void dns_handler(void *ctx, char *packet, unsigned len) +{ + (void)ctx; + dns_recv((struct header *)net_eth_to_udp_payload(packet), + net_eth_to_udplen(packet)); +} + IPaddr_t resolv(char *host) { IPaddr_t ip; |