sr-dev November 2009

sr-dev@lists.kamailio.org

30 participants
177 discussions

add_rcv_param wuses illegal chars in contact uri
by jh＠tutpro.com 08 Nov '09

08 Nov '09

while testing alias_contact() function, i tried to steel some code from nathelper add_rcv_param() function, but noticed that it adds illegal chars to contact uri when it encloses the param in quotes ("): param[RECEIVED_LEN] = '\"'; memcpy(param + RECEIVED_LEN + 1, uri.s, uri.len); param[RECEIVED_LEN + 1 + uri.len] = '\"'; i found out when twinkle complained about parse error in contact uri. i then went and checked from rfc3261 and twinkle is correct: uri-parameter = transport-param / user-param / method-param / ttl-param / maddr-param / lr-param / other-param other-param = pname [ "=" pvalue ] pvalue= 1*paramchar paramchar = param-unreserved / unreserved / escaped param-unreserved = [" / "]" / "/" / ":" / "&" / "+" / "$" " is not listed in unreserved either. i don't know if anyone is using that function. if not, better remove it or fix it. -- juha

2 1

git:kamailio_3.0: msilo(k): set tm callback type for sent messages
by Daniel-Constantin Mierla 07 Nov '09

07 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: d8dde2fe2e7004c69a6241a054c5febe73548267 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8dde2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 11:42:35 2009 +0100 msilo(k): set tm callback type for sent messages - it must be TMCB_LOCAL_COMPLETED - otherwise the callback is not executed when transaction completes - delivered messages were not deleted from db - reported by Juha Heinanen --- modules_k/msilo/msilo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 7c9cefa..8249b43 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1060,6 +1060,7 @@ static int m_dump(struct sip_msg* msg, char* owner, char* str2) uac_r.method = &msg_type; uac_r.headers = &hdr_str; uac_r.body = (n<0)?&str_vals[2]:&body_str; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; uac_r.cb = m_tm_callback; uac_r.cbp = (void*)(long)mid; @@ -1333,6 +1334,7 @@ void m_send_ontimer(unsigned int ticks, void *param) uac_r.method = &msg_type; uac_r.headers = &hdr_str; uac_r.body = (n<0)?&str_vals[2]:&body_str; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; uac_r.cb = m_tm_callback; uac_r.cbp = (void*)(long)mid; tmb.t_request(&uac_r, /* UAC Req */

2 3

git:sr_3.0: msilo(k): set tm callback type for sent messages
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: sr_3.0 Commit: 2e148da518bfd4d3d89396580b946c59903a5dfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e148da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 11:42:35 2009 +0100 msilo(k): set tm callback type for sent messages - it must be TMCB_LOCAL_COMPLETED - otherwise the callback is not executed when transaction completes - delivered messages were not deleted from db - reported by Juha Heinanen (cherry picked from commit d8dde2fe2e7004c69a6241a054c5febe73548267) --- modules_k/msilo/msilo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 7c9cefa..8249b43 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1060,6 +1060,7 @@ static int m_dump(struct sip_msg* msg, char* owner, char* str2) uac_r.method = &msg_type; uac_r.headers = &hdr_str; uac_r.body = (n<0)?&str_vals[2]:&body_str; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; uac_r.cb = m_tm_callback; uac_r.cbp = (void*)(long)mid; @@ -1333,6 +1334,7 @@ void m_send_ontimer(unsigned int ticks, void *param) uac_r.method = &msg_type; uac_r.headers = &hdr_str; uac_r.body = (n<0)?&str_vals[2]:&body_str; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; uac_r.cb = m_tm_callback; uac_r.cbp = (void*)(long)mid; tmb.t_request(&uac_r, /* UAC Req */

1 0

git:kamailio_3.0: xlog(k): updated log levels
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 42d70e2e4826be99a063a3d900b167a62ae12985 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42d70e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 21:51:47 2009 +0100 xlog(k): updated log levels - new level L_BUG - updated the documentation to match the code - L_CRIT uses in the code L_CRIT2 - L_CRIT2 can be used in config as well, detection is based on the third caracter - credits to Klaus Darilion --- modules_k/xlog/README | 13 +++++++------ modules_k/xlog/doc/xlog_admin.xml | 17 +++++++++++------ modules_k/xlog/xlog.c | 3 ++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/modules_k/xlog/README b/modules_k/xlog/README index f1c7966..5d6163c 100644 --- a/modules_k/xlog/README +++ b/modules_k/xlog/README @@ -163,13 +163,14 @@ modparam("xlog", "prefix", "-xlog: ") Meaning of the parameters are as follows: * level - The level that will be used in LOG function. It can be: - + L_ALERT - log level -3 - + L_CRIT - log level -2 + + L_ALERT - log level -5 + + L_BUG - log level -4 + + L_CRIT - log level -3 + L_ERR - log level -1 - + L_WARN - log level 1 - + L_NOTICE - log level 2 - + L_INFO - log level 3 - + L_DBG - log level 4 + + L_WARN - log level 0 + + L_NOTICE - log level 1 + + L_INFO - log level 2 + + L_DBG - log level 3 + $pv - any valid pseudo-variable, that has an integer value. See above options for valid log levels. If it is not a pseudo-variable, then what really matters is the diff --git a/modules_k/xlog/doc/xlog_admin.xml b/modules_k/xlog/doc/xlog_admin.xml index 0db2da8..66f2232 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -168,12 +168,17 @@ modparam("xlog", "prefix", "-xlog: ") <itemizedlist> <listitem> <para> - L_ALERT - log level -3 + L_ALERT - log level -5 </para> </listitem> <listitem> <para> - L_CRIT - log level -2 + L_BUG - log level -4 + </para> + </listitem> + <listitem> + <para> + L_CRIT - log level -3 </para> </listitem> <listitem> @@ -183,22 +188,22 @@ modparam("xlog", "prefix", "-xlog: ") </listitem> <listitem> <para> - L_WARN - log level 1 + L_WARN - log level 0 </para> </listitem> <listitem> <para> - L_NOTICE - log level 2 + L_NOTICE - log level 1 </para> </listitem> <listitem> <para> - L_INFO - log level 3 + L_INFO - log level 2 </para> </listitem> <listitem> <para> - L_DBG - log level 4 + L_DBG - log level 3 </para> </listitem> <listitem> diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index c614105..ee352e7 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -257,7 +257,8 @@ static int xlog_fixup(void** param, int param_no) switch(((char*)(*param))[2]) { case 'A': xlp->v.level = L_ALERT; break; - case 'C': xlp->v.level = L_CRIT; break; + case 'B': xlp->v.level = L_BUG; break; + case 'C': xlp->v.level = L_CRIT2; break; case 'E': xlp->v.level = L_ERR; break; case 'W': xlp->v.level = L_WARN; break; case 'N': xlp->v.level = L_NOTICE; break;

1 0

sr_3.0 problems with header adding/removing
by Klaus Darilion 06 Nov '09

06 Nov '09

Hi! I have followings problems with sr_3.0 branch (4.11.2009) remove_hf("") does not work. Header fields (I tried various ones) are not removed. record_route(): I call record_route() but the RR header is not added. I tried both, K's and ser's rr module - both do not work. Any hints how to debug this? thanks klaus

3 5

[ openser-Bugs-2892560 ] Inconsistent $rP contents
by SourceForge.net 06 Nov '09

06 Nov '09

Bugs item #2892560, was opened at 2009-11-05 14:18 Message generated for change (Comment added) made by miconda You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2892560&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: core Group: ver 1.4.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Alex Hermann (axlh) Assigned to: Nobody/Anonymous (nobody) Summary: Inconsistent $rP contents Initial Comment: The $rP (request-uri's transport) is broken. When $ru is set with a ";transport=XXX" parameter, the contents of $rP show the entire parameter instead of its parsed value. The following config snippet: $ru = 'sip:123@invalid'; TRACE("Transport=[$rP]"); $ru = 'sip:123@invalid;transport=udp'; TRACE("Transport=[$rP]"); $ru = 'sip:123@invalid;transport=tcp'; TRACE("Transport=[$rP]"); creates the following log: Nov 5 13:14:26 Transport=[UDP] Nov 5 13:14:26 Transport=[transport=udp] Nov 5 13:14:26 Transport=[transport=tcp] Expected would be: Nov 5 13:14:26 Transport=[UDP] Nov 5 13:14:26 Transport=[UDP] Nov 5 13:14:26 Transport=[TCP] ---------------------------------------------------------------------- >Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-11-06 15:01 Message: Should be fixed on 1.4, 1.5 and 3.0 (git), please test and let me know if is ok. Thanks. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2892560&group_…

1 0

git:kamailio_3.0: dialog(k): set dlg context after pre script callback
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 1efaa9c19279a5dded570fb60621b45191d46027 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1efaa9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 13:57:22 2009 +0100 dialog(k): set dlg context after pre script callback - applies for the case of timeout route - the prescript callback resets it otherwise - reported by Nathan Angelacos, SF svn # 5927 --- modules_k/dialog/dlg_handlers.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 491a1f1..cd19708 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -967,13 +967,14 @@ void dlg_ontimeout( struct dlg_tl *tl) if(dlg->toroute>0 && dlg->toroute<main_rt.entries && main_rt.rlist[dlg->toroute]!=NULL) { - dlg_set_ctx_dialog(dlg); fmsg = faked_msg_next(); if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)>0) { + dlg_set_ctx_dialog(dlg); LM_DBG("executing route %d on timeout\n", dlg->toroute); set_route_type(REQUEST_ROUTE); run_top_route(main_rt.rlist[dlg->toroute], fmsg, 0); + dlg_set_ctx_dialog(0); exec_post_script_cb(fmsg, REQUEST_CB_TYPE); } }

1 0

git:kamailio_3.0: remove some modules from excluded_modules list
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 93b42945ad2a57c84626cdd08ec40aa17c06036d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93b4294… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 13:33:03 2009 +0100 remove some modules from excluded_modules list - they compile and were K default --- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2891d62..6d8c9f3 100644 --- a/Makefile +++ b/Makefile @@ -198,13 +198,13 @@ else # excluded because they depend on external libraries exclude_modules?= cpl mangler postgres jabber mysql cpl-c \ auth_radius misc_radius \ - acc_radius dialog pa rls presence_b2b xcap xmlrpc\ + acc_radius pa rls presence_b2b xcap xmlrpc\ osp tls oracle \ unixsock dbg print_lib auth_identity ldap \ db_berkeley db_mysql db_postgres db_oracle \ db_unixodbc memcached mi_xmlrpc \ - nat_traversal perl perlvdb purple seas siptrace \ - snmpstats uac_redirect xmpp \ + perl perlvdb purple seas \ + snmpstats xmpp \ carrierroute misc_radius peering \ dialplan lcr utils presence \ presence_dialoginfo presence_xml pua pua_bla \

1 0

git:kamailio_3.0: pv: reset local var for tobody trans
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: d4a1d5146773eac1d82b8abb39747cc8ec427801 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4a1d51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 13:45:16 2009 +0100 pv: reset local var for tobody trans - from SF svn, #5951 --- modules_k/pv/pv_trans.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 3401edd..d9120de 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -925,7 +925,7 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, { if(_tr_tobody_str.len==0) memset(&_tr_tobody, 0, sizeof(struct to_body)); - if(val->rs.len>_tr_tobody_str.len) + if(_tr_tobody_str.s==NULL || val->rs.len>_tr_tobody_str.len) { if(_tr_tobody_str.s) pkg_free(_tr_tobody_str.s); _tr_tobody_str.s = @@ -954,7 +954,7 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, { memset(&_tr_tobody, 0, sizeof(struct to_body)); pkg_free(_tr_tobody_str.s); - _tr_tobody_str.len = 0; + memset(&_tr_tobody_str, 0, sizeof(str)); return -1; } if (parse_uri(_tr_tobody.uri.s, _tr_tobody.uri.len, @@ -963,7 +963,7 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, free_to_params(&_tr_tobody); memset(&_tr_tobody, 0, sizeof(struct to_body)); pkg_free(_tr_tobody_str.s); - _tr_tobody_str.len = 0; + memset(&_tr_tobody_str, 0, sizeof(str)); return -1; }

1 0

git:kamailio_3.0: pv: return transport parameter value for $rP
by Daniel-Constantin Mierla 06 Nov '09

06 Nov '09

Module: sip-router Branch: kamailio_3.0 Commit: 337b0e067dbec8965b176a469bcb2104f2bd870c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=337b0e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 6 13:35:20 2009 +0100 pv: return transport parameter value for $rP - reported by Alex Hermann, SF.net tracker #2892560 --- modules_k/pv/pv_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 16c1f70..f52905a 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -205,7 +205,7 @@ int pv_get_xuri_attr(struct sip_msg *msg, struct sip_uri *parsed_uri, } else if(param->pvn.u.isname.name.n==4) /* protocol */ { if(parsed_uri->transport_val.s==NULL) return pv_get_udp(msg, param, res); - return pv_get_strintval(msg, param, res, &parsed_uri->transport, + return pv_get_strintval(msg, param, res, &parsed_uri->transport_val, (int)parsed_uri->proto); } LM_ERR("unknown specifier\n");

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
18
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 2009