diff --git a/doc/Changelog b/doc/Changelog index 56a454d97..4c433586c 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +16 April 2020: George + - Add doxygen documentation for DSCP. + 16 April 2020: Wouter - Fix help return code in unbound-control-setup script. - Fix for posix shell syntax for trap in nsd-control-setup. diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index 096f382ba..51d5a3fdb 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -1203,6 +1203,7 @@ if_is_ssl(const char* ifname, const char* port, int ssl_port, * @param freebind: set IP_FREEBIND socket option. * @param use_systemd: if true, fetch sockets from systemd. * @param dnscrypt_port: dnscrypt service port number + * @param dscp: DSCP to use. * @return: returns false on error. */ static int diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h index c3cc0a92d..ddd1b63a4 100644 --- a/services/listen_dnsport.h +++ b/services/listen_dnsport.h @@ -205,6 +205,7 @@ void listen_start_accept(struct listen_dnsport* listen); * @param transparent: set IP_TRANSPARENT socket option. * @param freebind: set IP_FREEBIND socket option. * @param use_systemd: if true, fetch sockets from systemd. + * @param dscp: DSCP to use. * @return: the socket. -1 on error. */ int create_udp_sock(int family, int socktype, struct sockaddr* addr, @@ -222,6 +223,7 @@ int create_udp_sock(int family, int socktype, struct sockaddr* addr, * @param mss: maximum segment size of the socket. if zero, leaves the default. * @param freebind: set IP_FREEBIND socket option. * @param use_systemd: if true, fetch sockets from systemd. + * @param dscp: DSCP to use. * @return: the socket. -1 on error. */ int create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto, diff --git a/services/outside_network.c b/services/outside_network.c index 978e98b0e..2ed2f5ea5 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -1051,6 +1051,7 @@ sai6_putrandom(struct sockaddr_in6 *sa, int pfxlen, struct ub_randstate *rnd) * @param port: port override for addr. * @param inuse: if -1 is returned, this bool means the port was in use. * @param rnd: random state (for address randomisation). + * @param dscp: DSCP to use. * @return fd or -1 */ static int diff --git a/services/outside_network.h b/services/outside_network.h index 3fc5dde45..6a26806fa 100644 --- a/services/outside_network.h +++ b/services/outside_network.h @@ -403,6 +403,7 @@ struct serviced_query { * @param do_ip4: service IP4. * @param do_ip6: service IP6. * @param num_tcp: number of outgoing tcp buffers to preallocate. + * @param dscp: DSCP to use. * @param infra: pointer to infra cached used for serviced queries. * @param rnd: stored to create random numbers for serviced queries. * @param use_caps_for_id: enable to use 0x20 bits to encode id randomness.