please pass more tests

git-svn-id: file:///svn/unbound/branches/edns-subnet@2967 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/edns-subnet/addrtree.c b/edns-subnet/addrtree.c
index 6a7ebb5991bf3b045a606f86764c651ff5a3a640..a082cdbb0d2727a1a599044999ddb8ce45e4b29d 100644 (file)
--- a/edns-subnet/addrtree.c
+++ b/edns-subnet/addrtree.c
@@ -29,7 +29,7 @@ edge_create(struct addrnode* node, const addrkey_t* addr, addrlen_t addrlen)
                return NULL;
        edge->node = node;
        edge->len = addrlen;
-       n = (addrlen / KEYWIDTH) + ((addrlen % KEYWIDTH)!=0)?1:0; /*ceil()*/
+       n = (size_t)((addrlen / KEYWIDTH) + ((addrlen % KEYWIDTH)!=0)?1:0); /*ceil()*/
        edge->str = (addrkey_t*)calloc(n, sizeof(addrkey_t));
        if (!edge->str) {
                free(edge);

diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index 83d6d7d97ef07379c2cdf1ec5f7fb808515a982b..f746e8be42396d261fcab5164d0f5afeecc048af 100644 (file)
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -245,7 +245,7 @@ int lookup_and_reply(struct module_qstate* qstate, int id)
 static int 
 common_prefix(uint8_t *a, uint8_t *b, uint8_t net)
 {
-       int n = net / 8;
+       size_t n = (size_t)net / 8;
        return !memcmp(a, b, n) && ((net % 8) == 0 || a[n] == b[n]);
 }
 

diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 514895dedcf3adfea3ea4e95e00ed5640c33c5e7..3c373f08778ab84f782742bc7bf000037f5cba62 100644 (file)
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -588,7 +588,9 @@ main(int argc, char* argv[])
        slabhash_test();
        infra_test();
        msgparse_test();
+#ifdef CLIENT_SUBNET
        vandergaast_test();
+#endif /* CLIENT_SUBNET */
        checklock_stop();
        printf("%d checks ok.\n", testcount);
 #ifdef HAVE_SSL

diff --git a/testcode/unitvandergaast.c b/testcode/unitvandergaast.c
index e885de22bed17af4fedeacfad47f2b581751b868..ec73f69f87d06df3101408e9b63e36e943494601 100644 (file)
--- a/testcode/unitvandergaast.c
+++ b/testcode/unitvandergaast.c
@@ -40,6 +40,9 @@
  */
 
 #include "config.h"
+
+#ifdef CLIENT_SUBNET
+
 #include "util/log.h"
 #include "testcode/unitmain.h"
 #include "edns-subnet/addrtree.h"
@@ -114,3 +117,5 @@ void vandergaast_test(void)
        getbit_test();
        issub_test();
 }
+#endif /* CLIENT_SUBNET */
+