- Fix bug where forward or stub addresses with same address but

  different port number were not tried.

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

diff --git a/doc/Changelog b/doc/Changelog
index 7bd48cee9b5f9910866a5c65095f85ad8696598d..ab38c10b183d1adf8fa3e002d0c60bc696ee84cd 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 11 November 2014: Wouter
        - iana portlist update.
+       - Fix bug where forward or stub addresses with same address but
+         different port number were not tried.
 
 7 November 2014: Wouter
        - dnstap fixes by Robert Edmonds:

diff --git a/iterator/iter_delegpt.c b/iterator/iter_delegpt.c
index 1d84280d2eacd71ff4f3e848520c547a62850806..b212ec0775fd65def221dd38c96c25efae87f4e7 100644 (file)
--- a/iterator/iter_delegpt.c
+++ b/iterator/iter_delegpt.c
@@ -147,7 +147,9 @@ delegpt_find_addr(struct delegpt* dp, struct sockaddr_storage* addr,
 {
        struct delegpt_addr* p = dp->target_list;
        while(p) {
-               if(sockaddr_cmp_addr(addr, addrlen, &p->addr, p->addrlen)==0) {
+               if(sockaddr_cmp_addr(addr, addrlen, &p->addr, p->addrlen)==0
+                       && ((struct sockaddr_in*)addr)->sin_port ==
+                          ((struct sockaddr_in*)&p->addr)->sin_port) {
                        return p;
                }
                p = p->next_target;