[sr-dev] git:master:b0e12c7e: Merge pull request #1650 from jchavanton/issue_1649

[GitHub]

Module: kamailio
Branch: master
Commit: b0e12c7ede93a47cc3912285a5ee4eef647f0b69
URL: https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4eef647f0b69

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: GitHub <noreply at github.com>
Date: 2018-09-25T13:04:23+02:00

Merge pull request #1650 from jchavanton/issue_1649

dispatcher: fix syncronization problem with

---

Modified: src/modules/dispatcher/dispatch.c

---

Diff:  https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4eef647f0b69.diff
Patch: https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4eef647f0b69.patch

---

diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c
index 20077f1506..70dc2d4919 100644
--- a/src/modules/dispatcher/dispatch.c
+++ b/src/modules/dispatcher/dispatch.c
@@ -533,31 +533,36 @@ int dp_init_relative_weights(ds_set_t *dset)
 	int k;
 	int t;
 
-	if(dset == NULL || dset->dlist == NULL)
+	if(dset == NULL || dset->dlist == NULL || dset->nr < 2)
 		return -1;
 
+	/* local copy to avoid syncronization problems */
+	int *ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr);
+	int *ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr);
+
+	/* needed to sync the rwlist access */
 	lock_get(&dset->lock);
 	int rw_sum = 0;
-	/* find the sum of relative weights*/
+	/* find the sum of relative weights */
 	for(j = 0; j < dset->nr; j++) {
-		if(ds_skip_dst(dset->dlist[j].flags))
+		ds_dests_flags[j] = dset->dlist[j].flags;
+		ds_dests_rweights[j] = dset->dlist[j].attrs.rweight;
+		if(ds_skip_dst(ds_dests_flags[j]))
 			continue;
-		rw_sum += dset->dlist[j].attrs.rweight;
+		rw_sum += ds_dests_rweights[j];
 	}
 
-	if(rw_sum == 0) {
-		lock_release(&dset->lock);
-		return 0;
-	}
+	if(rw_sum == 0)
+		goto ret;
 
 	/* fill the array based on the relative weight of each destination */
 	t = 0;
 	for(j = 0; j < dset->nr; j++) {
-		if(ds_skip_dst(dset->dlist[j].flags))
+		if(ds_skip_dst(ds_dests_flags[j]))
 			continue;
 
 		int current_slice =
-				dset->dlist[j].attrs.rweight * 100 / rw_sum; //truncate here;
+				ds_dests_rweights[j] * 100 / rw_sum; //truncate here;
 		LM_DBG("rw_sum[%d][%d][%d]\n",j, rw_sum, current_slice);
 		for(k = 0; k < current_slice; k++) {
 			dset->rwlist[t] = (unsigned int)j;
@@ -577,7 +582,12 @@ int dp_init_relative_weights(ds_set_t *dset)
 	 * sending first 20 calls to it, but ensure that within a 100 calls,
 	 * 20 go to first address */
 	shuffle_uint100array(dset->rwlist);
+	goto ret;
+
+ret:
 	lock_release(&dset->lock);
+	pkg_free(ds_dests_flags);
+	pkg_free(ds_dests_rweights);
 	return 0;
 }