sr-dev November 2011

sr-dev@lists.kamailio.org

31 participants
340 discussions

git:3.2: core: store pid per sip message
by Daniel-Constantin Mierla 22 Nov '11

22 Nov '11

Module: sip-router Branch: 3.2 Commit: 4eadcbaa1db1157ad7b967b7177200a937696891 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4eadcba… 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) --- 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 7f18eb1..31582f5 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -260,6 +260,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 183d03b..c701dd8 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;

1 0

git:3.2: diversion: user anchor_lump2 to insert diversion header
by Daniel-Constantin Mierla 22 Nov '11

22 Nov '11

Module: sip-router Branch: 3.2 Commit: 5d46e1bb59fb39bd539ace1840d502b14225c924 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d46e1b… 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) --- 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)) {

1 0

git:3.2: core: at shutdown, first call the destroy module functions then free module exports structure
by Daniel-Constantin Mierla 22 Nov '11

22 Nov '11

Module: sip-router Branch: 3.2 Commit: d3408c64b6c07806a51e1e72589f8e124c8c651c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3408c6… 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) --- sr_module.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sr_module.c b/sr_module.c index 564900c..7b0d85d 100644 --- a/sr_module.c +++ b/sr_module.c @@ -775,12 +775,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; }

1 0

git:3.2: ndb_redis: docs update - server parameter type is string
by Daniel-Constantin Mierla 22 Nov '11

22 Nov '11

Module: sip-router Branch: 3.2 Commit: 2ffbba2004371c1136157bcf8ba60fab787de9ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ffbba2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 15 09:27:46 2011 +0100 ndb_redis: docs update - server parameter type is string - more details to server parameters to show that many redis servers can be used (cherry picked from commit da07d2a093a4aec9673ae2e5a0bd4bccb9d3cd70) --- modules/ndb_redis/README | 17 +++++++++++------ modules/ndb_redis/doc/ndb_redis_admin.xml | 11 +++++++++-- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/modules/ndb_redis/README b/modules/ndb_redis/README index ad30b57..d678e65 100644 --- a/modules/ndb_redis/README +++ b/modules/ndb_redis/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2011 asipto.com + Copyright � 2011 asipto.com __________________________________________________________________ Table of Contents @@ -25,7 +25,7 @@ Daniel-Constantin Mierla 3. Parameters - 3.1. server (int) + 3.1. server (str) 4. Functions @@ -48,7 +48,7 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. server (int) + 3.1. server (str) 4. Functions @@ -81,9 +81,9 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. server (int) + 3.1. server (str) -3.1. server (int) +3.1. server (str) Specify the details to connect to REDIS server. It takes a list of attribute=value separated by semicolon, the attributes can be name, @@ -92,18 +92,23 @@ Chapter 1. Admin Guide REDIS server. db is the DB number to use (defaults to 0 if not specified). + You can set this parameter many times, in case you want to connect to + many REDIS servers, just give different attributes and use the specific + server name when querying the REDIS instance. + Default value is NULL. Example 1.1. Set server parameter ... modparam("ndb_redis", "server", "name=srvN;addr=127.0.0.1;port=6379;db=1") +modparam("ndb_redis", "server", "name=srvX;addr=127.0.0.2;port=6379;db=4") ... 4. Functions 4.1. redis_cmd(srvname, command, replyid) -4.1. redis_cmd(srvname, command, replyid) +4.1. redis_cmd(srvname, command, replyid) Send a command to REDIS server identified by srvname. The reply will be stored in a local continer identified by replyid. All the parameters diff --git a/modules/ndb_redis/doc/ndb_redis_admin.xml b/modules/ndb_redis/doc/ndb_redis_admin.xml index c6bfb8f..02e3ac7 100644 --- a/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -60,13 +60,19 @@ <section> <title>Parameters</title> <section> - <title><varname>server</varname> (int)</title> + <title><varname>server</varname> (str)</title> <para> Specify the details to connect to REDIS server. It takes a list of attribute=value separated by semicolon, the attributes can be name, addr, port and db. Name is a generic identifier to be used with module functions. addr and port are the IP address and the port to - connect to REDIS server. db is the DB number to use (defaults to 0 if not specified). + connect to REDIS server. db is the DB number to use (defaults to 0 if + not specified). + </para> + <para> + You can set this parameter many times, in case you want to connect to + many REDIS servers, just give different attributes and use the specific + server name when querying the REDIS instance. </para> <para> <emphasis> @@ -78,6 +84,7 @@ <programlisting format="linespecific"> ... modparam("ndb_redis", "server", "name=srvN;addr=127.0.0.1;port=6379;db=1") +modparam("ndb_redis", "server", "name=srvX;addr=127.0.0.2;port=6379;db=4") ... </programlisting> </example>

1 0

git:3.2: tm: free path if set first time in a branch route
by Daniel-Constantin Mierla 22 Nov '11

22 Nov '11

Module: sip-router Branch: 3.2 Commit: 609b0aa86624416828c0c117e0cfdbeb7643bcb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=609b0aa… 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) --- 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 210601d..26bf7f3 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -374,6 +374,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) */

1 0

git:master: dialog(k): destroy dlg structure first time ref counter gets to 0
by Daniel-Constantin Mierla 22 Nov '11

22 Nov '11

Module: sip-router Branch: master Commit: 5949e296b7bafab42a4ac3261f453f286d98e41c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5949e29… 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 --- 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 a09e78f..0341143 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);\

1 0

git:master: pv: use msg pid to check the integrity of cached time
by Daniel-Constantin Mierla 22 Nov '11

22 Nov '11

Module: sip-router Branch: master Commit: cc33486a8c17ae2cb4cbb5fce42f7a73646cd3c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc33486… 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 --- 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 72f1134..ad7dd2c 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -36,13 +36,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;

1 0

[tracker] Comment added: segfault in tm/timers?
by sip-router 22 Nov '11

22 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#179 - segfault in tm/timers? User who did this - Bayan Towfiq (btowfiq) ---------- Seems to be corrupted -- Can these errors shed any light? ERROR: slow timer too slow: overflow (44155 - 43132 = 1023) This was something very random and i'm not sure if i'll be able to reproduce it. (gdb) p*cbp Cannot access memory at address 0x732d336c6576656c (gdb) x/16xg cbp 0x732d336c6576656c: Cannot access memory at address 0x732d336c6576656c (gdb) x/16ag cbp 0x732d336c6576656c: Cannot access memory at address 0x732d336c6576656c (gdb) x cb_lst->first Cannot access memory at address 0x0 (gdb) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=179#comment380 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.

1 0

[tracker] Comment added: segfault in tm/timers?
by sip-router 21 Nov '11

21 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#179 - segfault in tm/timers? User who did this - Ovidiu Sas (osas) ---------- Take a look at this gdb tutorial: http://www.delorie.com/gnu/docs/gdb/gdb_56.html Try to print the content of the memory before and after the cbp and see if there is something that you recognize there: x/16xg cbp x/16ag cbp also, check the value of cb_lst->first to see if it's valid. Most likely the memory was corrupted by another call and this particular call just crashed the server. If this is the case, the core dump is not very useful because the crash doesn't capture the cause, only the effect :( ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=179#comment379 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.

1 0

[tracker] Comment added: Double Free -- Crash/Coredump and possible security vulnerability
by sip-router 21 Nov '11

21 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#173 - Double Free -- Crash/Coredump and possible security vulnerability User who did this - Daniel-Constantin Mierla (miconda) ---------- Also, I just pushed in a tmp branch (tmp/dlgnewref) a patch refactoring the dlg structure reference counting, mainly in relation with TM module. The commit link is: * http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9ba… This approach should be safer for any future development of tm, as there is no more storage of a dialog module specific pointer inside TM structures. Also, dialog structures destroyed for various reasons, will be no longer found by tm callbacks or timer functions, thus no more risk of segmentation fault. Testing of this new version will appreciated. Based on results and feedback, it will be merged into master branch and backported -- there is no change in config functionality or exported API of dialog module -- just internal refactoring. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=173#comment378 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.

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2011