[sr-dev] git:master:b3f6392d: dispatcher: do recursive avl search for ds_is_from_list()

Daniel-Constantin Mierla miconda at gmail.com
Tue Nov 8 12:21:30 CET 2016


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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2016-11-08T12:19:59+01:00

dispatcher: do recursive avl search for ds_is_from_list()

- search all ds set nodes when no group id is provided
- reported by GH #848

---

Modified: modules/dispatcher/dispatch.c

---

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

---

diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c
index 8ba44dd..fd58b12 100644
--- a/modules/dispatcher/dispatch.c
+++ b/modules/dispatcher/dispatch.c
@@ -2629,7 +2629,7 @@ int ds_is_addr_from_set_r( sip_msg_t *_m, struct ip_addr* pipaddr,
 		return -1;
 
 	for(i=0;i<2;++i) {
-		rc = ds_is_addr_from_set_r(  _m, pipaddr, tport, tproto,
+		rc = ds_is_addr_from_set_r( _m, pipaddr, tport, tproto,
 				node->next[i], mode, export_set_pv );
 		if ( rc != -1 )
 			return rc;
@@ -2680,7 +2680,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode)
 
 
 	if ( group == -1 ) {
-		rc = ds_is_addr_from_set( _m, pipaddr, tport, tproto, _ds_list, mode, 1 );
+		rc = ds_is_addr_from_set_r( _m, pipaddr, tport, tproto, _ds_list, mode, 1 );
 	} else {
 		list = ds_avl_find( _ds_list, group );
 		if ( list ) {




More information about the sr-dev mailing list