From cc538f4f9fe57e45799a1a1b6e21e5e33daa0327 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 31 Jul 2018 08:10:20 +0000
Subject: [PATCH] - Please doxygen so it passes.

git-svn-id: file:///svn/unbound/trunk@4813 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog             | 1 +
 services/listen_dnsport.h | 1 +
 util/config_file.h        | 4 ++--
 util/edns.h               | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index a59641316..2d237422c 100644
--- 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 d97cfc7c2..74f4541e1 100644
--- 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 062dc348b..b5572a336 100644
--- 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 d877484d0..a4ee7def6 100644
--- 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);