summaryrefslogtreecommitdiff
path: root/ares_parse_srv_reply.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-11-26 01:21:21 (GMT)
committerYang Tse <yangsita@gmail.com>2009-11-26 01:21:21 (GMT)
commit57e48c4cf1d8f125eaa11e184c7f35f7d6ce9fd3 (patch)
tree7759f59916026d4471f01de7f8ce1dac1a4a01fc /ares_parse_srv_reply.c
parent4bc98ca85c13378cf9d53cf7516c4c9cfa0d03e1 (diff)
downloadc-ares-57e48c4cf1d8f125eaa11e184c7f35f7d6ce9fd3.zip
c-ares-57e48c4cf1d8f125eaa11e184c7f35f7d6ce9fd3.tar.gz
c-ares-57e48c4cf1d8f125eaa11e184c7f35f7d6ce9fd3.tar.bz2
- Larry Lansing fixed ares_parse_srv_reply to properly parse replies
which might contain non-SRV answers, skipping over potential non-SRV ones such as CNAMEs.
Diffstat (limited to 'ares_parse_srv_reply.c')
-rw-r--r--ares_parse_srv_reply.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/ares_parse_srv_reply.c b/ares_parse_srv_reply.c
index 2e5095e..de723f3 100644
--- a/ares_parse_srv_reply.c
+++ b/ares_parse_srv_reply.c
@@ -56,7 +56,7 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen,
struct ares_srv_reply **srv_out)
{
unsigned int qdcount, ancount, i;
- const unsigned char *aptr;
+ const unsigned char *aptr, *vptr;
int status, rr_type, rr_class, rr_len;
long len;
char *hostname = NULL, *rr_name = NULL;
@@ -139,24 +139,25 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen,
}
srv_last = srv_curr;
- srv_curr->priority = ntohs (*((unsigned short *)aptr));
- aptr += sizeof(unsigned short);
- srv_curr->weight = ntohs (*((unsigned short *)aptr));
- aptr += sizeof(unsigned short);
- srv_curr->port = ntohs (*((unsigned short *)aptr));
- aptr += sizeof(unsigned short);
+ vptr = aptr;
+ srv_curr->priority = ntohs (*((unsigned short *)vptr));
+ vptr += sizeof(unsigned short);
+ srv_curr->weight = ntohs (*((unsigned short *)vptr));
+ vptr += sizeof(unsigned short);
+ srv_curr->port = ntohs (*((unsigned short *)vptr));
+ vptr += sizeof(unsigned short);
- status = ares_expand_name (aptr, abuf, alen, &srv_curr->host, &len);
+ status = ares_expand_name (vptr, abuf, alen, &srv_curr->host, &len);
if (status != ARES_SUCCESS)
break;
-
- /* Move on to the next record */
- aptr += len;
}
/* Don't lose memory in the next iteration */
free (rr_name);
rr_name = NULL;
+
+ /* Move on to the next record */
+ aptr += rr_len;
}
if (hostname)