sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:master:b846c216: Merge pull request #335 from doublec/tsilo_pointer_comparison

by Federico Cabiddu

Module: kamailio Branch: master Commit: b846c216f5244049463c49ccefaaadb1c2bcfb10 URL: https://github.com/kamailio/kamailio/commit/b846c216f5244049463c49ccefaaadb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-09-23T14:08:10+02:00 Merge pull request #335 from doublec/tsilo_pointer_comparison tsilo: Fix pointer comparison in ts_set_tm_callbacks --- Modified: modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/b846c216f5244049463c49ccefaaadb… Patch: https://github.com/kamailio/kamailio/commit/b846c216f5244049463c49ccefaaadb… --- diff --git a/modules/tsilo/ts_handlers.c b/modules/tsilo/ts_handlers.c index 7cf7970..0df6358 100644 --- a/modules/tsilo/ts_handlers.c +++ b/modules/tsilo/ts_handlers.c @@ -40,14 +40,11 @@ int ts_set_tm_callbacks(struct cell *t, sip_msg_t *req, ts_transaction_t *ts) if(t==NULL) return -1; - if ( (ts_clone=clone_ts_transaction(ts)) < 0 ) { + if ( (ts_clone=clone_ts_transaction(ts)) == NULL ) { LM_ERR("failed to clone transaction\n"); return -1; } - if (ts_clone == NULL) { - LM_ERR("transaction clone null\n"); - } if ( _tmb.register_tmcb( req, t,TMCB_DESTROY, ts_onreply, (void*)ts_clone, free_ts_transaction)<0 ) { LM_ERR("failed to register TMCB for transaction %d:%d\n", t->hash_index, t->label);

9 years, 2 months

git:master:e304f9d8: tsilo: Fix pointer comparison in ts_set_tm_callbacks

by Chris Double

Module: kamailio Branch: master Commit: e304f9d8d4cc16a3b6cca1cdd10dff6d0a18d955 URL: https://github.com/kamailio/kamailio/commit/e304f9d8d4cc16a3b6cca1cdd10dff6… Author: Chris Double <chris.double(a)double.co.nz> Committer: Chris Double <chris.double(a)double.co.nz> Date: 2015-09-23T21:20:27+12:00 tsilo: Fix pointer comparison in ts_set_tm_callbacks - Fix cloned ts_transaction pointer comparison to check for NULL rather than less than zero. The latter doesn't make sense for an allocated pointer. --- Modified: modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/e304f9d8d4cc16a3b6cca1cdd10dff6… Patch: https://github.com/kamailio/kamailio/commit/e304f9d8d4cc16a3b6cca1cdd10dff6… --- diff --git a/modules/tsilo/ts_handlers.c b/modules/tsilo/ts_handlers.c index 7cf7970..0df6358 100644 --- a/modules/tsilo/ts_handlers.c +++ b/modules/tsilo/ts_handlers.c @@ -40,14 +40,11 @@ int ts_set_tm_callbacks(struct cell *t, sip_msg_t *req, ts_transaction_t *ts) if(t==NULL) return -1; - if ( (ts_clone=clone_ts_transaction(ts)) < 0 ) { + if ( (ts_clone=clone_ts_transaction(ts)) == NULL ) { LM_ERR("failed to clone transaction\n"); return -1; } - if (ts_clone == NULL) { - LM_ERR("transaction clone null\n"); - } if ( _tmb.register_tmcb( req, t,TMCB_DESTROY, ts_onreply, (void*)ts_clone, free_ts_transaction)<0 ) { LM_ERR("failed to register TMCB for transaction %d:%d\n", t->hash_index, t->label);

9 years, 2 months

[kamailio] tsilo: Fix pointer comparison in ts_set_tm_callbacks (#335)

by Chris Double

- Fix cloned ts_transaction pointer comparison to check for NULL rather than less than zero. The latter doesn't make sense for an allocated pointer. The commit also ensure that the function returns with an error in the case of a NULL cloned pointer so that it's not later dereferenced. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/335 -- Commit Summary -- * tsilo: Fix pointer comparison in ts_set_tm_callbacks -- File Changes -- M modules/tsilo/ts_handlers.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/335.patch https://github.com/kamailio/kamailio/pull/335.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/335

9 years, 2 months

git:master:1d9b099e: mem: f_malloc - don't use references to pointers of nxt_free field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1d9b099e3b11dc8f49737f7986b5fea0dc087ccc URL: https://github.com/kamailio/kamailio/commit/1d9b099e3b11dc8f49737f7986b5fea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T13:56:20+02:00 mem: f_malloc - don't use references to pointers of nxt_free field --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/1d9b099e3b11dc8f49737f7986b5fea… Patch: https://github.com/kamailio/kamailio/commit/1d9b099e3b11dc8f49737f7986b5fea… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 861cfd9..55c48ec 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -442,7 +442,7 @@ void* fm_malloc(void* qmp, unsigned long size) #endif { struct fm_block* qm; - struct fm_frag** f; + struct fm_frag* f; struct fm_frag* frag; int hash; @@ -463,8 +463,8 @@ void* fm_malloc(void* qmp, unsigned long size) hash=fm_bmp_first_set(qm, GET_HASH(size)); if (likely(hash>=0)){ if (likely(hash<=F_MALLOC_OPTIMIZE/ROUNDTO)) { /* return first match */ - f=&(qm->free_hash[hash].first); - if(likely(*f)) goto found; + f=qm->free_hash[hash].first; + if(likely(f && f!=qm->last_frag)) goto found; #ifdef DBG_F_MALLOC MDBG(" block %p hash %d empty but no. is %lu\n", qm, hash, qm->free_hash[hash].no); @@ -482,17 +482,17 @@ void* fm_malloc(void* qmp, unsigned long size) hash buckets. */ do { - for(f=&(qm->free_hash[hash].first);(*f); f=&((*f)->u.nxt_free)) - if ((*f)->size>=size) goto found; + for(f=qm->free_hash[hash].first; f && f!=qm->last_frag; f=f->u.nxt_free) + if (f->size>=size) goto found; hash++; /* try in next hash cell */ }while((hash < F_HASH_SIZE) && ((hash=fm_bmp_first_set(qm, hash)) >= 0)); } #else /* F_MALLOC_HASH_BITMAP */ for(hash=GET_HASH(size);hash<F_HASH_SIZE;hash++){ - f=&(qm->free_hash[hash].first); - for(;(*f); f=&((*f)->u.nxt_free)) - if ((*f)->size>=size) goto found; + f=qm->free_hash[hash].first; + for(;f && f!=qm->last_frag; f=f->u.nxt_free) + if (f->size>=size) goto found; /* try in a bigger bucket */ } #endif /* F_MALLOC_HASH_BITMAP */ @@ -507,7 +507,7 @@ void* fm_malloc(void* qmp, unsigned long size) found: /* we found it!*/ /* detach it from the free list*/ - frag=*f; + frag=f; fm_extract_free(qm, frag); /*see if use full frag or split it in two*/

9 years, 2 months

more Kamailio into RTC Quickstart

by Daniel Pocock

I've put the DocBook source code of the RTC Quickstart guide onto Github. It currently includes some basic information about Kamailio, is there anybody who would like to help expand it? http://rtcquickstart.org/guide/multi/sip-proxy-kamailio.html https://github.com/opentelecoms-org/RTCQuickstartGuide/blob/master/sip-prox… The goal of this document is to show people things that they can do to set up federated SIP just using packages on the Linux distributions. A lot of things like firewall, DNS and certificate creation are covered in earlier chapters too, so the Kamailio section doesn't have to repeat any of that. Regards, Daniel

9 years, 2 months

update_sock_struct_from_ip() [forward.h] question

by Camille Oudot

Hi, I was investigating an issue we had on siptrace with homer: the destination port of all SIP responses to our websocket SIP client was always set to 5060 in the HEP headers of the traced packets sent to Homer, but the websocket client is not actually communicating on port 5060. When I set the global config option `force_rport=yes`, the trace dst port started to be correct. Digging further, I found this macro in forward.h: 1 /* use src_ip, port=src_port if rport, via port if via port, 5060 otherwise */ 2 #define update_sock_struct_from_ip( to, msg ) \ 3 init_su((to), &(msg)->rcv.src_ip, \ 4 (((msg)->via1->rport)|| \ 5 (((msg)->msg_flags|global_req_flags)&FL_FORCE_RPORT))? \ 6 (msg)->rcv.src_port: \ 7 ((msg)->via1->port)?(msg)->via1->port: SIP_PORT ) And I suspect that to conform to the description, line 4 should be: 4 (((msg)->rcv.src_port)|| \ instead. This way, I shouldn't need to set `force_rport=yes` to have the tm callbacks containing the correct response dst port. Any thoughts on this? -- Camille

9 years, 2 months

git:master:92c376db: tm: t_suspend() skip suspending if a final response was sent out for transaction already

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 92c376dbeb6ee515a80537c91014972ada4a5f34 URL: https://github.com/kamailio/kamailio/commit/92c376dbeb6ee515a80537c91014972… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T13:03:15+02:00 tm: t_suspend() skip suspending if a final response was sent out for transaction already --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/92c376dbeb6ee515a80537c91014972… Patch: https://github.com/kamailio/kamailio/commit/92c376dbeb6ee515a80537c91014972… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index e657959..dc783c9 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -74,6 +74,11 @@ int t_suspend(struct sip_msg *msg, ser_error = E_CANCELED; return 1; } + if (t->uas.status >= 200) { + LM_DBG("trasaction sent out a final response already - %d\n", + t->uas.status); + return -3; + } if (msg->first_line.type != SIP_REPLY) { /* send a 100 Trying reply, because the INVITE processing

9 years, 2 months

git:master:9451625f: tsilo: ts_append_to() check if transation is active before adding new branches

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9451625ff8cc7e02abc2c6cf95572bff9c086d20 URL: https://github.com/kamailio/kamailio/commit/9451625ff8cc7e02abc2c6cf95572bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T12:59:52+02:00 tsilo: ts_append_to() check if transation is active before adding new branches --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/9451625ff8cc7e02abc2c6cf95572bf… Patch: https://github.com/kamailio/kamailio/commit/9451625ff8cc7e02abc2c6cf95572bf… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index 7c43534..1079632 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -81,6 +81,16 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * tindex, tlabel); return -1; } + if (t->flags & T_CANCELED) { + LM_DBG("trasaction [%u:%u] was cancelled\n", + tindex, tlabel); + return -2; + } + if (t->uas.status >= 200) { + LM_DBG("trasaction [%u:%u] sent out a final response already - %d\n", + tindex, tlabel, t->uas.status); + return -3; + } orig_msg = t->uas.request; @@ -91,7 +101,7 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * } if(ret != 1) { LM_DBG("transaction %u:%u: error updating dset (%d)\n", tindex, tlabel, ret); - return -1; + return -4; } return _tmb.t_append_branches();

9 years, 2 months

git:master:ef44e5b8: tm: more debug info when freeing a transaction

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ef44e5b8b4292f4c4ff3a77e46bbb33e5e0f077f URL: https://github.com/kamailio/kamailio/commit/ef44e5b8b4292f4c4ff3a77e46bbb33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T12:43:41+02:00 tm: more debug info when freeing a transaction - attempt to catch a double free --- Modified: modules/tm/h_table.c Modified: modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/ef44e5b8b4292f4c4ff3a77e46bbb33… Patch: https://github.com/kamailio/kamailio/commit/ef44e5b8b4292f4c4ff3a77e46bbb33… --- 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, 2 months

git:master:ca61f783: mem: proper size printed in log message for init of shm

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ca61f783097a0a947fc3ce1da100b14b3acada6b URL: https://github.com/kamailio/kamailio/commit/ca61f783097a0a947fc3ce1da100b14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T12:34:01+02:00 mem: proper size printed in log message for init of shm --- Modified: mem/f_malloc.c Modified: mem/q_malloc.c Modified: mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/ca61f783097a0a947fc3ce1da100b14… Patch: https://github.com/kamailio/kamailio/commit/ca61f783097a0a947fc3ce1da100b14… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index e94703a..861cfd9 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -1155,7 +1155,7 @@ int fm_malloc_init_shm_manager(void) if (_fm_shm_block==0){ LOG(L_CRIT, "could not initialize fm shm memory pool\n"); fprintf(stderr, "Too much fm shm memory demanded: %ld bytes\n", - pkg_mem_size); + shm_mem_size); return -1; } diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 518a511..0c23639 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -1100,7 +1100,7 @@ int qm_malloc_init_shm_manager(void) if (_qm_shm_block==0){ LOG(L_CRIT, "could not initialize qm shm memory pool\n"); fprintf(stderr, "Too much qm shm memory demanded: %ld bytes\n", - pkg_mem_size); + shm_mem_size); return -1; } diff --git a/mem/tlsf_malloc.c b/mem/tlsf_malloc.c index 9b9dde4..edf6a69 100644 --- a/mem/tlsf_malloc.c +++ b/mem/tlsf_malloc.c @@ -1438,7 +1438,7 @@ int tlsf_malloc_init_shm_manager(void) } else { LOG(L_CRIT, "could not initialize tlsf shm memory pool\n"); fprintf(stderr, "Too much tlsf shm memory demanded: %ld bytes\n", - pkg_mem_size); + shm_mem_size); return -1; }

9 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015