[svn-commits] file: branch group/dns_srv r433306 - in /team/group/dns_srv: include/asterisk...

[SVN commits to the Digium repositories]

Author: file
Date: Mon Mar 23 11:37:55 2015
New Revision: 433306

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433306
Log:
Apply weights as specified in the RFC.

Modified:
    team/group/dns_srv/include/asterisk/dns_internal.h
    team/group/dns_srv/main/dns_srv.c

Modified: team/group/dns_srv/include/asterisk/dns_internal.h
URL: http://svnview.digium.com/svn/asterisk/team/group/dns_srv/include/asterisk/dns_internal.h?view=diff&rev=433306&r1=433305&r2=433306
==============================================================================
--- team/group/dns_srv/include/asterisk/dns_internal.h (original)
+++ team/group/dns_srv/include/asterisk/dns_internal.h Mon Mar 23 11:37:55 2015
@@ -52,6 +52,8 @@
 	unsigned short weight;
 	/*! \brief The port in the SRV record */
 	unsigned short port;
+	/*! \brief The running weight sum */
+	unsigned int weight_sum;
 	/*! \brief Additional data */
 	char data[0];
 };

Modified: team/group/dns_srv/main/dns_srv.c
URL: http://svnview.digium.com/svn/asterisk/team/group/dns_srv/main/dns_srv.c?view=diff&rev=433306&r1=433305&r2=433306
==============================================================================
--- team/group/dns_srv/main/dns_srv.c (original)
+++ team/group/dns_srv/main/dns_srv.c Mon Mar 23 11:37:55 2015
@@ -117,11 +117,8 @@
 	struct dns_records newlist = AST_LIST_HEAD_NOLOCK_INIT_VALUE;
 
 	while (AST_LIST_FIRST(&result->records)) {
-		unsigned int random_weight;
-		unsigned int weight_sum;
 		unsigned short cur_priority = 0;
 		struct dns_records temp_list = AST_LIST_HEAD_NOLOCK_INIT_VALUE;
-		weight_sum = 0;
 
 		/* Find the lowest current priority to work on */
 		AST_LIST_TRAVERSE(&result->records, current, list) {
@@ -140,11 +137,16 @@
 		}
 		AST_LIST_TRAVERSE_SAFE_END;
 
+		/* Apply weighting - as each record is passed the sum of all previous weights (plus its own) is stored away, and then a random weight
+		 * is calculated. The first record with a weight sum greater than the random weight is put in the new list and the whole thing starts
+		 * once again.
+		 */
 		while (AST_LIST_FIRST(&temp_list)) {
-			weight_sum = 0;
+			unsigned int weight_sum = 0;
+			unsigned int random_weight;
 
 			AST_LIST_TRAVERSE(&temp_list, current, list) {
-				weight_sum += ((struct ast_dns_srv_record *)current)->weight;
+				((struct ast_dns_srv_record *)current)->weight_sum = weight_sum += ((struct ast_dns_srv_record *)current)->weight;
 			}
 
 			/* if all the remaining entries have weight == 0,
@@ -157,8 +159,9 @@
 			random_weight = 1 + (unsigned int) ((float) weight_sum * (ast_random() / ((float) RAND_MAX + 1.0)));
 
 			AST_LIST_TRAVERSE_SAFE_BEGIN(&temp_list, current, list) {
-				if (((struct ast_dns_srv_record *)current)->weight < random_weight)
+				if (((struct ast_dns_srv_record *)current)->weight_sum < random_weight) {
 					continue;
+				}
 
 				AST_LIST_MOVE_CURRENT(&newlist, list);
 				break;