- Fix #4141: More randomness to rrset-roundrobin.

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

diff --git a/doc/Changelog b/doc/Changelog
index 37f4c3b30167a3a131c1e13253a4fd55ecd93662..bef20352d67c5c30db63c401d0b3dd1dbf87544c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
        - Fix #4190: Please create a "ANY" deny option, adds the option
          deny-any: yes in unbound.conf.  This responds with an empty message
          to queries of type ANY.
+       - Fix #4141: More randomness to rrset-roundrobin.
 
 24 October 2018: Ralph
        - Add markdel function to ECS slabhash.

diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index 6bc3216ff9e931a62b681b86a8c61c6538e3ba33..a706a2f2ef4120152f423d5a325f0bbcf409ea28 100644 (file)
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -672,7 +672,7 @@ reply_info_encode(struct query_info* qinfo, struct reply_info* rep,
        }
        /* roundrobin offset. using query id for random number.  With ntohs
         * for different roundrobins for sequential id client senders. */
-       rr_offset = RRSET_ROUNDROBIN?ntohs(id):0;
+       rr_offset = RRSET_ROUNDROBIN?ntohs(id)+(timenow?timenow:time(NULL)):0;
 
        /* "prepend" any local alias records in the answer section if this
         * response is supposed to be authoritative.  Currently it should