[drouting] bug fix and memory leak fix

* free gateways list for each carrier at reload * use map_find instead of map_get to search an element in the tree
OpenSIPS · Apr 29, 2016 · a2522eb · a2522eb
1 parent dc9e068
commit a2522eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/modules/drouting/prefix_tree.c b/modules/drouting/prefix_tree.c
@@ -214,7 +214,8 @@ get_gw_by_id(
 		str *id
 		)
 {
-	return (pgw_t *)*map_get(pgw_tree, *id);
+	pgw_t** ret;
+	return (ret=(pgw_t**)map_find(pgw_tree, *id))?*ret:NULL;
 }
 
 pcr_t*
@@ -223,7 +224,9 @@ get_carrier_by_id(
 		str *id
 		)
 {
-	return (pcr_t*)*map_get(carriers_tree, *id);
+	pcr_t** ret;
+
+	return (ret=(pcr_t**)map_find(carriers_tree, *id))?*ret:NULL;
 }
 
 

diff --git a/modules/drouting/routing.c b/modules/drouting/routing.c
@@ -630,7 +630,9 @@ void destroy_pgw(void *pgw_p)
 
 void destroy_pcr(void *pcr_p)
 {
-	shm_free((pcr_t *)pcr_p);
+	pcr_t* pcr = pcr_p;
+	if (pcr->pgwl) shm_free(pcr->pgwl);
+	shm_free(pcr);
 }