code review

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

diff --git a/services/mesh.c b/services/mesh.c
index c71c1a1f99e357b9f9befbc34777c8edabf541da..43474101f11103c40458e3fcfdc18e9e70ee62de 100644 (file)
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -415,7 +415,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
                        sinaddr = &((struct sockaddr_in6*)ss)->sin6_addr;
                        if (!copy_clear(
                                        edns->subnet_addr, INET6_SIZE, (uint8_t *)sinaddr, 
-                                       INET6_SIZE, EDNSSUBNET_MAX_SUBNET_IP4)) {
+                                       INET6_SIZE, EDNSSUBNET_MAX_SUBNET_IP6)) {
                                edns->subnet_validdata = 1;
                        }
                }
@@ -1047,7 +1047,7 @@ struct mesh_state* mesh_area_find(struct mesh_area* mesh,
        key.s.qinfo = *qinfo;
        key.s.query_flags = qflags;
 #ifdef CLIENT_SUBNET
-       key.s.edns_from_client = NULL;
+       key.s.edns_from_client = NULL; /* is used in subnet cmp function */
 #endif
 
        result = (struct mesh_state*)rbtree_search(&mesh->all, &key);

diff --git a/util/data/msgparse.c b/util/data/msgparse.c
index 4e04603266cf0ef4a881b7ff3a0a52d03d5c3bd1..55f9b7e63ecf42fb466515a3f94b866eb47340ef 100644 (file)
--- a/util/data/msgparse.c
+++ b/util/data/msgparse.c
@@ -935,7 +935,8 @@ parse_packet(ldns_buffer* pkt, struct msg_parse* msg, struct regional* region)
 
 #ifdef CLIENT_SUBNET
 
-void parse_subnet_option(uint8_t* data, struct edns_data* edns, int opt_len)
+static void
+parse_subnet_option(uint8_t* data, struct edns_data* edns, int opt_len)
 {
        if(opt_len < 4) return; /* try next */
 
@@ -962,7 +963,7 @@ void parse_subnet_option(uint8_t* data, struct edns_data* edns, int opt_len)
        edns->subnet_validdata = 1;
 }
 
-void
+static void
 parse_ednsdata(uint8_t* data, struct edns_data* edns)
 {
        int edns_datalen, opt_opc, opt_len, opt_start;