mirror of
https://github.com/yarrick/iodine.git
synced 2024-10-31 23:39:18 +02:00
Made dns_get_id return unsigned short, added test cases
This commit is contained in:
parent
3ee49377e8
commit
b6fc3fc0ef
|
@ -183,7 +183,7 @@ dns_encode_ns_response(char *buf, size_t buflen, struct query *q, char *topdomai
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
short
|
unsigned short
|
||||||
dns_get_id(char *packet, size_t packetlen)
|
dns_get_id(char *packet, size_t packetlen)
|
||||||
{
|
{
|
||||||
HEADER *header;
|
HEADER *header;
|
||||||
|
|
|
@ -26,7 +26,7 @@ typedef enum {
|
||||||
|
|
||||||
int dns_encode(char *, size_t, struct query *, qr_t, char *, size_t);
|
int dns_encode(char *, size_t, struct query *, qr_t, char *, size_t);
|
||||||
int dns_encode_ns_response(char *buf, size_t buflen, struct query *q, char *topdomain);
|
int dns_encode_ns_response(char *buf, size_t buflen, struct query *q, char *topdomain);
|
||||||
short dns_get_id(char *packet, size_t packetlen);
|
unsigned short dns_get_id(char *packet, size_t packetlen);
|
||||||
int dns_decode(char *, size_t, struct query *, qr_t, char *, size_t);
|
int dns_decode(char *, size_t, struct query *, qr_t, char *, size_t);
|
||||||
|
|
||||||
#endif /* _DNS_H_ */
|
#endif /* _DNS_H_ */
|
||||||
|
|
|
@ -35,7 +35,7 @@ void fw_query_put(struct fw_query *fw_query)
|
||||||
fwq_ix = 0;
|
fwq_ix = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void fw_query_get(short query_id, struct fw_query **fw_query)
|
void fw_query_get(unsigned short query_id, struct fw_query **fw_query)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -30,12 +30,12 @@
|
||||||
struct fw_query {
|
struct fw_query {
|
||||||
struct sockaddr addr;
|
struct sockaddr addr;
|
||||||
int addrlen;
|
int addrlen;
|
||||||
short id;
|
unsigned short id;
|
||||||
};
|
};
|
||||||
|
|
||||||
void fw_query_init();
|
void fw_query_init();
|
||||||
void fw_query_put(struct fw_query *fw_query);
|
void fw_query_put(struct fw_query *fw_query);
|
||||||
void fw_query_get(short query_id, struct fw_query **fw_query);
|
void fw_query_get(unsigned short query_id, struct fw_query **fw_query);
|
||||||
|
|
||||||
#endif /*__FW_QUERY_H__*/
|
#endif /*__FW_QUERY_H__*/
|
||||||
|
|
||||||
|
|
|
@ -625,7 +625,7 @@ tunnel_bind(int bind_fd, int dns_fd)
|
||||||
struct sockaddr_in from;
|
struct sockaddr_in from;
|
||||||
socklen_t fromlen;
|
socklen_t fromlen;
|
||||||
struct fw_query *query;
|
struct fw_query *query;
|
||||||
short id;
|
unsigned short id;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
fromlen = sizeof(struct sockaddr);
|
fromlen = sizeof(struct sockaddr);
|
||||||
|
|
62
tests/dns.c
62
tests/dns.c
|
@ -33,14 +33,14 @@
|
||||||
|
|
||||||
static void dump_packet(char *, size_t);
|
static void dump_packet(char *, size_t);
|
||||||
|
|
||||||
static char queryPacket[] =
|
static char query_packet[] =
|
||||||
"\x05\x39\x01\x00\x00\x01\x00\x00\x00\x00\x00\x01\x2D\x41\x6A\x62\x63"
|
"\x05\x39\x01\x00\x00\x01\x00\x00\x00\x00\x00\x01\x2D\x41\x6A\x62\x63"
|
||||||
"\x75\x79\x74\x63\x70\x65\x62\x30\x67\x71\x30\x6C\x74\x65\x62\x75\x78"
|
"\x75\x79\x74\x63\x70\x65\x62\x30\x67\x71\x30\x6C\x74\x65\x62\x75\x78"
|
||||||
"\x67\x69\x64\x75\x6E\x62\x73\x73\x61\x33\x64\x66\x6F\x6E\x30\x63\x61"
|
"\x67\x69\x64\x75\x6E\x62\x73\x73\x61\x33\x64\x66\x6F\x6E\x30\x63\x61"
|
||||||
"\x7A\x64\x62\x6F\x72\x71\x71\x04\x6B\x72\x79\x6F\x02\x73\x65\x00\x00"
|
"\x7A\x64\x62\x6F\x72\x71\x71\x04\x6B\x72\x79\x6F\x02\x73\x65\x00\x00"
|
||||||
"\x0A\x00\x01\x00\x00\x29\x10\x00\x00\x00\x80\x00\x00\x00";
|
"\x0A\x00\x01\x00\x00\x29\x10\x00\x00\x00\x80\x00\x00\x00";
|
||||||
|
|
||||||
static char answerPacket[] =
|
static char answer_packet[] =
|
||||||
"\x05\x39\x84\x00\x00\x01\x00\x01\x00\x00\x00\x00\x05\x73\x69\x6C\x6C"
|
"\x05\x39\x84\x00\x00\x01\x00\x01\x00\x00\x00\x00\x05\x73\x69\x6C\x6C"
|
||||||
"\x79\x04\x68\x6F\x73\x74\x02\x6F\x66\x06\x69\x6F\x64\x69\x6E\x65\x04"
|
"\x79\x04\x68\x6F\x73\x74\x02\x6F\x66\x06\x69\x6F\x64\x69\x6E\x65\x04"
|
||||||
"\x63\x6F\x64\x65\x04\x6B\x72\x79\x6F\x02\x73\x65\x00\x00\x0A\x00\x01"
|
"\x63\x6F\x64\x65\x04\x6B\x72\x79\x6F\x02\x73\x65\x00\x00\x0A\x00\x01"
|
||||||
|
@ -48,7 +48,7 @@ static char answerPacket[] =
|
||||||
"\x69\x73\x20\x74\x68\x65\x20\x6D\x65\x73\x73\x61\x67\x65\x20\x74\x6F"
|
"\x69\x73\x20\x74\x68\x65\x20\x6D\x65\x73\x73\x61\x67\x65\x20\x74\x6F"
|
||||||
"\x20\x62\x65\x20\x64\x65\x6C\x69\x76\x65\x72\x65\x64";
|
"\x20\x62\x65\x20\x64\x65\x6C\x69\x76\x65\x72\x65\x64";
|
||||||
|
|
||||||
static char answerPacketHighTransId[] =
|
static char answer_packet_high_trans_id[] =
|
||||||
"\x85\x39\x84\x00\x00\x01\x00\x01\x00\x00\x00\x00\x05\x73\x69\x6C\x6C"
|
"\x85\x39\x84\x00\x00\x01\x00\x01\x00\x00\x00\x00\x05\x73\x69\x6C\x6C"
|
||||||
"\x79\x04\x68\x6F\x73\x74\x02\x6F\x66\x06\x69\x6F\x64\x69\x6E\x65\x04"
|
"\x79\x04\x68\x6F\x73\x74\x02\x6F\x66\x06\x69\x6F\x64\x69\x6E\x65\x04"
|
||||||
"\x63\x6F\x64\x65\x04\x6B\x72\x79\x6F\x02\x73\x65\x00\x00\x0A\x00\x01"
|
"\x63\x6F\x64\x65\x04\x6B\x72\x79\x6F\x02\x73\x65\x00\x00\x0A\x00\x01"
|
||||||
|
@ -87,14 +87,14 @@ START_TEST(test_encode_query)
|
||||||
}
|
}
|
||||||
strcpy(d, topdomain);
|
strcpy(d, topdomain);
|
||||||
ret = dns_encode(buf, len, &q, QR_QUERY, resolv, strlen(resolv));
|
ret = dns_encode(buf, len, &q, QR_QUERY, resolv, strlen(resolv));
|
||||||
len = sizeof(queryPacket) - 1; /* Skip extra null character */
|
len = sizeof(query_packet) - 1; /* Skip extra null character */
|
||||||
|
|
||||||
if (strncmp(queryPacket, buf, sizeof(queryPacket)) || ret != len) {
|
if (strncmp(query_packet, buf, sizeof(query_packet)) || ret != len) {
|
||||||
printf("\n");
|
printf("\n");
|
||||||
dump_packet(queryPacket, len);
|
dump_packet(query_packet, len);
|
||||||
dump_packet(buf, ret);
|
dump_packet(buf, ret);
|
||||||
}
|
}
|
||||||
fail_unless(strncmp(queryPacket, buf, sizeof(queryPacket)) == 0, "Did not compile expected packet");
|
fail_unless(strncmp(query_packet, buf, sizeof(query_packet)) == 0, "Did not compile expected packet");
|
||||||
fail_unless(ret == len, "Bad packet length: %d, expected %d", ret, len);
|
fail_unless(ret == len, "Bad packet length: %d, expected %d", ret, len);
|
||||||
}
|
}
|
||||||
END_TEST
|
END_TEST
|
||||||
|
@ -110,10 +110,10 @@ START_TEST(test_decode_query)
|
||||||
memset(&q, 0, sizeof(struct query));
|
memset(&q, 0, sizeof(struct query));
|
||||||
memset(&buf, 0, sizeof(buf));
|
memset(&buf, 0, sizeof(buf));
|
||||||
q.id = 0;
|
q.id = 0;
|
||||||
len = sizeof(queryPacket) - 1;
|
len = sizeof(query_packet) - 1;
|
||||||
enc = get_base32_encoder();
|
enc = get_base32_encoder();
|
||||||
|
|
||||||
dns_decode(buf, sizeof(buf), &q, QR_QUERY, queryPacket, len);
|
dns_decode(buf, sizeof(buf), &q, QR_QUERY, query_packet, len);
|
||||||
domain = strstr(q.name, topdomain);
|
domain = strstr(q.name, topdomain);
|
||||||
len = sizeof(buf);
|
len = sizeof(buf);
|
||||||
unpack_data(buf, len, &(q.name[1]), (int) (domain - q.name) - 1, enc);
|
unpack_data(buf, len, &(q.name[1]), (int) (domain - q.name) - 1, enc);
|
||||||
|
@ -139,9 +139,9 @@ START_TEST(test_encode_response)
|
||||||
q.id = 1337;
|
q.id = 1337;
|
||||||
|
|
||||||
ret = dns_encode(buf, len, &q, QR_ANSWER, msgData, strlen(msgData));
|
ret = dns_encode(buf, len, &q, QR_ANSWER, msgData, strlen(msgData));
|
||||||
len = sizeof(answerPacket) - 1; /* Skip extra null character */
|
len = sizeof(answer_packet) - 1; /* Skip extra null character */
|
||||||
|
|
||||||
fail_unless(strncmp(answerPacket, buf, sizeof(answerPacket)) == 0, "Did not compile expected packet");
|
fail_unless(strncmp(answer_packet, buf, sizeof(answer_packet)) == 0, "Did not compile expected packet");
|
||||||
fail_unless(ret == len, "Bad packet length: %d, expected %d", ret, len);
|
fail_unless(ret == len, "Bad packet length: %d, expected %d", ret, len);
|
||||||
}
|
}
|
||||||
END_TEST
|
END_TEST
|
||||||
|
@ -156,7 +156,7 @@ START_TEST(test_decode_response)
|
||||||
len = sizeof(buf);
|
len = sizeof(buf);
|
||||||
memset(&buf, 0, sizeof(buf));
|
memset(&buf, 0, sizeof(buf));
|
||||||
|
|
||||||
ret = dns_decode(buf, len, &q, QR_ANSWER, answerPacket, sizeof(answerPacket)-1);
|
ret = dns_decode(buf, len, &q, QR_ANSWER, answer_packet, sizeof(answer_packet)-1);
|
||||||
fail_unless(strncmp(msgData, buf, sizeof(msgData)) == 0, "Did not extract expected data");
|
fail_unless(strncmp(msgData, buf, sizeof(msgData)) == 0, "Did not extract expected data");
|
||||||
fail_unless(ret == strlen(msgData), "Bad data length: %d, expected %d", ret, strlen(msgData));
|
fail_unless(ret == strlen(msgData), "Bad data length: %d, expected %d", ret, strlen(msgData));
|
||||||
fail_unless(q.id == 0x0539);
|
fail_unless(q.id == 0x0539);
|
||||||
|
@ -173,12 +173,45 @@ START_TEST(test_decode_response_with_high_trans_id)
|
||||||
len = sizeof(buf);
|
len = sizeof(buf);
|
||||||
memset(&buf, 0, sizeof(buf));
|
memset(&buf, 0, sizeof(buf));
|
||||||
|
|
||||||
ret = dns_decode(buf, len, &q, QR_ANSWER, answerPacketHighTransId, sizeof(answerPacketHighTransId)-1);
|
ret = dns_decode(buf, len, &q, QR_ANSWER, answer_packet_high_trans_id, sizeof(answer_packet_high_trans_id)-1);
|
||||||
fail_unless(strncmp(msgData, buf, sizeof(msgData)) == 0, "Did not extract expected data");
|
fail_unless(strncmp(msgData, buf, sizeof(msgData)) == 0, "Did not extract expected data");
|
||||||
fail_unless(ret == strlen(msgData), "Bad data length: %d, expected %d", ret, strlen(msgData));
|
fail_unless(ret == strlen(msgData), "Bad data length: %d, expected %d", ret, strlen(msgData));
|
||||||
fail_unless(q.id == 0x8539, "q.id was %08X instead of %08X!", q.id, 0x8539);
|
fail_unless(q.id == 0x8539, "q.id was %08X instead of %08X!", q.id, 0x8539);
|
||||||
}
|
}
|
||||||
END_TEST
|
END_TEST
|
||||||
|
|
||||||
|
START_TEST(test_get_id_short_packet)
|
||||||
|
{
|
||||||
|
char buf[5];
|
||||||
|
int len;
|
||||||
|
unsigned short id;
|
||||||
|
|
||||||
|
len = sizeof(buf);
|
||||||
|
memset(&buf, 5, sizeof(buf));
|
||||||
|
|
||||||
|
id = dns_get_id(buf, len);
|
||||||
|
fail_unless(id == 0);
|
||||||
|
}
|
||||||
|
END_TEST
|
||||||
|
|
||||||
|
START_TEST(test_get_id_low)
|
||||||
|
{
|
||||||
|
unsigned short id;
|
||||||
|
|
||||||
|
id = dns_get_id(answer_packet, sizeof(answer_packet));
|
||||||
|
fail_unless(id == 1337);
|
||||||
|
}
|
||||||
|
END_TEST
|
||||||
|
|
||||||
|
START_TEST(test_get_id_high)
|
||||||
|
{
|
||||||
|
unsigned short id;
|
||||||
|
|
||||||
|
id = dns_get_id(answer_packet_high_trans_id, sizeof(answer_packet_high_trans_id));
|
||||||
|
fail_unless(id == 0x8539);
|
||||||
|
}
|
||||||
|
END_TEST
|
||||||
|
|
||||||
static void
|
static void
|
||||||
dump_packet(char *buf, size_t len)
|
dump_packet(char *buf, size_t len)
|
||||||
{
|
{
|
||||||
|
@ -209,6 +242,9 @@ test_dns_create_tests()
|
||||||
tcase_add_test(tc, test_encode_response);
|
tcase_add_test(tc, test_encode_response);
|
||||||
tcase_add_test(tc, test_decode_response);
|
tcase_add_test(tc, test_decode_response);
|
||||||
tcase_add_test(tc, test_decode_response_with_high_trans_id);
|
tcase_add_test(tc, test_decode_response_with_high_trans_id);
|
||||||
|
tcase_add_test(tc, test_get_id_short_packet);
|
||||||
|
tcase_add_test(tc, test_get_id_low);
|
||||||
|
tcase_add_test(tc, test_get_id_high);
|
||||||
|
|
||||||
return tc;
|
return tc;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue