- Fix #690: Reload fails when so-reuseport is yes after changing

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

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 0cd37ae8231c10a1905e86159de4da8760a24706..386860624abbbe8c908f69d82e814a86ef1327a6 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -464,7 +464,7 @@ thread_start(void* arg)
 #endif
 #ifdef SO_REUSEPORT
        if(worker->daemon->cfg->so_reuseport)
-               port_num = worker->thread_num;
+               port_num = worker->thread_num % worker->daemon->num_ports;
        else
                port_num = 0;
 #endif

diff --git a/doc/Changelog b/doc/Changelog
index 0bc42f562335ef4eac58da0873081f8c03b234a2..9fc401af871cd4ee02626936875b2adfd176e2f1 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+24 July 2015: Wouter
+       - Fix #690: Reload fails when so-reuseport is yes after changing
+         num-threads.
+
 21 July 2015: Wouter
        - Fix configure to detect SSL_CTX_set_ecdh_auto.
        - iana portlist update.