diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2010-09-24 23:59:38 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-09-24 23:59:38 +0200 |
| commit | 36df936e684d2fe90176c3ad86eab9c19af15012 (patch) | |
| tree | a8cf1bb32e65dbe914333d15726228e941802e89 /plugins | |
| parent | 17b2c99a8bbc4f760114e7b7fa2e0a15570e288d (diff) | |
| download | connman-36df936e684d2fe90176c3ad86eab9c19af15012.tar.gz connman-36df936e684d2fe90176c3ad86eab9c19af15012.tar.bz2 connman-36df936e684d2fe90176c3ad86eab9c19af15012.zip | |
Add support for domain name concatenation on TCP DNS requests
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dnsproxy.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/plugins/dnsproxy.c b/plugins/dnsproxy.c index ca58df5d..eae9a617 100644 --- a/plugins/dnsproxy.c +++ b/plugins/dnsproxy.c @@ -318,31 +318,43 @@ static int ns_resolv(struct server_data *server, struct request_data *req, req->numserv++; - if (server->domain != NULL && server->protocol == IPPROTO_UDP) { + if (server->domain != NULL) { unsigned char alt[1024]; struct domain_hdr *hdr = (void *) &alt; - int altlen, domlen; + int altlen, domlen, offset; + + offset = protocol_offset(server->protocol); + if (offset < 0) + return offset; domlen = strlen(server->domain) + 1; if (domlen < 5) return -EINVAL; - alt[0] = req->altid & 0xff; - alt[1] = req->altid >> 8; + alt[offset] = req->altid & 0xff; + alt[offset + 1] = req->altid >> 8; - memcpy(alt + 2, request + 2, 10); + memcpy(alt + offset + 2, request + offset + 2, 10); hdr->qdcount = htons(1); - altlen = append_query(alt + 12, sizeof(alt) - 12, + altlen = append_query(alt + offset + 12, sizeof(alt) - 12, name, server->domain); if (altlen < 0) return -EINVAL; altlen += 12; - memcpy(alt + altlen, request + altlen - domlen, + memcpy(alt + offset + altlen, + request + offset + altlen - domlen, req->request_len - altlen + domlen); + if (server->protocol == IPPROTO_TCP) { + int req_len = req->request_len + domlen - 1; + + alt[0] = (req_len >> 8) & 0xff; + alt[1] = req_len & 0xff; + } + err = send(sk, alt, req->request_len + domlen + 1, 0); req->numserv++; |