[svn-commits] bbryant: branch 1.6.0 r129157 - in /branches/1.6.0: ./ main/dns.c main/srv.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Tue Jul  8 16:04:56 2008
New Revision: 129157

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129157
Log:
Merged revisions 129156 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r129156 | bbryant | 2008-07-08 16:00:01 -0500 (Tue, 08 Jul 2008) | 6 lines

Fix a bug in SRV lookups where dnsmgr would discard everything but the 
first SRV result from DNS before processing weights and priorities and 
dns_parse_answer wouldn't report that there were no records in DNS 
unless a failure occured. Also fixed a bug where dnsmgr_refresh would 
report that a entry was being changed when ast_gethostbyname had failed.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/dns.c
    branches/1.6.0/main/srv.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/dns.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/dns.c?view=diff&rev=129157&r1=129156&r2=129157
==============================================================================
--- branches/1.6.0/main/dns.c (original)
+++ branches/1.6.0/main/dns.c Tue Jul  8 16:04:56 2008
@@ -189,6 +189,7 @@
 	unsigned char *fullanswer = answer;
 	struct dn_answer *ans;
 	dns_HEADER *h;
+	int ret = 0;
 	int res;
 	int x;
 
@@ -234,14 +235,13 @@
 					ast_log(LOG_WARNING, "Failed to parse result\n");
 					return -1;
 				}
-				if (res > 0)
-					return 1;
+				ret = 1;
 			}
 		}
 		answer += ntohs(ans->size);
 		len -= ntohs(ans->size);
 	}
-	return 0;
+	return ret;
 }
 
 #ifndef HAVE_RES_NINIT

Modified: branches/1.6.0/main/srv.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/srv.c?view=diff&rev=129157&r1=129156&r2=129157
==============================================================================
--- branches/1.6.0/main/srv.c (original)
+++ branches/1.6.0/main/srv.c Tue Jul  8 16:04:56 2008
@@ -137,7 +137,7 @@
 	if (entry)
 		AST_LIST_INSERT_TAIL(&c->entries, entry, list);
 
-	return 1;
+	return 0;
 }
 
 /* Do the bizarre SRV record weight-handling algorithm