sr-dev November 2011

sr-dev@lists.kamailio.org

31 participants
340 discussions

git:3.1: dialog(k): destroy dlg structure first time ref counter gets to 0

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: cfb85a6064592f491edf17bf6500618f279aaa05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfb85a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 22 11:30:56 2011 +0100 dialog(k): destroy dlg structure first time ref counter gets to 0 - reported by Bayan Towfix, FS#173 (cherry picked from commit 5949e296b7bafab42a4ac3261f453f286d98e41c) (cherry picked from commit ae248a3744ab06a61c962415a8ac55a9c53fba82) --- modules_k/dialog/dlg_hash.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 03754c0..9242bbc 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -92,6 +92,11 @@ struct dlg_table *d_table = 0; */ #define unref_dlg_unsafe(_dlg,_cnt,_d_entry) \ do { \ + if((_dlg)->ref <= 0 ) { \ + LM_WARN("invalid unref'ing dlg %p with ref %d by %d\n",\ + (_dlg),(_dlg)->ref,(_cnt));\ + break; \ + } \ (_dlg)->ref -= (_cnt); \ LM_DBG("unref dlg %p with %d -> %d\n",\ (_dlg),(_cnt),(_dlg)->ref);\

13 years, 1 month

git:3.1: textops(k): free only pkg body lumps for set_body()

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 2ce5ff9c1718cc14e34cc6e19a85a30edf3d3e49 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ce5ff9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 24 15:30:15 2011 +0100 textops(k): free only pkg body lumps for set_body() - if set_body() is used in failure_route, it should not destroy completely the lumps cloned in tm, just ignore them and free the ones added in failure_route before execution of itself - reported by Brandon Armstead, FS#181 (cherry picked from commit c22a3ec7366ad1a3cc0b5e8229fbabe2c179cca1) (cherry picked from commit ec8535487fd06e5de7b5efa218f764a6e850b42b) --- modules_k/textops/textops.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index 9198f77..e02f441 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -1198,7 +1198,7 @@ static int set_body_f(struct sip_msg* msg, char* p1, char* p2) return -1; } - free_lump_list(msg->body_lumps); + del_nonshm_lump( &(msg->body_lumps) ); msg->body_lumps = NULL; if (msg->content_length)

13 years, 1 month

git:3.1: core: save and restore branch_iterator in print_dset

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 12bf863b63b6ad66f958c350393bc90b9e63c586 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12bf863… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 24 12:56:28 2011 +0100 core: save and restore branch_iterator in print_dset - safe usage in branch_route where branch_interator is used to add the new brnaches, but some variables can change it if used in config branch_route - closes FS#182, reported by Pawel Sternal (cherry picked from commit c5f101dfac9a50f428e3452893c402d8b1e0400b) (cherry picked from commit d44956c4f3d5fb98bc2af42d8718a420d624d259) --- dset.c | 21 ++++++++++++++++++++- dset.h | 8 ++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dset.c b/dset.c index 1e5c9e7..f4223dc 100644 --- a/dset.c +++ b/dset.c @@ -191,11 +191,21 @@ void init_branch_iterator(void) branch_iterator = 0; } +/** + * return the value of current branch iterator + */ int get_branch_iterator(void) { return branch_iterator; } +/** + * set the value of current branch interator + */ +void set_branch_iterator(int n) +{ + branch_iterator = n; +} /** \brief Get a branch from the destination set @@ -371,6 +381,7 @@ char* print_dset(struct sip_msg* msg, int* len) qvalue_t q; str uri; char* p, *qbuf; + int crt_branch; static char dset[MAX_REDIRECTION_LEN]; if (msg->new_uri.s) { @@ -384,6 +395,9 @@ char* print_dset(struct sip_msg* msg, int* len) *len = 0; } + /* backup current branch index to restore it later */ + crt_branch = get_branch_iterator(); + init_branch_iterator(); while ((uri.s = next_branch(&uri.len, &q, 0, 0, 0, 0))) { cnt++; @@ -399,7 +413,7 @@ char* print_dset(struct sip_msg* msg, int* len) if (*len + 1 > MAX_REDIRECTION_LEN) { LOG(L_ERR, "ERROR: redirection buffer length exceed\n"); - return 0; + goto error; } memcpy(dset, CONTACT, CONTACT_LEN); @@ -450,7 +464,12 @@ char* print_dset(struct sip_msg* msg, int* len) } memcpy(p, CRLF " ", CRLF_LEN + 1); + set_branch_iterator(crt_branch); return dset; + +error: + set_branch_iterator(crt_branch); + return 0; } diff --git a/dset.h b/dset.h index 6f9f067..dfc3083 100644 --- a/dset.h +++ b/dset.h @@ -107,15 +107,19 @@ static inline int ser_append_branch(struct sip_msg* msg, /*! \brief - * Iterate through the list of transaction branches + * Init the index to iterate through the list of transaction branches */ void init_branch_iterator(void); /*! \brief - * Return branch iterator position + * Return branch iterator position */ int get_branch_iterator(void); +/*! \brief + * Set branch iterator position + */ +void set_branch_iterator(int n); /*! \brief Get the next branch in the current transaction. * @return pointer to the uri of the next branch (which the length written in

13 years, 1 month

git:3.1: pv: use msg pid to check the integrity of cached time

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: e996c929c4bbb65d42264711e156b8f16f7ee05f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e996c92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 22 11:30:02 2011 +0100 pv: use msg pid to check the integrity of cached time - safer when dealing with async or failure processing (cherry picked from commit cc33486a8c17ae2cb4cbb5fce42f7a73646cd3c1) (cherry picked from commit 24f138c9c39ac6475347ed76e311e1759d4d8531) --- modules_k/pv/pv_time.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index 399170c..6a4393d 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -35,13 +35,16 @@ #include "pv_time.h" static unsigned int _pv_msg_id = 0; +static int _pv_msg_pid = 0; static time_t _pv_msg_tm = 0; + static int pv_update_time(struct sip_msg *msg, time_t *t) { - if(_pv_msg_id != msg->id || _pv_msg_tm==0) + if(_pv_msg_id != msg->id || _pv_msg_pid != msg->pid || _pv_msg_tm==0) { _pv_msg_tm = time(NULL); _pv_msg_id = msg->id; + _pv_msg_pid = msg->pid; if(t!=NULL) *t=_pv_msg_tm;

13 years, 1 month

git:3.1: core: store pid per sip message

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 0e3d771e8085f61289367eddcd5e2defaf5e6a16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e3d771… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 18 00:08:44 2011 +0100 core: store pid per sip message - when a sip message is received, store pid in sip_msg_t structure - help identifying same sip msg across many processes (cherry picked from commit 76f7847fe6245e06aa88d104b60245c7c03b04f0) (cherry picked from commit 4eadcbaa1db1157ad7b967b7177200a937696891) --- parser/msg_parser.h | 1 + receive.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 8ef60ca..5662b7e 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -257,6 +257,7 @@ typedef struct msg_body { /*! \brief The SIP message */ typedef struct sip_msg { unsigned int id; /*!< message id, unique/process*/ + int pid; /*!< process id */ snd_flags_t fwd_send_flags; /*!< send flags for forwarding */ snd_flags_t rpl_send_flags; /*!< send flags for replies */ struct msg_start first_line; /*!< Message first line */ diff --git a/receive.c b/receive.c index 7f49fdc..60e1f65 100644 --- a/receive.c +++ b/receive.c @@ -135,6 +135,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* buf[len]=0; */ /* WARNING: zero term removed! */ msg->rcv=*rcv_info; msg->id=msg_no; + msg->pid=my_pid(); msg->set_global_address=default_global_address; msg->set_global_port=default_global_port;

13 years, 1 month

git:3.1: libkcore: set pid attribute for fake msg

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 261b22186f4f23a93a8fa6997d9c97bf121e2d96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=261b221… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 18 00:10:26 2011 +0100 libkcore: set pid attribute for fake msg (cherry picked from commit 950b1e52ed8a94462be17e206d6970fd13a41661) (cherry picked from commit addbd17723585197ea41c58904be1c4b6be2fe7d) --- lib/kcore/faked_msg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/kcore/faked_msg.c b/lib/kcore/faked_msg.c index 9a51723..efaba59 100644 --- a/lib/kcore/faked_msg.c +++ b/lib/kcore/faked_msg.c @@ -58,7 +58,8 @@ int faked_msg_init(void) struct sip_msg* faked_msg_next(void) { - _faked_msg.id=_faked_msg_no++; + _faked_msg.id = 1 + _faked_msg_no++; + _faked_msg.pid = my_pid(); clear_branches(); return &_faked_msg; }

13 years, 1 month

git:3.1: diversion: user anchor_lump2 to insert diversion header

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 2bf200fc6bb04499ce096dd1549674de3c1f8ee0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bf200f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 18 09:22:26 2011 +0100 diversion: user anchor_lump2 to insert diversion header - remove the caching of anchor, is not save across many processes, when handling diversion in request_route and failure_route (cherry picked from commit 55615d11ece77074ad779d1ad09361b1fd2b2bad) (cherry picked from commit 5d46e1bb59fb39bd539ace1840d502b14225c924) --- modules_k/diversion/diversion.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/modules_k/diversion/diversion.c b/modules_k/diversion/diversion.c index f9f2436..06f3c43 100644 --- a/modules_k/diversion/diversion.c +++ b/modules_k/diversion/diversion.c @@ -104,15 +104,10 @@ static int mod_init(void) static inline int add_diversion_helper(struct sip_msg* msg, str* s) { char *ptr; + int is_ref; - static struct lump* anchor = 0; - static unsigned int msg_id = 0; + struct lump* anchor = 0; - if (msg_id != msg->id) { - msg_id = msg->id; - anchor = 0; - } - if (!msg->diversion && parse_headers(msg, HDR_DIVERSION_F, 0) == -1) { LM_ERR("header parsing failed\n"); return -1; @@ -126,12 +121,10 @@ static inline int add_diversion_helper(struct sip_msg* msg, str* s) ptr = msg->unparsed; } + anchor = anchor_lump2(msg, ptr - msg->buf, 0, 0, &is_ref); if (!anchor) { - anchor = anchor_lump(msg, ptr - msg->buf, 0, 0); - if (!anchor) { - LM_ERR("can't get anchor\n"); - return -2; - } + LM_ERR("can't get anchor\n"); + return -2; } if (!insert_new_lump_before(anchor, s->s, s->len, 0)) {

13 years, 1 month

git:3.1: tm: free path if set first time in a branch route

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 0880578372053b2196d7d4ef21f3ef924b5bd2c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0880578… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 17 23:14:32 2011 +0100 tm: free path if set first time in a branch route (cherry picked from commit 7b612d999e061d05b60054e7749052d0abdf514c) (cherry picked from commit 609b0aa86624416828c0c117e0cfdbeb7643bcb8) --- modules/tm/t_fwd.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index aea7598..b874c9b 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -377,6 +377,10 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, ignored) */ next_hop=&i_req->dst_uri; } + /* no path vector initially, but now is set after branch route and + * callbacks execution */ + if(i_req->path_vec.s!=0 && free_path==0) + free_path=1; }else{ /* no branch route and no TMCB_REQUEST_FWDED callback => set msg uri and path to the new values (if needed) */

13 years, 1 month

git:3.1: core: at shutdown, first call the destroy module functions then free module exports structure

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 57127690357878a7d66642362506f0aaa865f9b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5712769… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 16 07:50:42 2011 +0100 core: at shutdown, first call the destroy module functions then free module exports structure - some modules may need access to other modules at shut down - reported by Juha Heinanen (cherry picked from commit 2396dde7230e04f853e6936cfff9059661c55635) (cherry picked from commit d3408c64b6c07806a51e1e72589f8e124c8c651c) --- sr_module.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sr_module.c b/sr_module.c index db6a95e..28fe0c7 100644 --- a/sr_module.c +++ b/sr_module.c @@ -725,12 +725,19 @@ void destroy_modules() { struct sr_module* t, *foo; + /* call first destroy function from each module */ t=modules; while(t) { foo=t->next; if (t->exports.destroy_f){ t->exports.destroy_f(); } + t=foo; + } + /* free module exports structures */ + t=modules; + while(t) { + foo=t->next; pkg_free(t); t=foo; }

13 years, 1 month

[tracker] Comment added: tls module error on initialization when used together with the dialog module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#183 - tls module error on initialization when used together with the dialog module User who did this - Øyvind Kolbu (kolbu) ---------- Tested a bit more, and it crashes with other modules than dialog as well. This time I tested with sqlops. Thus it seems it is a generic problem when combining the db_postgres and tls modules. I don't have any databases which allow non-ssl connections, but can probably get one, if needed to test more. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=183#comment422 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.

13 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2011