sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

git:master: tm: fix the multiple t_suspend+t_continue scenario

by Miklos Tirpak

Module: sip-router Branch: master Commit: 9ae149ba25ee6467da1d95dd435995b9a59166a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ae149b… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Mar 29 10:45:02 2012 +0200 tm: fix the multiple t_suspend+t_continue scenario When t_suspend() was called in the route block executed by t_continue(), the function did not recognize the newly added blind UAC and claimed that there is no new branch added. This resulted in the transaction being killed by t_continue(). --- modules/tm/t_suspend.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 578d6b0..e6e2e35 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -210,9 +210,7 @@ int t_continue(unsigned int hash_index, unsigned int label, branch < t->nr_of_outgoings; branch++ ) { - if ((t->uac[branch].request.buffer != NULL) - && (t->uac[branch].last_received < 200) - ) + if (t->uac[branch].last_received < 200) break; }

12 years, 9 months

git:master: siptrace: new parameter to allow the option of doing delayed insert to db

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d85c6b9037f788971c9f47dc95ad94ea1ea92fd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d85c6b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 27 23:52:49 2012 +0200 siptrace: new parameter to allow the option of doing delayed insert to db - if 'trace_delayed' parameter is set to 1, insert to database table is done delayed, when the db server has support for it --- modules_k/siptrace/README | 30 ++++++++++++++---- modules_k/siptrace/doc/siptrace_admin.xml | 19 ++++++++++++ modules_k/siptrace/siptrace.c | 46 ++++++++++++++++++++++------ 3 files changed, 78 insertions(+), 17 deletions(-) diff --git a/modules_k/siptrace/README b/modules_k/siptrace/README index 7934f24..a35a9ce 100644 --- a/modules_k/siptrace/README +++ b/modules_k/siptrace/README @@ -16,9 +16,9 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2010 asipto.com + Copyright � 2010 asipto.com - Copyright © 2006 voice-system.ro + Copyright � 2006 voice-system.ro __________________________________________________________________ Table of Contents @@ -48,6 +48,7 @@ Daniel-Constantin Mierla 3.13. hep_mode_on (integer) 3.14. hep_version (integer) 3.15. hep_capture_id (integer) + 3.16. trace_delayed (integer) 4. Functions @@ -77,7 +78,8 @@ Daniel-Constantin Mierla 1.13. Set hep_mode_on parameter 1.14. Set hep_version parameter 1.15. Set hep_capture_id parameter - 1.16. sip_trace() usage + 1.16. Set trace_delayed parameter + 1.17. sip_trace() usage Chapter 1. Admin Guide @@ -106,6 +108,7 @@ Chapter 1. Admin Guide 3.13. hep_mode_on (integer) 3.14. hep_version (integer) 3.15. hep_capture_id (integer) + 3.16. trace_delayed (integer) 4. Functions @@ -174,6 +177,7 @@ Chapter 1. Admin Guide 3.13. hep_mode_on (integer) 3.14. hep_version (integer) 3.15. hep_capture_id (integer) + 3.16. trace_delayed (integer) 3.1. db_url (str) @@ -380,11 +384,23 @@ modparam("siptrace", "hep_version", 2) modparam("siptrace", "hep_capture_id", 234) ... +3.16. trace_delayed (integer) + + Use 'INSERT DELAYED' to store to database when it is available, instead + of 'INSERT'. + + Default value is 0 (off). + + Example 1.16. Set trace_delayed parameter +... +modparam("siptrace", "trace_delayed", 1) +... + 4. Functions 4.1. sip_trace() -4.1. sip_trace() +4.1. sip_trace() Store current processed SIP message in database. It is stored in the form prior applying chages made to it. @@ -392,7 +408,7 @@ modparam("siptrace", "hep_capture_id", 234) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.16. sip_trace() usage + Example 1.17. sip_trace() usage ... sip_trace(); ... @@ -401,7 +417,7 @@ sip_trace(); 5.1. sip_trace -5.1. sip_trace +5.1. sip_trace Name: sip_trace @@ -410,7 +426,7 @@ sip_trace(); + on + off The parameter is optional - if missing, the command will return the - status of the SIP message tracing (as string “on” or “off” ) + status of the SIP message tracing (as string "on" or "off" ) without changing anything. MI FIFO Command Format: diff --git a/modules_k/siptrace/doc/siptrace_admin.xml b/modules_k/siptrace/doc/siptrace_admin.xml index e6492e0..0d1e064 100644 --- a/modules_k/siptrace/doc/siptrace_admin.xml +++ b/modules_k/siptrace/doc/siptrace_admin.xml @@ -431,6 +431,25 @@ modparam("siptrace", "hep_capture_id", 234) </programlisting> </example> </section> + <section> + <title><varname>trace_delayed</varname> (integer)</title> + <para> + Use 'INSERT DELAYED' to store to database when it is available, + instead of 'INSERT'. + </para> + <para> + Default value is <emphasis>0 (off)</emphasis>. + </para> + <example> + <title>Set <varname>trace_delayed</varname> + parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "trace_delayed", 1) +... +</programlisting> + </example> + </section> </section> diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index b8df1e6..b54d893 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -129,6 +129,7 @@ int trace_on = 0; int trace_sl_acks = 1; int trace_to_database = 1; +int trace_delayed = 0; int hep_version = 1; int hep_capture_id = 1; @@ -198,7 +199,8 @@ static param_export_t params[] = { {"xheaders_read", INT_PARAM, &xheaders_read }, {"hep_mode_on", INT_PARAM, &hep_mode_on }, {"hep_version", INT_PARAM, &hep_version }, - {"hep_capture_id", INT_PARAM, &hep_capture_id }, + {"hep_capture_id", INT_PARAM, &hep_capture_id }, + {"trace_delayed", INT_PARAM, &trace_delayed }, {0, 0, 0} }; @@ -790,9 +792,17 @@ static int sip_trace_store_db(struct _siptrace_data *sto) db_vals[9].val.str_val.len = 0; LM_DBG("storing info...\n"); - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; + if(trace_delayed!=0 && db_funcs.insert_delayed!=NULL) + { + if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS)<0) { + LM_ERR("error storing trace\n"); + goto error; + } + } else { + if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { + LM_ERR("error storing trace\n"); + goto error; + } } #ifdef STATISTICS update_stat(sto->stat, 1); @@ -805,9 +815,17 @@ static int sip_trace_store_db(struct _siptrace_data *sto) db_vals[9].val.str_val = sto->avp_value.s; LM_DBG("storing info...\n"); - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; + if(trace_delayed!=0 && db_funcs.insert_delayed!=NULL) + { + if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS) < 0) { + LM_ERR("error storing trace\n"); + goto error; + } + } else { + if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { + LM_ERR("error storing trace\n"); + goto error; + } } sto->avp = search_next_avp(&sto->state, &sto->avp_value); @@ -815,9 +833,17 @@ static int sip_trace_store_db(struct _siptrace_data *sto) db_vals[9].val.str_val = sto->avp_value.s; LM_DBG("storing info...\n"); - if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { - LM_ERR("error storing trace\n"); - goto error; + if(trace_delayed!=0 && db_funcs.insert_delayed!=NULL) + { + if(db_funcs.insert_delayed(db_con, db_keys, db_vals, NR_KEYS) < 0) { + LM_ERR("error storing trace\n"); + goto error; + } + } else { + if(db_funcs.insert(db_con, db_keys, db_vals, NR_KEYS) < 0) { + LM_ERR("error storing trace\n"); + goto error; + } } sto->avp = search_next_avp(&sto->state, &sto->avp_value); }

12 years, 9 months

git:master: modules_k/presence Fixed DB Storage Modes

by Anca Vamanu

Module: sip-router Branch: master Commit: ae86ca3611398ce365ac4a1776ff0c7e95476bbe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae86ca3… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Feb 15 13:39:55 2012 +0200 modules_k/presence Fixed DB Storage Modes - removed db_mode and fallback2db parameters and added two new parameters: subs_db_mode and publ_cache - fixed and extended the storage modes for subscriptions: Memory Only, Write Through, Write Back, DB Only - publ_cache parameter offers the possibility to disable publish cache - some other fixes: - delete subscription only for 481 or 408 reply for Notify - call child_init also for main process (no shutdown DB flush was being performed) --- modules_k/presence/README | 190 ++++++----- modules_k/presence/bind_presence.c | 4 +- modules_k/presence/bind_presence.h | 4 +- modules_k/presence/doc/presence_admin.xml | 127 +++++--- modules_k/presence/doc/presence_devel.xml | 2 +- modules_k/presence/event_list.c | 2 +- modules_k/presence/event_list.h | 2 +- modules_k/presence/hash.c | 25 +-- modules_k/presence/hash.h | 2 +- modules_k/presence/notify.c | 253 ++++++--------- modules_k/presence/notify.h | 2 +- modules_k/presence/presence.c | 108 +++---- modules_k/presence/presence.h | 19 +- modules_k/presence/presentity.c | 30 +-- modules_k/presence/presentity.h | 2 +- modules_k/presence/publish.c | 52 ++-- modules_k/presence/publish.h | 2 +- modules_k/presence/subscribe.c | 495 +++++++++++++++++++---------- modules_k/presence/subscribe.h | 7 +- modules_k/presence/utils_func.c | 2 +- modules_k/presence/utils_func.h | 2 +- modules_k/pua/hash.h | 1 + 22 files changed, 736 insertions(+), 597 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ae8…

12 years, 9 months

[tracker] Comment added: Dialog module loses profile state on proxy restart

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#209 - Dialog module loses profile state on proxy restart User who did this - Alex Hermann (axlh) ---------- Now that i see the commit message, i remember seeing it on the mailinglist. I must have looked over it as i scanned the gitlog for the master branch. I'll try to backport it to 3.2 and post results. Thanks. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=209#comment512 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.

12 years, 9 months

[tracker] Comment added: Dialog module loses profile state on proxy restart

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#209 - Dialog module loses profile state on proxy restart User who did this - Daniel-Constantin Mierla (miconda) ---------- I discovered also that the dialog profiles were not stored (which I expected), so I implemented in the devel branch: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82fe2bf… There was no backport has the db schema has to be extended. Also there were some additions in the core and some code refactoring, so not sure what will take to make a patch for 3.2. Anyhow, if you can test devel branch and report results, will be appreciated. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=209#comment511 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.

12 years, 9 months

[tracker] Task opened: Dialog module loses profile state on proxy restart

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - Dialog module loses profile state on proxy restart Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Dialog module loses profile state on proxy restart. Profile states are set with set_dlg_profile(). DB mode is 3 and on shutdown the dialog table is filled. After starting the proxy again (with identical config file), the dialog profile states are gone. The dialogs from before the restart are still active and kamailio recognizes them as is_known_dlg() returns true. get_profile_size() however returns 0 whereas before the restart it returned a non-zero value. This means unrecoverable _dataloss_ :( This is on Kamailio 3.2 (which is not among the choices flyspray offers). More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=209 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.

12 years, 9 months

[tracker] Assignee added: Dialog module loses profile state on proxy restart

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#209 - Dialog module loses profile state on proxy restart User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=209 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.

12 years, 9 months

git:master: core: include str.h in parse_param.h to avoid compile errors

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8194dfe8f45f688bb9b5332ecdc66ec1423ca77f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8194dfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 27 13:56:32 2012 +0200 core: include str.h in parse_param.h to avoid compile errors - it happened when parse_param.h is used first, alone or without any predecessors including str.h --- parser/parse_param.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/parser/parse_param.h b/parser/parse_param.h index 1b92de6..edcc62f 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -43,6 +43,7 @@ #include <stdio.h> +#include "../str.h" /*! \brief * Supported types of parameters

12 years, 9 months

git:master: modules_k/pv: added pseudo var $dic (diversion header counter)

by admin＠sip-router.org

Module: sip-router Branch: master Commit: b0e122d17a0b7964066b83edf5c1f2b1c3256d45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0e122d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Mar 26 18:33:54 2012 +0300 modules_k/pv: added pseudo var $dic (diversion header counter) --- modules_k/pv/pv.c | 3 +++ modules_k/pv/pv_core.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index d907fe5..93955a1 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -153,6 +153,9 @@ static pv_export_t mod_pvs[] = { {{"dip", (sizeof("dis")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 3}, + {{"dic", (sizeof("dic")-1)}, /* */ + PVT_OTHER, pv_get_diversion, 0, + 0, 0, pv_init_iname, 4}, {{"dp", (sizeof("dp")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 2}, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index bb11dbd..fb76583 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -734,6 +734,17 @@ int pv_get_diversion(struct sip_msg *msg, pv_param_t *param, } } + if(param->pvn.u.isname.name.n == 4) { /* counter param */ + name.s = "counter"; + name.len = 7; + val = get_diversion_param(msg, &name); + if (val) { + return pv_get_strval(msg, param, res, val); + } else { + return pv_get_null(msg, param, res); + } + } + LM_ERR("unknown diversion specifier\n"); return pv_get_null(msg, param, res); }

12 years, 9 months

How to let kamailio to ignore siptrace db errors

by Mino Haluz

Hi, please, I would like to adjust the siptrace module so that it will carry on processing the calls when the siptrace module is unable to insert the trace into database. As the machine where the siptrace is being stored is sometimes undergoing high load , kamailio stops responding because siptrace cannot insert the record into db. Instead of, it could just write an error/notice or something .. Thanks. Mino.

12 years, 9 months

← Newer
1
2
3
4
5
6
7
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012