sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

git:master: core: proper destroy of tcp connection at shutdown
by Daniel-Constantin Mierla 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: b3d312bc3795f394e5907ac54bb59560e829e38b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3d312b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 21 21:39:07 2014 +0200 core: proper destroy of tcp connection at shutdown - don't access connection fields after freeing structure --- tcp_main.c | 8 ++++---- 1 files changed, 4 … [View More]

1 0

git:master: xlog: clean exit at startup in case on error looking up facility
by Daniel-Constantin Mierla 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: 9f8f66c44f5d44f945bba3b63160967a19044b8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f8f66c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 21 21:40:15 2014 +0200 xlog: clean exit at startup in case on error looking up facility --- modules/xlog/xlog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/… [View More]

1 0

git:master: modules/sdpops: added sdp_transport(pv) function
by Juha Heinanen 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: 5ce86dca571fab39f96855bc63191d9abe5914e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ce86dc… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 21 19:24:30 2014 +0300 modules/sdpops: added sdp_transport(pv) function --- modules/sdpops/README | 101 ++++++++++++++++++++-------------- modules/sdpops/doc/sdpops_admin.xml | 22 ++++++++ modules/… [View More]

1 0

New commits on branch master
by Daniel-Constantin Mierla 21 Apr '14

21 Apr '14

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0bda1dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 21 17:57:09 2014 +0200 core: safety check accessing variables in dbg message during fixup operation URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=511de7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 21 17:56:01 2014 +0200 core: link regex before replacement … [View More]

1 0

git:master: modules/tmx: fixed typo in $T_branch README listing
by Juha Heinanen 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: a55e0f0fd7cf028c3263bcce30ec808ff08568da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a55e0f0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 21 18:35:30 2014 +0300 modules/tmx: fixed typo in $T_branch README listing --- modules/tmx/README | 2 +- modules/tmx/doc/tmx_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff … [View More]

1 0

git:master: modules/tmx: replaced $T_reply_flags with $T_branch(flags)
by Juha Heinanen 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: 9708bcfbb49586661aa96b34bd8c317a5dbd2006 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9708bcf… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 21 18:31:30 2014 +0300 modules/tmx: replaced $T_reply_flags with $T_branch(flags) --- modules/tmx/README | 1 + modules/tmx/doc/tmx_admin.xml | 3 ++ modules/tmx/t_var.c | 58 ++++++++++++… [View More]++++++++++++++++++++++++++++- modules/tmx/t_var.h | 4 +- modules/tmx/tmx_mod.c | 5 +-- 5 files changed, 65 insertions(+), 6 deletions(-) diff --git a/modules/tmx/README b/modules/tmx/README index c317ff5..f78516b 100644 --- a/modules/tmx/README +++ b/modules/tmx/README @@ -353,6 +353,7 @@ event_route [tm:branch-failure:contact] { * $T_req(pv) * $T_rpl(pv) * $T_reply_ruid + * $T_branch(pv) Exported pseudo-variables are documented at http://www.kamailio.org/wiki/. diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index 2496e64..8bae5ea 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -388,6 +388,9 @@ event_route [tm:branch-failure:contact] { <listitem><para> <emphasis>$T_reply_ruid</emphasis> </para></listitem> + <listitem><para> + <emphasis>$T_branch(pv)</emphasis> + </para></listitem> </itemizedlist> <para> Exported pseudo-variables are documented at &kamwikilink;. diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c index 4d38d6b..6f7d346 100644 --- a/modules/tmx/t_var.c +++ b/modules/tmx/t_var.c @@ -322,6 +322,20 @@ int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, return pv_get_spec_value(&_pv_trpl.msg, pv, res); } +int pv_get_t_var_branch(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + pv_spec_t *pv=NULL; + + if(pv_t_update_rpl(msg)) + return pv_get_null(msg, param, res); + + pv = (pv_spec_t*)param->pvn.u.dname; + if(pv==NULL || pv_alter_context(pv)) + return pv_get_null(msg, param, res); + + return pv_get_spec_value(&_pv_trpl.msg, pv, res); +} int pv_get_t_var_inv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) @@ -616,6 +630,11 @@ int pv_parse_t_name(pv_spec_p sp, str *in) switch(in->len) { + case 5: + if(strncmp(in->s, "flags", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; case 8: if(strncmp(in->s, "id_label", 8)==0) sp->pvp.pvn.u.isname.name.n = 0; @@ -644,7 +663,7 @@ int pv_parse_t_name(pv_spec_p sp, str *in) return 0; error: - LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + LM_ERR("unknown PV name %.*s\n", in->len, in->s); return -1; } @@ -687,3 +706,40 @@ int pv_get_t(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, t->label); } } + +int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + tm_cell_t *t; + int branch; + + if ((msg == NULL) || (param == NULL)) return -1; + + t = _tmx_tmb.t_gett(); + if ((t == NULL) || (t == T_UNDEFINED)) { + /* no T */ + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 5: + switch (get_route_type()) { + case FAILURE_ROUTE: + case BRANCH_FAILURE_ROUTE: + /* use the reason of the winning reply */ + if ((branch=_tmx_tmb.t_get_picked_branch()) < 0) { + LM_CRIT("no picked branch (%d) for a final response" + " in MODE_ONFAILURE\n", branch); + return -1; + } + res->ri = t->uac[branch].branch_flags; + res->flags = PV_VAL_INT; + LM_INFO("branch flags is [%u]\n", res->ri); + break; + default: + LM_ERR("unsupported route_type %d\n", get_route_type()); + return -1; + } + } + return 0; +} diff --git a/modules/tmx/t_var.h b/modules/tmx/t_var.h index 3fedb60..d2d8678 100644 --- a/modules/tmx/t_var.h +++ b/modules/tmx/t_var.h @@ -40,8 +40,8 @@ int pv_get_tm_branch_idx(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_tm_reply_ruid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); -int pv_get_tm_reply_flags(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res); +int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); 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, diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index affc53c..dc8b42c 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -124,9 +124,6 @@ static pv_export_t mod_pvs[] = { { {"T_reply_ruid", sizeof("T_reply_ruid")-1}, PVT_OTHER, pv_get_tm_reply_ruid, 0, 0, 0, 0, 0 }, - { {"T_reply_flags", sizeof("T_reply_flags")-1}, PVT_OTHER, - pv_get_tm_reply_flags, 0, - 0, 0, 0, 0 }, { {"T_reply_code", sizeof("T_reply_code")-1}, PVT_OTHER, pv_get_tm_reply_code, 0, 0, 0, 0, 0 }, @@ -144,6 +141,8 @@ static pv_export_t mod_pvs[] = { pv_parse_t_var_name, 0, 0, 0 }, { {"T", sizeof("T")-1}, PVT_OTHER, pv_get_t, 0, pv_parse_t_name, 0, 0, 0 }, + { {"T_branch", sizeof("T_branch")-1}, PVT_OTHER, pv_get_t_branch, 0, + pv_parse_t_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; [View Less]

1 0

git:master: modules/tmx: added $T_reply_flags pv and fixed bug in t_reuse_branch()
by Juha Heinanen 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: 9051ab74c9f6b97580a832e66385747c94c94380 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9051ab7… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Apr 20 15:17:22 2014 +0300 modules/tmx: added $T_reply_flags pv and fixed bug in t_reuse_branch() --- modules/tmx/t_var.c | 15 +++++++++++++++ modules/tmx/t_var.h | 2 ++ modules/tmx/tmx_mod.c | 5 ++++- 3 … [View More]files changed, 21 insertions(+), 1 deletions(-) diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c index 897f156..4fe974e 100644 --- a/modules/tmx/t_var.c +++ b/modules/tmx/t_var.c @@ -322,6 +322,21 @@ int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, return pv_get_spec_value(&_pv_trpl.msg, pv, res); } +int pv_get_t_var_branch(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + pv_spec_t *pv=NULL; + + if(pv_t_update_rpl(msg)) + return pv_get_null(msg, param, res); + + pv = (pv_spec_t*)param->pvn.u.dname; + if(pv==NULL || pv_alter_context(pv)) + return pv_get_null(msg, param, res); + + return pv_get_spec_value(&_pv_trpl.msg, pv, res); +} + int pv_get_t_var_inv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules/tmx/t_var.h b/modules/tmx/t_var.h index 46e8a50..3fedb60 100644 --- a/modules/tmx/t_var.h +++ b/modules/tmx/t_var.h @@ -40,6 +40,8 @@ int pv_get_tm_branch_idx(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_tm_reply_ruid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_tm_reply_flags(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); 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, diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index 5b2d490..affc53c 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -124,6 +124,9 @@ static pv_export_t mod_pvs[] = { { {"T_reply_ruid", sizeof("T_reply_ruid")-1}, PVT_OTHER, pv_get_tm_reply_ruid, 0, 0, 0, 0, 0 }, + { {"T_reply_flags", sizeof("T_reply_flags")-1}, PVT_OTHER, + pv_get_tm_reply_flags, 0, + 0, 0, 0, 0 }, { {"T_reply_code", sizeof("T_reply_code")-1}, PVT_OTHER, pv_get_tm_reply_code, 0, 0, 0, 0, 0 }, @@ -611,7 +614,7 @@ static int w_t_reuse_branch(struct sip_msg* msg, char *p1, char *p2) } else { reset_path_vector(msg); } - setbflagsval(0, t->uac[branch].flags); + setbflagsval(0, t->uac[branch].branch_flags); set_instance(msg, &(t->uac[branch].instance)); return 1; default: [View Less]

2 2

git:master: modules/tmx: removed unused function
by Juha Heinanen 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: d771fbfe982548e5fc2b087d3e1897e9011d5dd6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d771fbf… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 21 17:34:33 2014 +0300 modules/tmx: removed unused function --- modules/tmx/t_var.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c … [View More]

1 0

git:master: tm: free struct contacts in case of error retrieving r-uri in t_load_contacts( )
by Daniel-Constantin Mierla 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: 770434e87ec14b9662314e8a13d587f547e876cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=770434e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 21 11:12:23 2014 +0200 tm: free struct contacts in case of error retrieving r-uri in t_load_contacts() --- modules/tm/t_serial.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(… [View More]

1 0

git:master: core: fix some #includes to be posix compliant
by Timo Teras 21 Apr '14

21 Apr '14

Module: sip-router Branch: master Commit: 2c74ba02c843349a6ad30f7e668a7a194dac679c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c74ba0… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Mon Apr 21 10:57:11 2014 +0300 core: fix some #includes to be posix compliant sys/poll.h and sys/fcntl.h are GNUisms and might not exist on strictly posix compliant systems. This fixes to use the posix specified standard … [View More]

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
31
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 2014