From 724a7d2d8f1df38b150c9a76f13c8db5195ebf59 Mon Sep 17 00:00:00 2001 From: Yuri Schaeffer Date: Mon, 27 Aug 2012 13:28:00 +0000 Subject: [PATCH] some splint suggested fixes, gcc and myself missed. git-svn-id: file:///svn/unbound/branches/edns-subnet@2749 be551aaa-1e26-0410-a405-d3ace91eadb9 --- testcode/fake_event.c | 3 ++- util/data/msgencode.c | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/testcode/fake_event.c b/testcode/fake_event.c index cf8ed6d4e..69dc871e5 100644 --- a/testcode/fake_event.c +++ b/testcode/fake_event.c @@ -898,7 +898,8 @@ outside_network_create(struct comm_base* base, size_t bufsize, int ATTR_UNUSED(use_caps_for_id), int* ATTR_UNUSED(availports), int ATTR_UNUSED(numavailports), size_t ATTR_UNUSED(unwanted_threshold), void (*unwanted_action)(void*), void* ATTR_UNUSED(unwanted_param), - int ATTR_UNUSED(do_udp), void* ATTR_UNUSED(sslctx)) + int ATTR_UNUSED(do_udp), void* ATTR_UNUSED(sslctx), + struct ednssubnet_upstream* edns_subnet_upstreams) { struct replay_runtime* runtime = (struct replay_runtime*)base; struct outside_network* outnet = calloc(1, diff --git a/util/data/msgencode.c b/util/data/msgencode.c index 045318d48..c87f0c9aa 100644 --- a/util/data/msgencode.c +++ b/util/data/msgencode.c @@ -746,17 +746,17 @@ attach_edns_record(ldns_buffer* pkt, struct edns_data* edns) ldns_buffer_write_u16(pkt, edns->bits); /* Add edns-subnet option to record */ if(edns->subnet_option_add) { - assert(edns.addr_fam == IANA_ADDRFAM_IP4 || - edns.addr_fam == IANA_ADDRFAM_IP6); - assert(edns.addr_fam != IANA_ADDRFAM_IP4 || + assert(edns->addr_fam == IANA_ADDRFAM_IP4 || + edns->addr_fam == IANA_ADDRFAM_IP6); + assert(edns->addr_fam != IANA_ADDRFAM_IP4 || edns->subnet_source_mask <= INET_SIZE*8); - assert(edns.addr_fam != IANA_ADDRFAM_IP6 || + assert(edns->addr_fam != IANA_ADDRFAM_IP6 || edns->subnet_source_mask <= INET6_SIZE*8); sn_octs = edns->subnet_source_mask / 8; - sn_octs_remainder = (edns->subnet_source_mask % 8)>0?1:0; + sn_octs_remainder = (size_t)((edns->subnet_source_mask % 8)>0?1:0); - assert(ldns_buffer_available(sn_octs + sn_octs_remainder + 4 + 6)); + assert(ldns_buffer_available(pkt, sn_octs + sn_octs_remainder + 4 + 6)); ldns_buffer_write_u16(pkt, sn_octs + sn_octs_remainder + 4 + 4); /* rdatalen */ ldns_buffer_write_u16(pkt, EDNS_SUBNET_OPC); /* opc */ -- 2.47.2