other_mirrors/ iodine
1
0
Fork 0
mirror of https://github.com/yarrick/iodine.git synced 2024-11-22 16:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactoring client receive code

This commit is contained in:
Bjorn Andersson 2007-01-28 06:00:50 +00:00
parent 82c634619c
commit 5beb814d8c
1 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/dns.c
View File

@ -44,6 +44,7 @@
#endif #endif
int dns_decode(char*, int, int, char*, int);
static int dns_write(int, int, char *, int, char); static int dns_write(int, int, char *, int, char);
static void dns_query(int, int, char *, int); static void dns_query(int, int, char *, int);
@ -338,41 +339,49 @@ dns_read(int fd, char *buf, int buflen)
dns_send_chunk(fd); dns_send_chunk(fd);
} }
} }
return dns_parse_reply(buf, buflen, packet, r); return dns_decode(buf, buflen, QR_ANSWER, packet, r);
} }
int int
dns_parse_reply(char *outbuf, int buflen, char *packet, int packetlen) dns_decode(char *outbuf, int buflen, int qr, char *packet, int packetlen)
{ {
int rv;
uint32_t ttl;
short rlen;
short type;
short class;
short qdcount;
short ancount;
char *data;
char name[255];
char rdata[4*1024]; char rdata[4*1024];
HEADER *header; HEADER *header;
short qdcount;
short ancount;
char name[255];
uint32_t ttl;
short class;
short type;
char *data;
short rlen;
int rv;
rv = 0; rv = 0;
header = (HEADER*)packet; header = (HEADER*)packet;
data = packet + sizeof(HEADER); if (header->qr != qr) {
warnx("header->qr does not match the requested qr");
return -1;
}
if(header->qr) { /* qr=1 => response */ data = packet + sizeof(HEADER);
qdcount = ntohs(header->qdcount); qdcount = ntohs(header->qdcount);
ancount = ntohs(header->ancount); ancount = ntohs(header->ancount);
rlen = 0; rlen = 0;
if(qdcount == 1) { switch (qr) {
case QR_ANSWER:
if(qdcount != 1 || ancount != 1) {
warnx("no query or answer in answer");
return -1;
}
readname(packet, packetlen, &data, name, sizeof(name)); readname(packet, packetlen, &data, name, sizeof(name));
readshort(packet, &data, &type); readshort(packet, &data, &type);
readshort(packet, &data, &class); readshort(packet, &data, &class);
}
if(ancount == 1) {
readname(packet, packetlen, &data, name, sizeof(name)); readname(packet, packetlen, &data, name, sizeof(name));
readshort(packet, &data, &type); readshort(packet, &data, &type);
readshort(packet, &data, &class); readshort(packet, &data, &class);
@ -380,12 +389,15 @@ dns_parse_reply(char *outbuf, int buflen, char *packet, int packetlen)
readshort(packet, &data, &rlen); readshort(packet, &data, &rlen);
rv = MIN(rlen, sizeof(rdata)); rv = MIN(rlen, sizeof(rdata));
readdata(packet, &data, rdata, rv); readdata(packet, &data, rdata, rv);
}
if(type == T_NULL && rv > 2) { if(type == T_NULL && rv > 2) {
rv = MIN(rv, buflen); rv = MIN(rv, buflen);
memcpy(outbuf, rdata, rv); memcpy(outbuf, rdata, rv);
} }
break;
case QR_QUERY:
errx(1, "unimplemented query behavior");
break;
} }
return rv; return rv;