pass ssl_upstream as int to (lib)worker_send_query

git-svn-id: file:///svn/unbound/trunk@3924 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/worker.c b/daemon/worker.c
index 5ca55c808957516a91e36221e3ee6e24092e6650..5e49011ac36fb948820773b71082b54d882e5cd5 100644 (file)
--- 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 e79cc279e0eacf182e0d2cd8164b67ec3da9904d..b00b96647eb88449f1652b9ffbeb45b1464c0a84 100644 (file)
--- 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 62e2d0b2aad340679d51dcc9d663cd61cab37df4..5d1c9ab92ff212630bad5ecfd247d3f831985143 100644 (file)
--- 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 f6276afec18c55fdb618e6971b36a7ba70d29570..efeef37cd0d2de08322730ed66dd03456a09ca98 100644 (file)
--- 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 6163b9e9004ed58a387af4d50e415ab8ed3646a4..581940d89262ca3b04bb7bc4ccc125a9b6f9ebf0 100644 (file)
--- 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 af1605ec7e4e9e5742542a1d3d2644f5000ad0b2..aba5f8f92b6d4b17c7f6acd522e64ea230ff58d2 100644 (file)
--- 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 e6322538750afaf5a30c6521ac53d0122cb4f068..97dc4c7175667d440ceabc69724ac5a6286a2802 100644 (file)
--- 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);
 
        /**