Changeset b6fc3f

Timestamp:

02/09/09 21:44:08 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

955135

Parents:

3ee493

git-author:

Erik Ekman <yarrick@…> (02/09/09 21:44:08)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:00)

Message:

Made dns_get_id return unsigned short, added test cases

Files:

• src/dns.c (modified) (1 diff)
• src/dns.h (modified) (1 diff)
• src/fw_query.c (modified) (1 diff)
• src/fw_query.h (modified) (1 diff)
• src/iodined.c (modified) (1 diff)
• tests/dns.c (modified) (10 diffs)

src/dns.c

@@ -184 +184 @@
 }
 
-short
+unsigned short
 dns_get_id(char *packet, size_t packetlen)
 {

src/dns.h

@@ -27 +27 @@
 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);
-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);
 

src/fw_query.c

@@ -36 +36 @@
 }
 
-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;

src/fw_query.h

@@ -31 +31 @@
         struct sockaddr addr;
         int addrlen;
-        short id;
+        unsigned short id;
 };
 
 void fw_query_init();
 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__*/

src/iodined.c

@@ -626 +626 @@
         socklen_t fromlen;
         struct fw_query *query;
-        short id;
+        unsigned short id;
         int r;
 

tests/dns.c

@@ -34 +34 @@
 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"
         "\x75\x79\x74\x63\x70\x65\x62\x30\x67\x71\x30\x6C\x74\x65\x62\x75\x78"
@@ -41 +41 @@
         "\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"
         "\x79\x04\x68\x6F\x73\x74\x02\x6F\x66\x06\x69\x6F\x64\x69\x6E\x65\x04"
@@ -49 +49 @@
         "\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"
         "\x79\x04\x68\x6F\x73\x74\x02\x6F\x66\x06\x69\x6F\x64\x69\x6E\x65\x04"
@@ -88 +88 @@
         strcpy(d, topdomain);
         ret = dns_encode(buf, len, &q, QR_QUERY, resolv, strlen(resolv));
-        len = sizeof(queryPacket) - 1; /* Skip extra null character */
-
-        if (strncmp(queryPacket, buf, sizeof(queryPacket)) || ret != len) {
+        len = sizeof(query_packet) - 1; /* Skip extra null character */
+
+        if (strncmp(query_packet, buf, sizeof(query_packet)) || ret != len) {
                 printf("\n");
-                dump_packet(queryPacket, len);
+                dump_packet(query_packet, len);
                 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);
 }
@@ -111 +111 @@
         memset(&buf, 0, sizeof(buf));
         q.id = 0;
-        len = sizeof(queryPacket) - 1;
+        len = sizeof(query_packet) - 1;
         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);
         len = sizeof(buf);
@@ -140 +140 @@
 
         ret = dns_encode(buf, len, &q, QR_ANSWER, msgData, strlen(msgData));
-        len = sizeof(answerPacket) - 1; /* Skip extra null character */
-
-        fail_unless(strncmp(answerPacket, buf, sizeof(answerPacket)) == 0, "Did not compile expected packet");
+        len = sizeof(answer_packet) - 1; /* Skip extra null character */
+
+        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);
 }
@@ -157 +157 @@
         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(ret == strlen(msgData), "Bad data length: %d, expected %d", ret, strlen(msgData));
@@ -174 +174 @@
         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(ret == strlen(msgData), "Bad data length: %d, expected %d", ret, strlen(msgData));
@@ -180 +180 @@
 }
 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
 dump_packet(char *buf, size_t len)
@@ -210 +243 @@
         tcase_add_test(tc, test_decode_response);
         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;