sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:4.3:d2600807: core: dns cache - test for null pointers before debug checks after removing from list

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: d260080724b8f9ec0a3c55b3cee3ce34205b814c URL: https://github.com/kamailio/kamailio/commit/d260080724b8f9ec0a3c55b3cee3ce3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T12:00:33+01:00 core: dns cache - test for null pointers before debug checks after removing from list - next/prev are set to null after remove from list by commit 0fbcca38574139f1cd8ba7506ee5e204be5f2da7 (cherry picked from commit 70699ae8b9159c18bdd73c3092ccb19691edf0fd) --- Modified: dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/d260080724b8f9ec0a3c55b3cee3ce3… Patch: https://github.com/kamailio/kamailio/commit/d260080724b8f9ec0a3c55b3cee3ce3… --- diff --git a/dns_cache.c b/dns_cache.c index cb2d5be..21b780e 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -459,15 +459,15 @@ int init_dns_cache_stats(int iproc_num) #define debug_lu_lst( txt, l) \ do{ \ - if (check_lu_lst((l))){ \ + if ((l) && check_lu_lst((l))){ \ dbg_lu_lst(txt " crt:", (l)); \ abort(); \ } \ - if (check_lu_lst((l)->next)){ \ + if (((l)->next) && check_lu_lst((l)->next)){ \ dbg_lu_lst(txt " next:", (l)); \ abort(); \ } \ - if (check_lu_lst((l)->prev)){ \ + if (((l)->prev) && check_lu_lst((l)->prev)){ \ dbg_lu_lst(txt " prev:", (l)); \ abort(); \ } \

9 years

git:4.3:9dfa6268: nathelper: added examples in docs for few functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 9dfa62688c71062598f66adde3ba5b34bc58ebf9 URL: https://github.com/kamailio/kamailio/commit/9dfa62688c71062598f66adde3ba5b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T12:00:19+01:00 nathelper: added examples in docs for few functions (cherry picked from commit 2aa7683dfebedc4ef9c3fdd50fb7abd2a2d718db) --- Modified: modules/nathelper/README Modified: modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9dfa62688c71062598f66adde3ba5b3… Patch: https://github.com/kamailio/kamailio/commit/9dfa62688c71062598f66adde3ba5b3…

9 years

git:4.3:8a16b375: tm: print file name and line in free_cell() warning log message

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 8a16b37554cb668b9fcb9d0aba11157506f33672 URL: https://github.com/kamailio/kamailio/commit/8a16b37554cb668b9fcb9d0aba11157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T11:59:53+01:00 tm: print file name and line in free_cell() warning log message (cherry picked from commit bbf3f2a970020116da8c4c50069713e31a268943) --- Modified: modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/8a16b37554cb668b9fcb9d0aba11157… Patch: https://github.com/kamailio/kamailio/commit/8a16b37554cb668b9fcb9d0aba11157… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 8965cff..5aee155 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -126,7 +126,8 @@ void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int f LM_DBG("freeing transaction %p from %s:%u\n", dead_cell, fname, fline); if(dead_cell->prev_c!=NULL && dead_cell->next_c!=NULL) { - LM_WARN("removed cell %p is still linked in hash table\n", dead_cell); + LM_WARN("removed cell %p is still linked in hash table (%s:%u)\n", + dead_cell, fname, fline); unlink_timers(dead_cell); remove_from_hash_table_unsafe(dead_cell); }

9 years

git:4.3:0066abcf: tm: unlink cell and its timer in free function if structure still linked in clist

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 0066abcf28d707be7444ccb709cbeb9f37c636be URL: https://github.com/kamailio/kamailio/commit/0066abcf28d707be7444ccb709cbeb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T11:59:23+01:00 tm: unlink cell and its timer in free function if structure still linked in clist (cherry picked from commit 2fad76064992af047244e30c6152bf0f05a0785f) --- Modified: modules/tm/h_table.c Modified: modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/0066abcf28d707be7444ccb709cbeb9… Patch: https://github.com/kamailio/kamailio/commit/0066abcf28d707be7444ccb709cbeb9… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index b603e99..8965cff 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -125,6 +125,11 @@ void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int f LM_DBG("freeing transaction %p from %s:%u\n", dead_cell, fname, fline); + if(dead_cell->prev_c!=NULL && dead_cell->next_c!=NULL) { + LM_WARN("removed cell %p is still linked in hash table\n", dead_cell); + unlink_timers(dead_cell); + remove_from_hash_table_unsafe(dead_cell); + } release_cell_lock( dead_cell ); if (unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0); diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index fb197c8..7bff2a4 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1568,7 +1568,7 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, prefetch_loc_r(p_cell->next_c, 1); if(p_cell->label == label){ REF_UNSAFE(p_cell); - UNLOCK_HASH(hash_index); + UNLOCK_HASH(hash_index); set_t(p_cell, T_BR_UNDEFINED); *trans=p_cell; DBG("DEBUG: t_lookup_ident: transaction found\n");

9 years

git:4.3:ff64906a: tm: reset next/prev fields when unlinking transaction from hash table

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: ff64906a7cf9d6704dc82ab52a49ef0ed48d8fde URL: https://github.com/kamailio/kamailio/commit/ff64906a7cf9d6704dc82ab52a49ef0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T11:53:42+01:00 tm: reset next/prev fields when unlinking transaction from hash table (cherry picked from commit 649141185f231435bbe03fd13fe5a0e65b9fed04) --- Modified: modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/ff64906a7cf9d6704dc82ab52a49ef0… Patch: https://github.com/kamailio/kamailio/commit/ff64906a7cf9d6704dc82ab52a49ef0… --- diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 9340e5b..7cda34e 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -590,6 +590,8 @@ inline static void insert_into_hash_table_unsafe( struct cell * p_cell, inline static void remove_from_hash_table_unsafe( struct cell * p_cell) { clist_rm(p_cell, next_c, prev_c); + p_cell->next_c = 0; + p_cell->prev_c = 0; # ifdef EXTRA_DEBUG #ifdef TM_HASH_STATS if (_tm_table->entries[p_cell->hash_index].cur_entries==0){

9 years

git:4.3:b69ecda5: tm: warn troubleshooting message for deleted transaction turned in dbg

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: b69ecda51c820fbf4a4bc4de352a7b2f5e2d8d91 URL: https://github.com/kamailio/kamailio/commit/b69ecda51c820fbf4a4bc4de352a7b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T11:53:29+01:00 tm: warn troubleshooting message for deleted transaction turned in dbg (cherry picked from commit 92ff485409611ad345b14b784afb1be25fa188b9) --- Modified: modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/b69ecda51c820fbf4a4bc4de352a7b2… Patch: https://github.com/kamailio/kamailio/commit/b69ecda51c820fbf4a4bc4de352a7b2… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index c38885a..b603e99 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -123,7 +123,7 @@ void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int f struct totag_elem *tt, *foo; struct tm_callback *cbs, *cbs_tmp; - LM_WARN("===== freeing transaction %p from %s:%u\n", dead_cell, fname, fline); + LM_DBG("freeing transaction %p from %s:%u\n", dead_cell, fname, fline); release_cell_lock( dead_cell ); if (unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY)))

9 years

git:4.3:171df16d: tm: more debug info when freeing a transaction

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 171df16dea1d2c6215b6aa50a49157cf253f502f URL: https://github.com/kamailio/kamailio/commit/171df16dea1d2c6215b6aa50a49157c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T11:53:00+01:00 tm: more debug info when freeing a transaction - attempt to catch a double free (cherry picked from commit ef44e5b8b4292f4c4ff3a77e46bbb33e5e0f077f) --- Modified: modules/tm/h_table.c Modified: modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/171df16dea1d2c6215b6aa50a49157c… Patch: https://github.com/kamailio/kamailio/commit/171df16dea1d2c6215b6aa50a49157c… --- diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index e3bc1b4..c38885a 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -115,7 +115,7 @@ unsigned int transaction_count( void ) -void free_cell( struct cell* dead_cell ) +void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int fline ) { char *b; int i; @@ -123,6 +123,8 @@ void free_cell( struct cell* dead_cell ) struct totag_elem *tt, *foo; struct tm_callback *cbs, *cbs_tmp; + LM_WARN("===== freeing transaction %p from %s:%u\n", dead_cell, fname, fline); + release_cell_lock( dead_cell ); if (unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0); diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index db35212..9340e5b 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -552,7 +552,10 @@ struct s_table* tm_get_table(void); struct s_table* init_hash_table(void); void free_hash_table(void); -void free_cell( struct cell* dead_cell ); + +void free_cell_helper( struct cell* dead_cell, const char *fname, unsigned int fline); +#define free_cell(t) free_cell_helper((t), __FILE__, __LINE__) + struct cell* build_cell( struct sip_msg* p_msg ); #ifdef TM_HASH_STATS

9 years

git:4.3:ad6916e6: core: clist - restet prev/next when removing from clist slot

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: ad6916e60745da509cc74b8a4b576d8530b73361 URL: https://github.com/kamailio/kamailio/commit/ad6916e60745da509cc74b8a4b576d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T11:49:16+01:00 core: clist - restet prev/next when removing from clist slot (cherry picked from commit 0fbcca38574139f1cd8ba7506ee5e204be5f2da7) --- Modified: clist.h --- Diff: https://github.com/kamailio/kamailio/commit/ad6916e60745da509cc74b8a4b576d8… Patch: https://github.com/kamailio/kamailio/commit/ad6916e60745da509cc74b8a4b576d8… --- diff --git a/clist.h b/clist.h index 2f1f8b5..2b796e6 100644 --- a/clist.h +++ b/clist.h @@ -87,7 +87,9 @@ #define clist_rm_sublist(s, e, next, prev) \ do{\ (s)->prev->next=(e)->next; \ - (e)->next->prev=(s)->prev ; \ + (e)->next->prev=(s)->prev; \ + (s)->prev=NULL; \ + (e)->next=NULL; \ }while(0)

9 years

git:4.3:213abc43: set the log_prefix buffer size to 1024b

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 213abc43fa2b3ff8fc8ab4db1859cb79298e201a URL: https://github.com/kamailio/kamailio/commit/213abc43fa2b3ff8fc8ab4db1859cb7… Author: Tristan MahÃ© <gled(a)remote-shell.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T11:49:03+01:00 set the log_prefix buffer size to 1024b (cherry picked from commit 439623667d6ea5cf9dec30033df94965213e8494) --- Modified: dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/213abc43fa2b3ff8fc8ab4db1859cb7… Patch: https://github.com/kamailio/kamailio/commit/213abc43fa2b3ff8fc8ab4db1859cb7… --- diff --git a/dprint.c b/dprint.c index 71b89e6..abf0211 100644 --- a/dprint.c +++ b/dprint.c @@ -366,7 +366,7 @@ void dprint_color_update(int level, char f, char b) str *log_prefix_val = NULL; static pv_elem_t *log_prefix_pvs = NULL; -#define LOG_PREFIX_SIZE 128 +#define LOG_PREFIX_SIZE 1024 static char log_prefix_buf[LOG_PREFIX_SIZE]; static str log_prefix_str;

9 years

git:master:5e9f144c: core: print runtime dir in log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e9f144ca214f43b2fd01917fb4983716c8916f8 URL: https://github.com/kamailio/kamailio/commit/5e9f144ca214f43b2fd01917fb49837… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T11:43:53+01:00 core: print runtime dir in log message - do logging to syslog, along with stderror for runtime dir related errors --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/5e9f144ca214f43b2fd01917fb49837… Patch: https://github.com/kamailio/kamailio/commit/5e9f144ca214f43b2fd01917fb49837… --- diff --git a/main.c b/main.c index a4407fa..c9a6a12 100644 --- a/main.c +++ b/main.c @@ -2358,12 +2358,14 @@ int main(int argc, char** argv) /* create runtime dir if doesn't exist */ if (stat(runtime_dir, &st) == -1) { if(mkdir(runtime_dir, 0700) == -1) { - fprintf(stderr, "failed to create runtime dir\n"); + LM_ERR("failed to create runtime dir %s\n", runtime_dir); + fprintf(stderr, "failed to create runtime dir %s\n", runtime_dir); goto error; } if(sock_uid!=-1 || sock_gid!=-1) { if(chown(runtime_dir, sock_uid, sock_gid) == -1) { - fprintf(stderr, "failed to change owner of runtime dir\n"); + LM_ERR("failed to change owner of runtime dir %s\n", runtime_dir); + fprintf(stderr, "failed to change owner of runtime dir %s\n", runtime_dir); goto error; } }

9 years

← Newer
1
...
18
19
20
21
22
23
24
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015