Deleted Added
full compact
47a48
> #include "dnstap/dnstap_config.h"
57a59,60
> struct serviced_query;
> struct dt_env;
127a131,134
> #ifdef USE_DNSTAP
> /** dnstap environment */
> struct dt_env* dtenv;
> #endif
137a145,146
> /** number of tcp communication points in use. */
> size_t num_tcp_outgoing;
212a222,223
> /** the corresponding serviced_query */
> struct serviced_query* sq;
309a321,322
> /** ignore capsforid */
> int nocaps;
385a399
> * @param dtenv: environment to send dnstap events with (if enabled).
394c408
< void* sslctx, int delayclose);
---
> void* sslctx, int delayclose, struct dt_env *dtenv);
411c425
< * @param outnet: provides the event handling
---
> * @param sq: serviced query.
413,414d426
< * @param addr: address to send to.
< * @param addrlen: length of addr.
420,422c432,433
< struct pending* pending_udp_query(struct outside_network* outnet,
< struct sldns_buffer* packet, struct sockaddr_storage* addr,
< socklen_t addrlen, int timeout, comm_point_callback_t* callback,
---
> struct pending* pending_udp_query(struct serviced_query* sq,
> struct sldns_buffer* packet, int timeout, comm_point_callback_t* callback,
428c439
< * @param outnet: provides the event handling.
---
> * @param sq: serviced query.
430,431d440
< * @param addr: address to send to.
< * @param addrlen: length of addr.
437d445
< * @param ssl_upstream: if the tcp connection must use SSL.
440,443c448,450
< struct waiting_tcp* pending_tcp_query(struct outside_network* outnet,
< struct sldns_buffer* packet, struct sockaddr_storage* addr,
< socklen_t addrlen, int timeout, comm_point_callback_t* callback,
< void* callback_arg, int ssl_upstream);
---
> struct waiting_tcp* pending_tcp_query(struct serviced_query* sq,
> struct sldns_buffer* packet, int timeout, comm_point_callback_t* callback,
> void* callback_arg);
466a474
> * @param nocaps: ignore use_caps_for_id and use unperturbed qname.
483,486c491,495
< uint16_t flags, int dnssec, int want_dnssec, int tcp_upstream,
< int ssl_upstream, struct sockaddr_storage* addr, socklen_t addrlen,
< uint8_t* zone, size_t zonelen, comm_point_callback_t* callback,
< void* callback_arg, struct sldns_buffer* buff);
---
> uint16_t flags, int dnssec, int want_dnssec, int nocaps,
> int tcp_upstream, int ssl_upstream, struct sockaddr_storage* addr,
> socklen_t addrlen, uint8_t* zone, size_t zonelen,
> comm_point_callback_t* callback, void* callback_arg,
> struct sldns_buffer* buff);