sr-dev June 2010

sr-dev@lists.kamailio.org

26 participants
164 discussions

[tracker] User took ownership: presence_xml with db_postgres
by sip-router 24 Jun '10

24 Jun '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Henning Westerholt has taken ownership of the following task: FS#77 - presence_xml with db_postgres More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=77 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

git:master: modules_k/dialog: Fix timer reset and improve timeout value logging
by Timo Reimann 24 Jun '10

24 Jun '10

Module: sip-router Branch: master Commit: 3ed5fe7f8e82b4d8792c3b468f9b426afc1d853e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ed5fe7… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 18:39:49 2010 +0200 modules_k/dialog: Fix timer reset and improve timeout value logging - Fix a bug that caused dialog timeout values to be refreshed only when a custom timeout was provided by the user via AVP. - Do not log failure to get timeout from AVP when in fact no AVP was used. - Add missing newline character. --- modules_k/dialog/dlg_handlers.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 3b671ab..5fd3d31 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -469,11 +469,13 @@ inline static int get_dlg_timeout(struct sip_msg *req) { pv_value_t pv_val; - if( timeout_avp && pv_get_spec_value( req, timeout_avp, &pv_val)==0 - && pv_val.flags&PV_VAL_INT && pv_val.ri>0 ) { - return pv_val.ri; + if( timeout_avp ) { + if ( pv_get_spec_value( req, timeout_avp, &pv_val)==0 && + pv_val.flags&PV_VAL_INT && pv_val.ri>0 ) { + return pv_val.ri; + } + LM_DBG("invalid AVP value, using default timeout\n"); } - LM_DBG("invalid AVP value, use default timeout"); return default_timeout; } @@ -923,11 +925,11 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) && new_state==DLG_STATE_CONFIRMED) { LM_DBG("sequential request successfully processed\n"); timeout = get_dlg_timeout(req); - /* update timer during sequential request? */ if (timeout!=default_timeout) { dlg->lifetime = timeout; - if (update_dlg_timer( &dlg->tl, dlg->lifetime )==-1) - LM_ERR("failed to update dialog lifetime\n"); + } + if (update_dlg_timer( &dlg->tl, dlg->lifetime )==-1) { + LM_ERR("failed to update dialog lifetime\n"); } if (update_cseqs(dlg, req, dir)!=0) { LM_ERR("cseqs update failed\n");

1 0

rpc scan behavior
by Ovidiu Sas 24 Jun '10

24 Jun '10

What is the proper way to scan a string via the rpc interface? <code_snippet> str string = {NULL,0}; if (rpc->scan(c, "S", &string) < 1) return; </code_snippet> If I use the above code and I pass a string that is made out of digits, I get the following error: "error: 400 - error at parameter 0: expected string type but record doesn't match type" I would like to have the argument interpreted as a string no matter what I pass as an argument via rpc: sercmd> some_cmd abcd the above will work ok sercmd> some_cmd 1234 the above will give the 400 error Regards, Ovidiu Sas

2 3

git:master: modules_k/dialog: rpc interface fixes
by Ovidiu Sas 24 Jun '10

24 Jun '10

Module: sip-router Branch: master Commit: 6e00d85416e3138d152a280358e79693d738e14a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e00d85… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jun 24 10:28:52 2010 -0400 modules_k/dialog: rpc interface fixes - force to string all rpc parameters - enable optianal parameters for profile specific rpc commands --- modules_k/dialog/dialog.c | 39 +++++++++++++-------------------------- 1 files changed, 13 insertions(+), 26 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 458201c..cc33f39 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -1183,7 +1183,7 @@ static void internal_rpc_print_single_dlg(rpc_t *rpc, void *c, int with_context) struct dlg_cell *dlg; unsigned int h_entry; - if (rpc->scan(c, "SS", &callid, &from_tag) < 2) return; + if (rpc->scan(c, ".S.S", &callid, &from_tag) < 2) return; h_entry = core_hash( &callid, &from_tag, d_table->size); d_entry = &(d_table->entries[h_entry]); @@ -1303,15 +1303,9 @@ static const char *rpc_end_dlg_entry_id_doc[2] = { static const char *rpc_profile_get_size_doc[2] = { "Returns the number of dialogs belonging to a profile", 0 }; -static const char *rpc_profile_w_val_get_size_doc[2] = { - "Returns the number of dialogs belonging to a profile with value", 0 -}; static const char *rpc_profile_print_dlgs_doc[2] = { "Lists all the dialogs belonging to a profile", 0 }; -static const char *rpc_profile_w_val_print_dlgs_doc[2] = { - "Lists all the dialogs belonging to a profile with value", 0 -}; static const char *rpc_dlg_bridge_doc[2] = { "Bridge two SIP addresses in a call using INVITE(hold)-REFER-BYE mechanism:\ to, from, [outbound SIP proxy]", 0 @@ -1339,31 +1333,26 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { } static void rpc_profile_get_size(rpc_t *rpc, void *c) { str profile_name = {NULL,0}; - - if (rpc->scan(c, "S", &profile_name) < 1) return; - internal_rpc_profile_get_size(rpc, c, &profile_name, NULL); - return; -} -static void rpc_profile_w_val_get_size(rpc_t *rpc, void *c) { - str profile_name = {NULL,0}; str value = {NULL,0}; - if (rpc->scan(c, "SS", &profile_name, &value) < 2) return; - internal_rpc_profile_get_size(rpc, c, &profile_name, &value); + if (rpc->scan(c, ".S", &profile_name) < 1) return; + if (rpc->scan(c, "*.S", &value) > 0) { + internal_rpc_profile_get_size(rpc, c, &profile_name, &value); + } else { + internal_rpc_profile_get_size(rpc, c, &profile_name, NULL); + } return; } static void rpc_profile_print_dlgs(rpc_t *rpc, void *c) { str profile_name = {NULL,0}; - - if (rpc->scan(c, "S", &profile_name) < 1) return; - internal_rpc_profile_print_dlgs(rpc, c, &profile_name, NULL); -} -static void rpc_profile_w_val_print_dlgs(rpc_t *rpc, void *c) { - str profile_name = {NULL,0}; str value = {NULL,0}; - if (rpc->scan(c, "SS", &profile_name, &value) < 2) return; - internal_rpc_profile_print_dlgs(rpc, c, &profile_name, &value); + if (rpc->scan(c, ".S", &profile_name) < 1) return; + if (rpc->scan(c, "*.S", &value) > 0) { + internal_rpc_profile_print_dlgs(rpc, c, &profile_name, &value); + } else { + internal_rpc_profile_print_dlgs(rpc, c, &profile_name, NULL); + } return; } static void rpc_dlg_bridge(rpc_t *rpc, void *c) { @@ -1381,9 +1370,7 @@ static rpc_export_t rpc_methods[] = { {"dlg.dlg_list", rpc_print_dlg, rpc_print_dlg_doc, 0}, {"dlg.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, {"dlg.profile_get_size", rpc_profile_get_size, rpc_profile_get_size_doc, 0}, - {"dlg.profile_w_value_get_size", rpc_profile_w_val_get_size, rpc_profile_w_val_get_size_doc, 0}, {"dlg.profile_list", rpc_profile_print_dlgs, rpc_profile_print_dlgs_doc, 0}, - {"dlg.profile_w_value_list", rpc_profile_w_val_print_dlgs, rpc_profile_w_val_print_dlgs_doc, 0}, {"dlg.bridge_dlg", rpc_dlg_bridge, rpc_dlg_bridge_doc, 0}, {0, 0, 0, 0} };

1 0

SF.net SVN: openser:[6009] branches/1.5/modules/dialog/dlg_hash.c
by Marius Zbihlei 24 Jun '10

24 Jun '10

Revision: 6009 http://openser.svn.sourceforge.net/openser/?rev=6009&view=rev Author: mariuszbihlei Date: 2010-06-24 14:01:42 +0000 (Thu, 24 Jun 2010) Log Message: ----------- Do not consider in-early-dialog requests to be bogus. Patch from Timo Reimann (timo.reimann(a)1und1.de), patch backported from sip-router Modified Paths: -------------- branches/1.5/modules/dialog/dlg_hash.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: openser:[6008] branches/1.5/modules/dialog/dlg_timer.c
by Marius Zbihlei 24 Jun '10

24 Jun '10

Revision: 6008 http://openser.svn.sourceforge.net/openser/?rev=6008&view=rev Author: mariuszbihlei Date: 2010-06-24 13:59:14 +0000 (Thu, 24 Jun 2010) Log Message: ----------- modules/dialog: Reduce log verbosity for list traversal of expired dialogs. - Change logging of start/previous/next pointers from WARN to DBG when traversing the list of expired dialogs. - Patch by Timo Reimann (timo.reimann at 1und1.de), patch backported from sip-router Modified Paths: -------------- branches/1.5/modules/dialog/dlg_timer.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: Correct typo in comment referring to other file.
by Timo Reimann 24 Jun '10

24 Jun '10

Module: sip-router Branch: master Commit: e5d313913b34e05a9e0529a907b87a54ba354d26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5d3139… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 15:50:52 2010 +0200 Correct typo in comment referring to other file. --- timer.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/timer.h b/timer.h index 7b1b66e..969ce5d 100644 --- a/timer.h +++ b/timer.h @@ -73,7 +73,7 @@ typedef void (timer_function)(unsigned int ticks, void* param); /* deprecated, old, kept for compatibility get_ticks()*TIMER_TICK used to be the time in s for new code, use get_ticks_raw() and one of the macros defined in - time_ticks.h (.e.g TICKS_TO_S(tick) to convert to s or ms )*/ + timer_ticks.h (.e.g TICKS_TO_S(tick) to convert to s or ms )*/ #define TIMER_TICK 1 /* 1 s, kept for compatibility */

1 0

git:master: modules_k/dialog: Reduce log verbosity for list traversal of
by Timo Reimann 24 Jun '10

24 Jun '10

Module: sip-router Branch: master Commit: 0bf99eaf23b8c7041f4a9a017bb6483c5b5d9017 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0bf99ea… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 15:01:13 2010 +0200 modules_k/dialog: Reduce log verbosity for list traversal of expired dialogs. - Change logging of start/previous/next pointers from WARN to DBG when traversing the list of expired dialogs. --- modules_k/dialog/dlg_timer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/dlg_timer.c b/modules_k/dialog/dlg_timer.c index 5ab4672..03cc5b3 100644 --- a/modules_k/dialog/dlg_timer.c +++ b/modules_k/dialog/dlg_timer.c @@ -237,18 +237,18 @@ static inline struct dlg_tl* get_expired_dlgs(unsigned int time) end = &d_timer->first; tl = d_timer->first.next; - LM_WARN("start with tl=%p tl->prev=%p tl->next=%p (%d) at %d " + LM_DBG("start with tl=%p tl->prev=%p tl->next=%p (%d) at %d " "and end with end=%p end->prev=%p end->next=%p\n", tl,tl->prev,tl->next,tl->timeout,time, end,end->prev,end->next); while( tl!=end && tl->timeout <= time) { - LM_WARN("getting tl=%p tl->prev=%p tl->next=%p with %d\n", + LM_DBG("getting tl=%p tl->prev=%p tl->next=%p with %d\n", tl,tl->prev,tl->next,tl->timeout); tl->prev = 0; tl->timeout = 0; tl=tl->next; } - LM_WARN("end with tl=%p tl->prev=%p tl->next=%p and d_timer->first.next->prev=%p\n", + LM_DBG("end with tl=%p tl->prev=%p tl->next=%p and d_timer->first.next->prev=%p\n", tl,tl->prev,tl->next,d_timer->first.next->prev); if (tl==end && d_timer->first.next->prev) {

1 0

git:master: Do not consider in-early-dialog requests to be bogus.
by admin＠sip-router.org 24 Jun '10

24 Jun '10

Module: sip-router Branch: master Commit: 09fefd18c90b9a9de5d8a5c96652d38494c5178d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09fefd1… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Jun 23 15:39:21 2010 +0200 Do not consider in-early-dialog requests to be bogus. --- modules_k/dialog/dlg_hash.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 6aba716..d7a16f1 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -721,6 +721,7 @@ void next_state_dlg(struct dlg_cell *dlg, int event, break; case DLG_EVENT_REQ: switch (dlg->state) { + case DLG_STATE_EARLY: case DLG_STATE_CONFIRMED_NA: case DLG_STATE_CONFIRMED: break;

3 4

git:master: modules_k/dialog: rpc support
by Ovidiu Sas 23 Jun '10

23 Jun '10

Module: sip-router Branch: master Commit: 9591ceb0e3e03f31e41f062a2fc97f06720ed8a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9591ceb… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Jun 23 18:26:09 2010 -0400 modules_k/dialog: rpc support - mi fifo commands ported to rpc (serctl) --- modules_k/dialog/dialog.c | 287 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 287 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=959…

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2010