From 11031a7d36801eb242dce156d505b1372a1ab4de Mon Sep 17 00:00:00 2001 From: Ralph Dolmans Date: Fri, 4 Nov 2016 14:02:22 +0000 Subject: [PATCH] pass ssl_upstream as int to (lib)worker_send_query git-svn-id: file:///svn/unbound/trunk@3924 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/worker.c | 4 ++-- libunbound/libworker.c | 4 ++-- libunbound/worker.h | 4 ++-- smallapp/worker_cb.c | 4 ++-- util/fptr_wlist.c | 2 +- util/fptr_wlist.h | 2 +- util/module.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/daemon/worker.c b/daemon/worker.c index 5ca55c808..5e49011ac 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -1421,7 +1421,7 @@ worker_send_query(uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, int want_dnssec, int nocaps, struct edns_option* opt_list, struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone, - size_t zonelen, uint8_t ssl_upstream, struct module_qstate* q) + size_t zonelen, int ssl_upstream, struct module_qstate* q) { struct worker* worker = q->env->worker; struct outbound_entry* e = (struct outbound_entry*)regional_alloc( @@ -1480,7 +1480,7 @@ struct outbound_entry* libworker_send_query(uint8_t* ATTR_UNUSED(qname), int ATTR_UNUSED(nocaps), struct edns_option* ATTR_UNUSED(opt_list), struct sockaddr_storage* ATTR_UNUSED(addr), socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone), - size_t ATTR_UNUSED(zonelen), uint8_t ATTR_UNUSED(ssl_upstream), + size_t ATTR_UNUSED(zonelen), int ATTR_UNUSED(ssl_upstream), struct module_qstate* ATTR_UNUSED(q)) { log_assert(0); diff --git a/libunbound/libworker.c b/libunbound/libworker.c index e79cc279e..b00b96647 100644 --- a/libunbound/libworker.c +++ b/libunbound/libworker.c @@ -830,7 +830,7 @@ struct outbound_entry* libworker_send_query(uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, int want_dnssec, int nocaps, struct edns_option* opt_list, struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone, - size_t zonelen, uint8_t ssl_upstream, struct module_qstate* q) + size_t zonelen, int ssl_upstream, struct module_qstate* q) { struct libworker* w = (struct libworker*)q->env->worker; struct outbound_entry* e = (struct outbound_entry*)regional_alloc( @@ -964,7 +964,7 @@ struct outbound_entry* worker_send_query(uint8_t* ATTR_UNUSED(qname), int ATTR_UNUSED(nocaps), struct edns_option* ATTR_UNUSED(opt_list), struct sockaddr_storage* ATTR_UNUSED(addr), socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone), - size_t ATTR_UNUSED(zonelen), uint8_t ATTR_UNUSED(ssl_upstream), + size_t ATTR_UNUSED(zonelen), int ATTR_UNUSED(ssl_upstream), struct module_qstate* ATTR_UNUSED(q)) { log_assert(0); diff --git a/libunbound/worker.h b/libunbound/worker.h index 62e2d0b2a..5d1c9ab92 100644 --- a/libunbound/worker.h +++ b/libunbound/worker.h @@ -74,7 +74,7 @@ struct outbound_entry* libworker_send_query(uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, int want_dnssec, int nocaps, struct edns_option* opt_list, struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone, - size_t zonelen, uint8_t ssl_upstream, struct module_qstate* q); + size_t zonelen, int ssl_upstream, struct module_qstate* q); /** process incoming replies from the network */ int libworker_handle_reply(struct comm_point* c, void* arg, int error, @@ -131,7 +131,7 @@ struct outbound_entry* worker_send_query(uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, int want_dnssec, int nocaps, struct edns_option* opt_list, struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone, - size_t zonelen, uint8_t ssl_upstream, struct module_qstate* q); + size_t zonelen, int ssl_upstream, struct module_qstate* q); /** * process control messages from the main thread. Frees the control diff --git a/smallapp/worker_cb.c b/smallapp/worker_cb.c index f6276afec..efeef37cd 100644 --- a/smallapp/worker_cb.c +++ b/smallapp/worker_cb.c @@ -106,7 +106,7 @@ struct outbound_entry* worker_send_query(uint8_t* ATTR_UNUSED(qname), int ATTR_UNUSED(nocaps), struct edns_option* ATTR_UNUSED(opt_list), struct sockaddr_storage* ATTR_UNUSED(addr), socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone), - size_t ATTR_UNUSED(zonelen), uint8_t ATTR_UNUSED(ssl_upstream), + size_t ATTR_UNUSED(zonelen), int ATTR_UNUSED(ssl_upstream), struct module_qstate* ATTR_UNUSED(q)) { log_assert(0); @@ -140,7 +140,7 @@ struct outbound_entry* libworker_send_query(uint8_t* ATTR_UNUSED(qname), int ATTR_UNUSED(nocaps), struct edns_option* ATTR_UNUSED(opt_list), struct sockaddr_storage* ATTR_UNUSED(addr), socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone), - size_t ATTR_UNUSED(zonelen), uint8_t ATTR_UNUSED(ssl_upstream), + size_t ATTR_UNUSED(zonelen), int ATTR_UNUSED(ssl_upstream), struct module_qstate* ATTR_UNUSED(q)) { log_assert(0); diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c index 6163b9e90..581940d89 100644 --- a/util/fptr_wlist.c +++ b/util/fptr_wlist.c @@ -270,7 +270,7 @@ fptr_whitelist_modenv_send_query(struct outbound_entry* (*fptr)( uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, int want_dnssec, int nocaps, struct edns_option* opt_list, struct sockaddr_storage* addr, - socklen_t addrlen, uint8_t* zone, size_t zonelen, uint8_t ssl_upstream, + socklen_t addrlen, uint8_t* zone, size_t zonelen, int ssl_upstream, struct module_qstate* q)) { if(fptr == &worker_send_query) return 1; diff --git a/util/fptr_wlist.h b/util/fptr_wlist.h index af1605ec7..aba5f8f92 100644 --- a/util/fptr_wlist.h +++ b/util/fptr_wlist.h @@ -213,7 +213,7 @@ int fptr_whitelist_modenv_send_query(struct outbound_entry* (*fptr)( uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, int want_dnssec, int nocaps, struct edns_option*, struct sockaddr_storage* addr, socklen_t addrlen, - uint8_t* zone, size_t zonelen, uint8_t ssl_upstream, + uint8_t* zone, size_t zonelen, int ssl_upstream, struct module_qstate* q)); /** diff --git a/util/module.h b/util/module.h index e63225387..97dc4c717 100644 --- a/util/module.h +++ b/util/module.h @@ -231,7 +231,7 @@ struct module_env { uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, int want_dnssec, int nocaps, struct edns_option* opt_list, struct sockaddr_storage* addr, socklen_t addrlen, - uint8_t* zone, size_t zonelen, uint8_t ssl_upstream, + uint8_t* zone, size_t zonelen, int ssl_upstream, struct module_qstate* q); /**