- Please doxygen so it passes.

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

diff --git a/doc/Changelog b/doc/Changelog
index a59641316ba5ab8a254519661d2935e350807d1f..2d237422c0b3f8574911755e362854035784b498 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -16,6 +16,7 @@
        - From Wouter: make depend, the dependencies in the patches did not
          apply cleanly.  Also remade yacc and lex.
        - Fix mesh.c incompatible pointer pass.
+       - Please doxygen so it passes.
 
 30 July 2018: Wouter
        - Fix #4136: insufficiency from mismatch of FLEX capability between

diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index d97cfc7c2c08565a99b9918d19f6f2de8e191914..74f4541e11b4c95e236f0e30cc8a1fe0196018b6 100644 (file)
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -137,6 +137,7 @@ void listening_ports_free(struct listen_port* list);
  * @param bufsize: size of datagram buffer.
  * @param tcp_accept_count: max number of simultaneous TCP connections 
  *     from clients.
+ * @param tcp_idle_timeout: idle timeout for TCP connections in msec.
  * @param sslctx: nonNULL if ssl context.
  * @param dtenv: nonNULL if dnstap enabled.
  * @param cb: callback function when a request arrives. It is passed

diff --git a/util/config_file.h b/util/config_file.h
index 062dc348bf7ed66d9ac611851a901b127201cbd5..b5572a3360546bb056338411f18cce1cad8330b4 100644 (file)
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -99,11 +99,11 @@ struct config_file {
        int tcp_mss;
        /** maximum segment size of tcp socket for outgoing queries */
        int outgoing_tcp_mss;
-       /** tcp idle timeout */
+       /** tcp idle timeout, in msec */
        int tcp_idle_timeout;
        /** do edns tcp keepalive */
        int do_tcp_keepalive;
-       /** tcp keepalive timeout */
+       /** tcp keepalive timeout, in msec */
        int tcp_keepalive_timeout;
 
        /** private key file for dnstcp-ssl service (enabled if not NULL) */

diff --git a/util/edns.h b/util/edns.h
index d877484d0c76f44418035dad9ecca55fcb63f1ea..a4ee7def634ce0452d911782ba640f5ef06e4f69 100644 (file)
--- a/util/edns.h
+++ b/util/edns.h
@@ -54,6 +54,7 @@ struct regional;
  * @param edns_in: initialised edns information with received edns.
  * @param cfg: configuration.
  * @param c: comm channel.
+ * @param region: the region to allocate the edns options in.
  */
 int apply_edns_options(struct edns_data* edns_out, struct edns_data* edns_in,
        struct config_file* cfg, struct comm_point* c, struct regional* region);