sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

[tracker] Task changed: Provide processed message in tm callbacks whenever possible
by sip-router 15 Apr '11

15 Apr '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#123 - Provide processed message in tm callbacks whenever possible User who did this: Timo Reimann (tr) Task details edited: ------- In Kamailio 1.5, certain callbacks (namely TMCB_RESPONSE_PRE_OUT, TMCB_RESPONSE_OUT, and TMCB_REQUEST_BUILT) provided the entire processed message (i.e., after headers were modified) in tmcb_params->extra1 as *str. AFAICS, sr's equivalent to that parameter is send_buf in the tmcb_params structure. However, the only sr callbacks that do provide the processed messages are TMCB_REQUEST_SENT and TMCB_RESPONSE_SENT which, had no perfect correspondency in Kamailio (*_OUT callbacks would not be called for retransmissions). Technically, this makes complete sense because the two *_SENT callbacks and the send_buf variable are available only when WITH_ONSEND is defined. Also, I noticed that these callbacks are handled through run_onsend_callbacks2() instead of run_trans_callbacks(). Only the former fill send_buf and hence pass processed messages as part of the callback. Please pass processed messages for all callbacks where a processed message is supposed to be available, i.e., all *_OUT and *_READY callbacks. (An email on the sr-dev list was originally posted by me on 28.7.2011. See [[http://lists.sip-router.org/pipermail/sr-dev/2010-July/008351.html|here]]) ------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=123 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] Task opened: Provide processed message in tm callbacks whenever possible
by sip-router 15 Apr '11

15 Apr '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Timo Reimann (tr) Attached to Project - sip-router Summary - Provide processed message in tm callbacks whenever possible Task Type - Feature Request Category - tm Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - In Kamailio 1.5, certain callbacks (namely TMCB_RESPONSE_PRE_OUT, TMCB_RESPONSE_OUT, and TMCB_REQUEST_BUILT) provided the entire processed message (i.e., after headers were modified) in tmcb_params->extra1 as *str. AFAICS, sr's equivalent to that parameter is send_buf in the tmcb_params structure. However, the only sr callbacks that do provide the processed messages are TMCB_REQUEST_SENT and TMCB_RESPONSE_SENT which, had no perfect correspondency in Kamailio (*_OUT callbacks would not be called for retransmissions). Technically, this makes complete sense because the two *_SENT callbacks and the send_buf variable are available only when WITH_ONSEND is defined. Also, I noticed that these callbacks are handled through run_onsend_callbacks2() instead of run_trans_callbacks(). Only the former fill send_buf and hence pass processed messages as part of the callback. Please pass processed messages for all callbacks where a processed message is supposed to be available, i.e., all *_OUT and *_READY callbacks. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=123 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] Assignee added: Provide processed message in tm callbacks whenever possible
by sip-router 15 Apr '11

15 Apr '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#123 - Provide processed message in tm callbacks whenever possible User who did this - Timo Reimann (tr) http://sip-router.org/tracker/index.php?do=details&task_id=123 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: Kamailio 3.1.3 crash
by sip-router 15 Apr '11

15 Apr '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#122 - Kamailio 3.1.3 crash User who did this - Timo Reimann (tr) ---------- Hey Jasmin, I agree with you that dialogs should be tracked as soon as possible. As long as there is a message available for parsing, this should be feasible IMHO, hopefully including message-to-dialog matching based on the DID. The various use cases are indeed troublesome, however, which is why I think a fair amount of conceptual changes will be required. As a minimum requirement, we need to define a standard function for accessing dialogs that may be called in all thinkable situations. get_current_dialog() is a good candidate for that; however, it is not being used consistently across the various module parts. Regarding using dlg_manage() for in-dialog requests with event routes: Can you file a separate bug report on this so that we (I!) can keep track of it more easily? Oh and thanks for the time travel paper, looks promising -- will turn that into a Kamailio module ASAP. ;) --Timo ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=122#comment200 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:mariusbucur/dmq: added support for maintaining the dmq serverlist, and updating in accordingly.
by Marius Ovidiu Bucur 15 Apr '11

15 Apr '11

Module: sip-router Branch: mariusbucur/dmq Commit: 8620313f057e7e9b7744c356e954daaf213d12b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8620313… Author: Marius Bucur <marius(a)marius-bucur.ro> Committer: Marius Bucur <marius(a)marius-bucur.ro> Date: Fri Apr 15 09:11:24 2011 +0300 added support for maintaining the dmq serverlist, and updating in accordingly. currently, some of the functions are stubs --- modules_k/dmq/dmq.c | 6 ++++++ modules_k/dmq/dmq.h | 3 +++ modules_k/dmq/dmqnode.c | 9 +++++++++ modules_k/dmq/dmqnode.h | 28 ++++++++++++++++++++++++++++ modules_k/dmq/notification_peer.c | 11 +++++++++++ modules_k/dmq/notification_peer.h | 4 +++- modules_k/dmq/peer.c | 1 + modules_k/dmq/peer.h | 1 + 8 files changed, 62 insertions(+), 1 deletions(-) diff --git a/modules_k/dmq/dmq.c b/modules_k/dmq/dmq.c index 7920361..b07d176 100644 --- a/modules_k/dmq/dmq.c +++ b/modules_k/dmq/dmq.c @@ -51,6 +51,7 @@ #include "bind_dmq.h" #include "worker.h" #include "notification_peer.h" +#include "dmqnode.h" #include "../../mod_fix.h" static int mod_init(void); @@ -76,6 +77,8 @@ sl_api_t slb; /** module variables */ dmq_worker_t* workers; dmq_peer_list_t* peer_list; +/* the list of dmq servers */ +dmq_node_list_t* node_list; // the dmq module is a peer itself for receiving notifications regarding nodes dmq_peer_t dmq_notification_peer; @@ -147,6 +150,9 @@ static int mod_init(void) { /* load peer list - the list containing the module callbacks for dmq */ peer_list = init_peer_list(); + /* load the dmq node list - the list containing the dmq servers */ + node_list = init_dmq_node_list(); + /* register worker processes - add one because of the ping process */ register_procs(num_workers); diff --git a/modules_k/dmq/dmq.h b/modules_k/dmq/dmq.h index 6d0aac9..800ecbd 100644 --- a/modules_k/dmq/dmq.h +++ b/modules_k/dmq/dmq.h @@ -7,12 +7,15 @@ #include "bind_dmq.h" #include "peer.h" #include "worker.h" +#include "dmqnode.h" #define DEFAULT_NUM_WORKERS 2 extern int num_workers; extern dmq_worker_t* workers; extern dmq_peer_t dmq_notification_peer; +extern dmq_peer_list_t* peer_list; +extern dmq_node_list_t* node_list; static inline int dmq_load_api(dmq_api_t* api) { bind_dmq_f binddmq; diff --git a/modules_k/dmq/dmqnode.c b/modules_k/dmq/dmqnode.c new file mode 100644 index 0000000..4d57fe0 --- /dev/null +++ b/modules_k/dmq/dmqnode.c @@ -0,0 +1,9 @@ +#include "dmqnode.h" +#include "dmq.h" + +dmq_node_list_t* init_dmq_node_list() { + dmq_node_list_t* node_list = shm_malloc(sizeof(dmq_node_list_t)); + memset(node_list, 0, sizeof(dmq_node_list_t)); + lock_init(&node_list->lock); + return node_list; +} \ No newline at end of file diff --git a/modules_k/dmq/dmqnode.h b/modules_k/dmq/dmqnode.h new file mode 100644 index 0000000..d62395b --- /dev/null +++ b/modules_k/dmq/dmqnode.h @@ -0,0 +1,28 @@ +#ifndef DMQNODE_H +#define DMQNODE_H + +#include <string.h> +#include <stdlib.h> +#include "../../lock_ops.h" +#include "../../str.h" +#include "../../mem/mem.h" +#include "../../mem/shm_mem.h" +#include "../../parser/parse_uri.h" + +typedef struct dmq_node { + struct sip_uri* uri; + int status; + int last_notification; + struct dmqnode* next; +} dmq_node_t; + +typedef struct dmq_node_list { + gen_lock_t lock; + struct dmq_node* nodes; + int count; +} dmq_node_list_t; + +dmq_node_list_t* init_dmq_node_list(); +int update_node_list(dmq_node_list_t* remote_list); + +#endif \ No newline at end of file diff --git a/modules_k/dmq/notification_peer.c b/modules_k/dmq/notification_peer.c index 28fba07..8256142 100644 --- a/modules_k/dmq/notification_peer.c +++ b/modules_k/dmq/notification_peer.c @@ -12,6 +12,17 @@ int add_notification_peer() { } int dmq_notification_callback(struct sip_msg* msg) { + /* received dmqnode list */ + dmq_node_list_t* rlist; LM_ERR("dmq triggered from dmq_notification_callback\n"); + rlist = extract_node_list(msg); + if(!rlist) { + LM_ERR("extract_node_list failed\n"); + return -1; + } + if(update_node_list(rlist) < 0) { + LM_ERR("cannot update node_list\n"); + return -1; + } return 0; } \ No newline at end of file diff --git a/modules_k/dmq/notification_peer.h b/modules_k/dmq/notification_peer.h index 0e6121a..e1e7963 100644 --- a/modules_k/dmq/notification_peer.h +++ b/modules_k/dmq/notification_peer.h @@ -1,4 +1,6 @@ #include "dmq.h" +#include "dmqnode.h" int add_notification_peer(); -int dmq_notification_callback(struct sip_msg* msg); \ No newline at end of file +int dmq_notification_callback(struct sip_msg* msg); +dmq_node_list_t* extract_node_list(struct sip_msg* msg); \ No newline at end of file diff --git a/modules_k/dmq/peer.c b/modules_k/dmq/peer.c index 4215289..85e5c70 100644 --- a/modules_k/dmq/peer.c +++ b/modules_k/dmq/peer.c @@ -1,4 +1,5 @@ #include "peer.h" +#include "dmq.h" dmq_peer_list_t* init_peer_list() { dmq_peer_list_t* peer_list = shm_malloc(sizeof(dmq_peer_list_t)); diff --git a/modules_k/dmq/peer.h b/modules_k/dmq/peer.h index b9a09ee..702ae34 100644 --- a/modules_k/dmq/peer.h +++ b/modules_k/dmq/peer.h @@ -3,6 +3,7 @@ #include <string.h> #include <stdlib.h> +#include "../../lock_ops.h" #include "../../str.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h"

1 0

logging from lua
by Juha Heinanen 14 Apr '11

14 Apr '11

looks like xlog module is not supported by lua. so i tried to use sr.log function. when i make in lua script call sr.log(2, "Executing lua script\n"); i get to syslog Apr 14 20:39:17 sip /usr/sbin/sip-proxy[23495]: ERROR: app_lua [app_lua_sr.c:92]: Executing lua script why ERROR level, since according to http://sip-router.org/wiki/cookbooks/core-cookbook/devel#debug level 2 means L_INFO? -- juha

1 0

Siremis with mysql and Kamailio with postgresql: wrong sqls
by Giorgio Maria Santini 14 Apr '11

14 Apr '11

Hello, I've setup a siremis installation using mysql for siremis tables. Now having kamailio with postgresql on another machine, I've chosen Postgresql in seremis setup under SIP DB and correctly inserted the right username/password/host. Connection was successfully. The problem rises when you try to query something owned by kamailio-db: the query builded from seremis is not written for a postgresql database but is still written to be used in a mysql database. Here an example: An exception occurred while executing this script: Error message: #0, Error in query:: SELECT T0.id, T0.username, T0.domain, T0.password, T0.email_address, T0.ha1, T0.ha1b, T0.rpid FROM `subscriber` T0 LIMIT 10. SQLSTATE[42601]: Syntax error: 7 ERROR: syntax error at or near "`" at character 101 Script name and line number of error: /var/www/siremis-2.0.0/openbiz/bin/data/BizDataObj_Lite.php:447 Obviously, nothing works. The only things working are all those operation using mysql as db. Have I setup wrong my installation or is it not possible to use two different databases? Thanks a lot, Giorgio Maria Santini

2 2

[IMS] kamailio dialog or ser dialog module
by Jason Penton 14 Apr '11

14 Apr '11

Hey Carsten, going forward on IMS, is your plan to standardise on K dialog or S dialog for SR3? Have been going through the code of the scscf which relies on S dialog. K dialog has alot more functionality and state management? what are your thoughts? Having completed a PoC Ro interface (which you wil notice from the code is based on K dialog) I now need to incorporate into existing S-CSCF, which will have to be changed from using S dialog to K dialog. Cheers Jason

1 0

git:master: modules_k/uac: fix from/to restore for small original URI
by Timo Teras 14 Apr '11

14 Apr '11

Module: sip-router Branch: master Commit: e1d1c774c9ac0b4d9103f4a1c5e9b550adbb2f38 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1d1c77… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Wed Apr 6 09:33:10 2011 +0300 modules_k/uac: fix from/to restore for small original URI Seems that the URI length check is superfluous and fails under certain conditions. It does not make sense for the URI to have zero bytes, so just use the first seen zero byte as end marker. I have a reproducible test case where the restore inserts URI with multiple zero-bytes to wire. This happens if the original URI is smaller than the one we rewrote it to using uac_replace_from. --- modules_k/uac/from.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules_k/uac/from.c b/modules_k/uac/from.c index 4657e11..50822b6 100644 --- a/modules_k/uac/from.c +++ b/modules_k/uac/from.c @@ -463,15 +463,17 @@ int restore_from( struct sip_msg *msg, int *is_from ) LM_ERR("new URI shorter than old URI\n"); goto failed; } - for( i=0 ; i<old_uri.len ; i++ ) + for( i=0 ; i<old_uri.len ; i++ ) { new_uri.s[i] ^= old_uri.s[i]; - if (new_uri.len==old_uri.len) { - for( ; new_uri.len && (new_uri.s[new_uri.len-1]==0) ; new_uri.len-- ); - if (new_uri.len==0) { - LM_ERR("new URI got 0 len\n"); - goto failed; + if (new_uri.s[i] == 0) { + new_uri.len = i; + break; } } + if (new_uri.len==0) { + LM_ERR("new URI got 0 len\n"); + goto failed; + } LM_DBG("decoded uris are: new=[%.*s] old=[%.*s]\n", new_uri.len, new_uri.s, old_uri.len, old_uri.s);

1 0

git:3.1: modules_k/uac: fix from/to restore for small original URI
by Timo Teras 14 Apr '11

14 Apr '11

Module: sip-router Branch: 3.1 Commit: f3690cfddd08f43d7afb651a8d9f05b31e2174c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3690cf… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Wed Apr 6 09:33:10 2011 +0300 modules_k/uac: fix from/to restore for small original URI Seems that the URI length check is superfluous and fails under certain conditions. It does not make sense for the URI to have zero bytes, so just use the first seen zero byte as end marker. I have a reproducible test case where the restore inserts URI with multiple zero-bytes to wire. This happens if the original URI is smaller than the one we rewrote it to using uac_replace_from. (cherry picked from commit e1d1c774c9ac0b4d9103f4a1c5e9b550adbb2f38) --- modules_k/uac/from.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules_k/uac/from.c b/modules_k/uac/from.c index 4657e11..50822b6 100644 --- a/modules_k/uac/from.c +++ b/modules_k/uac/from.c @@ -463,15 +463,17 @@ int restore_from( struct sip_msg *msg, int *is_from ) LM_ERR("new URI shorter than old URI\n"); goto failed; } - for( i=0 ; i<old_uri.len ; i++ ) + for( i=0 ; i<old_uri.len ; i++ ) { new_uri.s[i] ^= old_uri.s[i]; - if (new_uri.len==old_uri.len) { - for( ; new_uri.len && (new_uri.s[new_uri.len-1]==0) ; new_uri.len-- ); - if (new_uri.len==0) { - LM_ERR("new URI got 0 len\n"); - goto failed; + if (new_uri.s[i] == 0) { + new_uri.len = i; + break; } } + if (new_uri.len==0) { + LM_ERR("new URI got 0 len\n"); + goto failed; + } LM_DBG("decoded uris are: new=[%.*s] old=[%.*s]\n", new_uri.len, new_uri.s, old_uri.len, old_uri.s);

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011