sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
210 discussions

[tracker] Task closed: Possible memory leak when processing sht_reload

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#385 - Possible memory leak when processing sht_reload User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=385 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 10 months

[tracker] Comment added: Possible memory leak when processing sht_reload

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#385 - Possible memory leak when processing sht_reload User who did this - Daniel-Constantin Mierla (miconda) ---------- You don't need to change the value for define PKG_MEM_SIZE to adjust the private memory and recompile -- just provide the size of private memory in MB via -M command line parameter. Anyhow, I changed the code to use system malloc for this operation, so pkg is not used anymore for it. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=385#comment1264 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 10 months

git:4.1: htable: free temporary slots used to reload hash table via rpc command

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 3bfb9030dda5776744efc4f408557e044b4ebb75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bfb903… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 22:52:11 2014 +0100 htable: free temporary slots used to reload hash table via rpc command - use system memory for temporary slots (cherry picked from commit f35c49085bdcc623ef45aa33a99af3265d3e6eeb) --- modules/htable/htable.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 682b847..ab2ecea 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -1049,7 +1049,8 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) memcpy(&nht, ht, sizeof(ht_t)); - nht.entries = (ht_entry_t*)shm_malloc(nht.htsize*sizeof(ht_entry_t)); + /* it's temporary operation - use system malloc */ + nht.entries = (ht_entry_t*)malloc(nht.htsize*sizeof(ht_entry_t)); if(nht.entries == NULL) { ht_db_close_con(); @@ -1060,6 +1061,18 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if(ht_db_load_table(&nht, &ht->dbtable, 0)<0) { + /* free any entry set if it was a partial load */ + for(i=0; i<nht.htsize; i++) + { + first = nht.entries[i].first; + while(first) + { + it = first; + first = first->next; + ht_cell_free(it); + } + } + free(nht.entries); ht_db_close_con(); rpc->fault(c, 500, "Mtree reload failed"); return; @@ -1086,6 +1099,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) ht_cell_free(it); } } + free(nht.entries); ht_db_close_con(); return; }

10 years, 10 months

git:4.1: htable: use system malloc for temporary allocation of hash table realod slots

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 2b450f573bdbcb88d0418a43a6707875f050eb33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b450f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 22:46:48 2014 +0100 htable: use system malloc for temporary allocation of hash table realod slots - copes better with large number of slots, without a need to use shm (cherry picked from commit 13626ccffeaa7654c58576c3d1cc417dea865ca9) --- modules/htable/htable.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 6345b9e..682b847 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -490,7 +490,8 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) return init_mi_tree( 500, "no such hash table", 18); } memcpy(&nht, ht, sizeof(ht_t)); - nht.entries = (ht_entry_t*)pkg_malloc(nht.htsize*sizeof(ht_entry_t)); + /* it's temporary operation - use system malloc */ + nht.entries = (ht_entry_t*)malloc(nht.htsize*sizeof(ht_entry_t)); if(nht.entries == NULL) { ht_db_close_con(); @@ -500,6 +501,18 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) if(ht_db_load_table(&nht, &ht->dbtable, 0)<0) { + /* free any entry set if it was a partial load */ + for(i=0; i<nht.htsize; i++) + { + first = nht.entries[i].first; + while(first) + { + it = first; + first = first->next; + ht_cell_free(it); + } + } + free(nht.entries); ht_db_close_con(); return init_mi_tree(500, MI_ERR_RELOAD, MI_ERR_RELOAD_LEN); } @@ -525,7 +538,7 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) ht_cell_free(it); } } - pkg_free(nht.entries); + free(nht.entries); ht_db_close_con(); return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); }

10 years, 10 months

git:4.1: htable: use pkg for temporary hash table slots used for reload

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 75e904f2c2034075383b412e2dcb18c6fb01c7c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75e904f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 2 13:22:28 2014 +0100 htable: use pkg for temporary hash table slots used for reload - free the temporary slots after reload, reported in FS#385 (cherry picked from commit 53689b55632c6208e6326f1a5f4b3c45da216f43) --- modules/htable/htable.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 1900ec5..6345b9e 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -490,7 +490,7 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) return init_mi_tree( 500, "no such hash table", 18); } memcpy(&nht, ht, sizeof(ht_t)); - nht.entries = (ht_entry_t*)shm_malloc(nht.htsize*sizeof(ht_entry_t)); + nht.entries = (ht_entry_t*)pkg_malloc(nht.htsize*sizeof(ht_entry_t)); if(nht.entries == NULL) { ht_db_close_con(); @@ -525,6 +525,7 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) ht_cell_free(it); } } + pkg_free(nht.entries); ht_db_close_con(); return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); }

10 years, 10 months

git:master: htable: use system malloc for temporary allocation of hash table realod slots

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 13626ccffeaa7654c58576c3d1cc417dea865ca9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13626cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 22:46:48 2014 +0100 htable: use system malloc for temporary allocation of hash table realod slots - copes better with large number of slots, without a need to use shm --- modules/htable/htable.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 6345b9e..682b847 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -490,7 +490,8 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) return init_mi_tree( 500, "no such hash table", 18); } memcpy(&nht, ht, sizeof(ht_t)); - nht.entries = (ht_entry_t*)pkg_malloc(nht.htsize*sizeof(ht_entry_t)); + /* it's temporary operation - use system malloc */ + nht.entries = (ht_entry_t*)malloc(nht.htsize*sizeof(ht_entry_t)); if(nht.entries == NULL) { ht_db_close_con(); @@ -500,6 +501,18 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) if(ht_db_load_table(&nht, &ht->dbtable, 0)<0) { + /* free any entry set if it was a partial load */ + for(i=0; i<nht.htsize; i++) + { + first = nht.entries[i].first; + while(first) + { + it = first; + first = first->next; + ht_cell_free(it); + } + } + free(nht.entries); ht_db_close_con(); return init_mi_tree(500, MI_ERR_RELOAD, MI_ERR_RELOAD_LEN); } @@ -525,7 +538,7 @@ static struct mi_root* ht_mi_reload(struct mi_root* cmd_tree, void* param) ht_cell_free(it); } } - pkg_free(nht.entries); + free(nht.entries); ht_db_close_con(); return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); }

10 years, 10 months

git:master: htable: free temporary slots used to reload hash table via rpc command

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f35c49085bdcc623ef45aa33a99af3265d3e6eeb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f35c490… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 22:52:11 2014 +0100 htable: free temporary slots used to reload hash table via rpc command - use system memory for temporary slots --- modules/htable/htable.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 682b847..ab2ecea 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -1049,7 +1049,8 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) memcpy(&nht, ht, sizeof(ht_t)); - nht.entries = (ht_entry_t*)shm_malloc(nht.htsize*sizeof(ht_entry_t)); + /* it's temporary operation - use system malloc */ + nht.entries = (ht_entry_t*)malloc(nht.htsize*sizeof(ht_entry_t)); if(nht.entries == NULL) { ht_db_close_con(); @@ -1060,6 +1061,18 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if(ht_db_load_table(&nht, &ht->dbtable, 0)<0) { + /* free any entry set if it was a partial load */ + for(i=0; i<nht.htsize; i++) + { + first = nht.entries[i].first; + while(first) + { + it = first; + first = first->next; + ht_cell_free(it); + } + } + free(nht.entries); ht_db_close_con(); rpc->fault(c, 500, "Mtree reload failed"); return; @@ -1086,6 +1099,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) ht_cell_free(it); } } + free(nht.entries); ht_db_close_con(); return; }

10 years, 10 months

git:master: permissions: note about peer tag mode that applies only for allow_trusted()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 15f8a92baf58ee70e837b3b7e7f208b1a2678a0a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15f8a92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 19:51:41 2014 +0100 permissions: note about peer tag mode that applies only for allow_trusted() --- modules/permissions/doc/permissions_admin.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/permissions/doc/permissions_admin.xml b/modules/permissions/doc/permissions_admin.xml index 8e2ba00..c955d2a 100644 --- a/modules/permissions/doc/permissions_admin.xml +++ b/modules/permissions/doc/permissions_admin.xml @@ -687,7 +687,8 @@ modparam("permissions", "peer_tag_avp", "$avp(i:707)") <para> Tag mode for allow_trusted(). 0 sets only the tag of the first match. 1 adds the tags of all matches to the avp. In addition - the return value of allow_trusted() is the number of matches. + the return value of allow_trusted() is the number of matches. This + parameter is not used for address table matching functions. </para> <para> <emphasis>

10 years, 10 months

git:master: permissions: refreshed the README file

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2fd9fe3b46d21f9e958b09162ec6f2fd1ed04ec7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2fd9fe3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 19:52:13 2014 +0100 permissions: refreshed the README file --- modules/permissions/README | 117 ++++++++++++++++++++++---------------------- 1 files changed, 59 insertions(+), 58 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2fd…

10 years, 10 months

git:master: permissions: set peer tag avp for allow_address_group()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0c67042fa629ee4744cfc31a15e571b7340b0881 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c67042… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 19:48:54 2014 +0100 permissions: set peer tag avp for allow_address_group() - also for allow_source_address_group() - reported by Kelvin Chua --- modules/permissions/hash.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/permissions/hash.c b/modules/permissions/hash.c index 3a16581..b8daeb1 100644 --- a/modules/permissions/hash.c +++ b/modules/permissions/hash.c @@ -486,6 +486,7 @@ int find_group_in_addr_hash_table(struct addr_list** table, { struct addr_list *np; str addr_str; + avp_value_t val; addr_str.s = (char*)addr->u.addr; addr_str.len = 4; @@ -493,6 +494,15 @@ int find_group_in_addr_hash_table(struct addr_list** table, for (np = table[perm_hash(addr_str)]; np != NULL; np = np->next) { if (((np->port == 0) || (np->port == port)) && ip_addr_cmp(&np->addr, addr)) { + + if (tag_avp.n && np->tag.s) { + val.s = np->tag; + if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, val) != 0) { + LM_ERR("setting of tag_avp failed\n"); + return -1; + } + } + return np->grp; } } @@ -710,6 +720,7 @@ int find_group_in_subnet_table(struct subnet* table, ip_addr_t *addr, unsigned int port) { unsigned int count, i; + avp_value_t val; count = table[PERM_MAX_SUBNETS].grp; @@ -717,7 +728,16 @@ int find_group_in_subnet_table(struct subnet* table, while (i < count) { if ( ((table[i].port == port) || (table[i].port == 0)) && (ip_addr_match_net(addr, &table[i].subnet, table[i].mask)==0)) + { + if (tag_avp.n && np->tag.s) { + val.s = np->tag; + if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, val) != 0) { + LM_ERR("setting of tag_avp failed\n"); + return -1; + } + } return table[i].grp; + } i++; }

10 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014