sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

[tracker] Comment added: Sanity checks lets invalid RURI through

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#264 - Sanity checks lets invalid RURI through User who did this - Andrew Pogrebennyk (marduk) ---------- This is a script problem, as we do unescape after sanity check and after that the RURI becomes invalid. I may post more suggestions once I know what can be improved here, but for now I'm closing this ticket. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=264#comment763 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.

11 years, 5 months

git:master: modules/cdp: Added kcore link for statistics

by Jason Penton

Module: sip-router Branch: master Commit: 4c7ba37b7d8bf55d1983950812a3ae060e5ee3e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c7ba37… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Jan 8 16:47:13 2013 +0200 modules/cdp: Added kcore link for statistics --- modules/cdp/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/cdp/Makefile b/modules/cdp/Makefile index c727f65..15ef21b 100644 --- a/modules/cdp/Makefile +++ b/modules/cdp/Makefile @@ -3,6 +3,8 @@ auto_gen= NAME=cdp.so DEFS+=-DKAMAILIO_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kcore/kcore ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config)

11 years, 5 months

git:alexh/for4.0: modules_k/kex: call pkg_proc_stats_destroy in module destroy function to free memory

by Alex Hermann

Module: sip-router Branch: alexh/for4.0 Commit: 7ca4fb63f87c686f29f1a19715a014db2ebda703 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ca4fb6… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Nov 5 13:33:27 2012 +0100 modules_k/kex: call pkg_proc_stats_destroy in module destroy function to free memory --- modules_k/kex/kex_mod.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index 8dafb7f..fe3c8eb 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -167,6 +167,7 @@ static int child_init(int rank) */ static void destroy(void) { + pkg_proc_stats_destroy(); return; }

11 years, 5 months

git:alexh/for4.0: modules_k/tmx: Add $T_reply_last, returning last reply code

by Alex Hermann

Module: sip-router Branch: alexh/for4.0 Commit: 3df0016594a6908c652766435894f8195355c6f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3df0016… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Oct 29 15:25:21 2012 +0100 modules_k/tmx: Add $T_reply_last, returning last reply code Make the last/previous reply on a branch available to the script via $T_reply_last. Only available in TM_ONREPLY_ROUTE. --- modules_k/tmx/README | 1 + modules_k/tmx/doc/tmx_admin.xml | 3 ++ modules_k/tmx/t_var.c | 43 +++++++++++++++++++++++++++++++++++++++ modules_k/tmx/t_var.h | 2 + modules_k/tmx/tmx_mod.c | 3 ++ 5 files changed, 52 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/README b/modules_k/tmx/README index fb79293..e3d1662 100644 --- a/modules_k/tmx/README +++ b/modules_k/tmx/README @@ -315,6 +315,7 @@ tcontinue('123', '456', 'MYROUTE'); * $T_branch_idx * $T_reply_code * $T_reply_reason + * $T_reply_last * $T_req(pv) * $T_rpl(pv) diff --git a/modules_k/tmx/doc/tmx_admin.xml b/modules_k/tmx/doc/tmx_admin.xml index 84ccc19..a8b2e32 100644 --- a/modules_k/tmx/doc/tmx_admin.xml +++ b/modules_k/tmx/doc/tmx_admin.xml @@ -347,6 +347,9 @@ tcontinue('123', '456', 'MYROUTE'); <emphasis>$T_reply_reason</emphasis> </para></listitem> <listitem><para> + <emphasis>$T_reply_last</emphasis> + </para></listitem> + <listitem><para> <emphasis>$T_req(pv)</emphasis> </para></listitem> <listitem><para> diff --git a/modules_k/tmx/t_var.c b/modules_k/tmx/t_var.c index 01b8494..11e3229 100644 --- a/modules_k/tmx/t_var.c +++ b/modules_k/tmx/t_var.c @@ -527,6 +527,49 @@ int pv_get_tm_reply_reason(struct sip_msg *msg, pv_param_t *param, return 0; } +int pv_get_tm_reply_last_received(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + struct cell *t; + tm_ctx_t *tcx = 0; + int code; + + if(msg==NULL || res==NULL) + return -1; + + /* Only for TM reply route */ + if (get_route_type() != TM_ONREPLY_ROUTE) { + LM_ERR("unsupported route_type %d\n", get_route_type()); + return -1; + } + + /* first get the transaction */ + if (_tmx_tmb.t_check( msg , 0 )==-1) return -1; + if ( (t=_tmx_tmb.t_gett())==0) { + /* no T */ + LM_ERR("could not get transaction\n"); + return -1; + } + + /* get the current branch index */ + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) { + LM_ERR("could not get tm context\n"); + return -1; + } + + /* get the last received reply code */ + code = t->uac[tcx->branch_index].last_received; + + LM_DBG("reply code is <%d>\n",code); + + res->rs.s = int2str( code, &res->rs.len); + + res->ri = code; + res->flags = PV_VAL_STR|PV_VAL_INT|PV_TYPE_INT; + return 0; +} + int pv_parse_t_name(pv_spec_p sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) diff --git a/modules_k/tmx/t_var.h b/modules_k/tmx/t_var.h index 248a58e..dbfd559 100644 --- a/modules_k/tmx/t_var.h +++ b/modules_k/tmx/t_var.h @@ -42,6 +42,8 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_tm_reply_reason(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_tm_reply_last_received(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); int pv_get_t(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 927feb1..c559f40 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -129,6 +129,9 @@ static pv_export_t mod_pvs[] = { { {"T_reply_reason", sizeof("T_reply_reason")-1}, PVT_OTHER, pv_get_tm_reply_reason, 0, 0, 0, 0, 0 }, + { {"T_reply_last", sizeof("T_reply_last")-1}, PVT_OTHER, + pv_get_tm_reply_last_received, 0, + 0, 0, 0, 0 }, { {"T_inv", sizeof("T_inv")-1}, PVT_OTHER, pv_get_t_var_inv, 0, pv_parse_t_var_name, 0, 0, 0 }, { {"T_req", sizeof("T_req")-1}, PVT_OTHER, pv_get_t_var_req, 0,

11 years, 5 months

git:alexh/for4.0: modules/rtpproxy: Add 'b' flag to add a branch specific string tot the call-id

by Alex Hermann

Module: sip-router Branch: alexh/for4.0 Commit: 7fb865dc1e72d52b0c0fb58590ccb32cd4fb5620 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fb865d… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Oct 11 18:43:07 2012 +0200 modules/rtpproxy: Add 'b' flag to add a branch specific string tot the call-id In a forking call, sometimes it is needed that each branch uses different options to the rtpproxy. This patch adds a parameter that makes each rtpproxy session unique to a branch by appending the value of a PV to the call-id rtpproxy parameter. --- modules/rtpproxy/README | 123 +++++++++++++++++++------------ modules/rtpproxy/doc/rtpproxy_admin.xml | 37 +++++++++ modules/rtpproxy/rtpproxy.c | 56 ++++++++++++++- 3 files changed, 168 insertions(+), 48 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7fb…

11 years, 5 months

git:alexh/for4.0: modules/avpops: avp_db_query: treat BIGINT result as INT, disregarding the most significant 32 bits.

by Alex Hermann

Module: sip-router Branch: alexh/for4.0 Commit: 593ee5eed33c4f7ae2988cabeb0d3313ad62a0e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=593ee5e… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Jul 4 17:33:50 2011 +0200 modules/avpops: avp_db_query: treat BIGINT result as INT, disregarding the most significant 32 bits. --- modules/avpops/avpops_db.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/avpops/avpops_db.c b/modules/avpops/avpops_db.c index b5caabe..f8a18fc 100644 --- a/modules/avpops/avpops_db.c +++ b/modules/avpops/avpops_db.c @@ -395,6 +395,10 @@ int db_query_avp(struct sip_msg *msg, char *query, pvname_list_t* dest) avp_val.n = (int)RES_ROWS(db_res)[i].values[j].val.int_val; break; + case DB1_BIGINT: + avp_val.n + = (int)RES_ROWS(db_res)[i].values[j].val.ll_val; + break; case DB1_DATETIME: avp_val.n = (int)RES_ROWS(db_res)[i].values[j].val.time_val;

11 years, 5 months

git:alexh/for4.0: modules/tm: Remember per-branch onreply_route and onfailure_route settings

by Alex Hermann

Module: sip-router Branch: alexh/for4.0 Commit: b695cc4b6f0a3711edf05e4195fae60f4eeeb151 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b695cc4… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Oct 11 18:28:34 2012 +0200 modules/tm: Remember per-branch onreply_route and onfailure_route settings The onreply and onfailure routes were set only per transaction. This means that when the onreply and/or failure route is changed in failure route (serial forking), late replies to earlier branches would use the new onreply and failure route instead of the routes set for them. This commit copies the transaction's onreply and failure routes to the branch, so the route set when the request is sent out is always chosen, no matter how late the reply arrives. Because the per-branch setting is copied after running onbranch_route, it is now also possible to set the routes per-branch instead of per-transaction. --- modules/tm/h_table.h | 4 ++++ modules/tm/t_fwd.c | 6 +++++- modules/tm/t_reply.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 8294001..f30bd45 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -247,6 +247,10 @@ typedef struct ua_client */ struct retr_buf *local_ack; #endif + /* the route to take if no final positive reply arrived */ + unsigned short on_failure; + /* the onreply_route to be processed if registered to do so */ + unsigned short on_reply; }ua_client_type; diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 76fb451..9659f6f 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -416,7 +416,11 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, } /* else next_hop==0 => no dst_uri / empty dst_uri and initial next_hop==0 => dst is pre-filled with a valid dst => use the pre-filled dst */ - + + /* Set on_reply and on_negative handlers for this branch to the handlers in the transaction */ + t->uac[branch].on_reply = t->on_reply; + t->uac[branch].on_failure = t->on_failure; + /* check if send_sock is ok */ if (t->uac[branch].request.dst.send_sock==0) { LOG(L_ERR, "ERROR: can't fwd to af %d, proto %d " diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 6fc7ee6..b79200b 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -986,19 +986,20 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, struct sip_msg *shmem_msg = t->uas.request; int on_failure; + on_failure = t->uac[picked_branch].on_failure; + /* failure_route for a local UAC? */ if (!shmem_msg) { LOG(L_WARN,"Warning: run_failure_handlers: no UAC support (%d, %d) \n", - t->on_failure, t->tmcb_hl.reg_types); + on_failure, t->tmcb_hl.reg_types); return 0; } /* don't start faking anything if we don't have to */ - if (unlikely(!t->on_failure && !has_tran_tmcbs( t, TMCB_ON_FAILURE))) { + if (unlikely(!on_failure && !has_tran_tmcbs( t, TMCB_ON_FAILURE))) { LOG(L_WARN, - "Warning: run_failure_handlers: no negative handler (%d, %d)\n", - t->on_failure, - t->tmcb_hl.reg_types); + "Warning: run_failure_handlers: no failure handler (%d, %d)\n", + on_failure, t->tmcb_hl.reg_types); return 1; } @@ -1013,11 +1014,10 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, if (unlikely(has_tran_tmcbs( t, TMCB_ON_FAILURE)) ) { run_trans_callbacks( TMCB_ON_FAILURE, t, &faked_req, rpl, code); } - if (t->on_failure) { + if (on_failure) { /* avoid recursion -- if failure_route forwards, and does not * set next failure route, failure_route will not be reentered * on failure */ - on_failure = t->on_failure; t->on_failure=0; if (exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE)>0) { /* run a failure_route action if some was marked */ @@ -1290,7 +1290,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, replies_dropped = 0; /* run ON_FAILURE handlers ( route and callbacks) */ if (unlikely(has_tran_tmcbs( Trans, TMCB_ON_FAILURE_RO|TMCB_ON_FAILURE) - || Trans->on_failure )) { + || Trans->uac[picked_branch].on_failure )) { extra_flags= ((Trans->uac[picked_branch].request.flags & F_RB_TIMEOUT)? FL_TIMEOUT:0) | @@ -2099,7 +2099,7 @@ int reply_received( struct sip_msg *p_msg ) goto done; } - onreply_route=t->on_reply; + onreply_route=uac->on_reply; if ( msg_status >= 200 ){ #ifdef TM_ONREPLY_FINAL_DROP_OK #warning Experimental tm onreply_route final reply DROP support active

11 years, 5 months

git:alexh/for4.0: modules/tm: add option to check callid when matching transactions

by Alex Hermann

Module: sip-router Branch: alexh/for4.0 Commit: e7b058ae650e1c36f5daceef0c2c605100b88991 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7b058a… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Aug 29 18:44:20 2011 +0200 modules/tm: add option to check callid when matching transactions Use this if you don't want replies/requests from broken clients, which send a mangled Call-ID, to match the transaction. For example when the UAC won't recognise the response anyway because of changed Call-ID, this setting will prevent accounting records to be created or failure_route to be skipped. --- modules/tm/README | 164 +++++++++++++++++++++++++------------------- modules/tm/config.c | 3 + modules/tm/config.h | 1 + modules/tm/doc/params.xml | 32 +++++++++ modules/tm/t_lookup.c | 24 ++++++- modules/tm/tm.c | 1 + 6 files changed, 150 insertions(+), 75 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e7b…

11 years, 5 months

git:master: permissions(k) Add RPC function calls that match functionality in old modules_s module

by Olle E. Johansson

Module: sip-router Branch: master Commit: 1ee54a1e511b98848fd2a6a5075009e2e0b4df06 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ee54a1… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Jan 8 12:52:44 2013 +0100 permissions(k) Add RPC function calls that match functionality in old modules_s module --- modules_k/permissions/README | 110 +++++++++++++++--- modules_k/permissions/address.c | 36 +++++-- modules_k/permissions/doc/permissions_admin.xml | 91 ++++++++++++++ modules_k/permissions/hash.c | 144 ++++++++++++++++++++++- modules_k/permissions/hash.h | 4 + modules_k/permissions/mi.c | 141 +++++++++++++++++++++-- modules_k/permissions/mi.h | 7 + modules_k/permissions/permissions.c | 62 ++++++++++- modules_k/permissions/trusted.c | 13 ++- 9 files changed, 562 insertions(+), 46 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1ee…

11 years, 5 months

[tracker] Task opened: Sanity checks lets invalid RURI through

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 - Andrew Pogrebennyk (marduk) Attached to Project - sip-router Summary - Sanity checks lets invalid RURI through Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - 3.3 Due in Version - Undecided Due Date - Undecided Details - We are using message and URI checks in sanity module: if(!sanity_check("1511", "7")) { xlog("L_WARN", "Malformed SIP message deteted - R=$ru ID=$ci\n"); sl_send_reply("483","Malformed SIP Message"); exit; } We've found that if the request comes in with broken RURI, the result of sanity check is still 1 which means passed: Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: INFO: <script>: New request - M=INVITE R=sip:%3A03581313184:03581313184@192.168.51.16 F=sip:43991001@192.168.51.16 T=sip:%3A03581313184:03581313184@192.168.51.16 IP=192.168.51.1:39851 (127.0.0.1:5060) ID=vGo5pfQRI9hwaVUAhcc4gZcXgl5jIHDr Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: DEBUG: maxfwd [mf_funcs.c:85]: value = 69 Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: DEBUG: sanity [mod_sanity.c:255]: sanity checks result: 1 Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: DEBUG: rr [loose.c:111]: No Route headers found Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: DEBUG: rr [loose.c:835]: There is no Route HF Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: DEBUG: <core> [strcommon.c:224]: unescaped string is <:03581313184> Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: DEBUG: <core> [parser/parse_uri.c:1259]: parse_uri: bad char ':' in state 0 parsed: <sip:> (4) / <sip::03581313184:03581313184@192.168.51.16> (42) Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: DEBUG: <core> [parser/parse_uri.c:1327]: ERROR: parse_sip_msg_uri: bad uri <sip::03581313184:03581313184@192.168.51.16> Jan 8 12:31:26 sp2 /usr/sbin/kamailio[1121]: ERROR: pv [pv_core.c:300]: failed to parse the R-URI Jan 7 15:39:24 sp2 /usr/sbin/kamailio[13257]: ERROR: <core> [lvalue.c:347]: non existing right pvar Jan 7 15:39:24 sp2 /usr/sbin/kamailio[13257]: ERROR: <core> [action.c:777]: ERROR: do_action: bad uri <sip::03581313184:03581313184@192.168.51.16>, dropping packet Jan 7 15:39:24 sp2 /usr/sbin/kamailio[13257]: ERROR: <core> [action.c:1525]: run action error at: :0 ^^ Additionally the filename and line number in the above error message "run action error at .." is missing. Please check. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=264 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.

11 years, 5 months

← Newer
1
...
22
23
24
25
26
27
28
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013