mirror of
https://github.com/yarrick/iodine.git
synced 2024-09-07 11:37:03 +00:00
Fixed hostname encoding, cleanup
This commit is contained in:
parent
4588aab71a
commit
67e53c2fff
16
dns.c
16
dns.c
|
@ -43,7 +43,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static int host2dns(const char *, 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);
|
||||||
|
|
||||||
|
@ -207,7 +206,7 @@ dns_query(int fd, int id, char *host, int type)
|
||||||
header->arcount = htons(1);
|
header->arcount = htons(1);
|
||||||
|
|
||||||
p = buf + sizeof(HEADER);
|
p = buf + sizeof(HEADER);
|
||||||
p += host2dns(host, p, strlen(host));
|
p += dns_encode_hostname(host, p, strlen(host));
|
||||||
|
|
||||||
putshort(&p, type);
|
putshort(&p, type);
|
||||||
putshort(&p, C_IN);
|
putshort(&p, C_IN);
|
||||||
|
@ -325,6 +324,7 @@ dns_parse_reply(char *outbuf, int buflen, char *packet, int packetlen)
|
||||||
}
|
}
|
||||||
|
|
||||||
if(type == T_NULL && rv > 2) {
|
if(type == T_NULL && rv > 2) {
|
||||||
|
rv = MIN(rv, buflen);
|
||||||
memcpy(outbuf, rdata, rv);
|
memcpy(outbuf, rdata, rv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -332,19 +332,25 @@ dns_parse_reply(char *outbuf, int buflen, char *packet, int packetlen)
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
int
|
||||||
host2dns(const char *host, char *buffer, int size)
|
dns_encode_hostname(const char *host, char *buffer, int size)
|
||||||
{
|
{
|
||||||
char *h;
|
char *h;
|
||||||
char *p;
|
char *p;
|
||||||
char *word;
|
char *word;
|
||||||
|
int left;
|
||||||
|
|
||||||
h = strdup(host);
|
h = strdup(host);
|
||||||
memset(buffer, 0, size);
|
memset(buffer, 0, size);
|
||||||
p = buffer;
|
p = buffer;
|
||||||
|
left = size;
|
||||||
|
|
||||||
word = strtok(h, ".");
|
word = strtok(h, ".");
|
||||||
while(word) {
|
while(word) {
|
||||||
|
if (strlen(word) > 63 || strlen(word) > left) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
left -= (strlen(word) + 1);
|
||||||
*p++ = (char)strlen(word);
|
*p++ = (char)strlen(word);
|
||||||
memcpy(p, word, strlen(word));
|
memcpy(p, word, strlen(word));
|
||||||
p += strlen(word);
|
p += strlen(word);
|
||||||
|
@ -387,7 +393,7 @@ dnsd_send(int fd, struct query *q, char *data, int datalen)
|
||||||
p = buf + sizeof(HEADER);
|
p = buf + sizeof(HEADER);
|
||||||
|
|
||||||
name = 0xc000 | ((p - buf) & 0x3fff);
|
name = 0xc000 | ((p - buf) & 0x3fff);
|
||||||
p += host2dns(q->name, p, strlen(q->name));
|
p += dns_encode_hostname(q->name, p, strlen(q->name));
|
||||||
putshort(&p, q->type);
|
putshort(&p, q->type);
|
||||||
putshort(&p, C_IN);
|
putshort(&p, C_IN);
|
||||||
|
|
||||||
|
|
1
dns.h
1
dns.h
|
@ -26,6 +26,7 @@ void dns_handle_tun(int, char *, int);
|
||||||
void dns_ping(int);
|
void dns_ping(int);
|
||||||
void dns_handshake(int);
|
void dns_handshake(int);
|
||||||
int dns_read(int, char *, int);
|
int dns_read(int, char *, int);
|
||||||
|
int dns_encode_hostname(const char *, char *, int);
|
||||||
|
|
||||||
extern struct sockaddr_in peer;
|
extern struct sockaddr_in peer;
|
||||||
|
|
||||||
|
|
28
test.c
28
test.c
|
@ -162,6 +162,33 @@ test_readname()
|
||||||
printf("OK\n");
|
printf("OK\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
test_encode_hostname() {
|
||||||
|
char buf[256];
|
||||||
|
int len;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
len = 256;
|
||||||
|
printf(" * Testing hostname encoding... ");
|
||||||
|
|
||||||
|
memset(buf, 0, 256);
|
||||||
|
ret = dns_encode_hostname( // More than 63 chars between dots
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||||
|
, buf, len);
|
||||||
|
assert(ret == -1);
|
||||||
|
|
||||||
|
memset(buf, 0, 256);
|
||||||
|
ret = dns_encode_hostname( // More chars than fits into array
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ."
|
||||||
|
, buf, len);
|
||||||
|
assert(ret == -1);
|
||||||
|
assert(strlen(buf) < len);
|
||||||
|
|
||||||
|
printf("OK\n");
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main()
|
main()
|
||||||
{
|
{
|
||||||
|
@ -170,6 +197,7 @@ main()
|
||||||
test_readputshort();
|
test_readputshort();
|
||||||
test_readputlong();
|
test_readputlong();
|
||||||
test_readname();
|
test_readname();
|
||||||
|
test_encode_hostname();
|
||||||
|
|
||||||
printf("** All went well :)\n");
|
printf("** All went well :)\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue