sr-dev August 2013

sr-dev@lists.kamailio.org

29 participants
150 discussions

git:master: permissions: fix ws support on allow_trusted function.
by Victor Seva 27 Aug '13

27 Aug '13

Module: sip-router Branch: master Commit: 573c9031a44168df356818f572f10f69791a1458 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=573c903… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Aug 27 00:03:49 2013 +0200 permissions: fix ws support on allow_trusted function. --- modules/permissions/trusted.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/permissions/trusted.c b/modules/permissions/trusted.c index ef79dc7..78c0b1e 100644 --- a/modules/permissions/trusted.c +++ b/modules/permissions/trusted.c @@ -512,7 +512,7 @@ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) return -1; } - if(proto.len!=3 && proto.len!=4) + if(proto.len<2 && proto.len>4) goto error; switch(proto.s[0]) {

2 2

permission module issue for WS proto
by Andreas Granig 26 Aug '13

26 Aug '13

Hi, In modules/permissions/trusted.c in function allow_trusted_2() there is if(proto.len!=3 && proto.len!=4) goto error; but later it checks for "ws" which is never reached due to len=2. Also the docs don't seem to be up to date in regards to support for WS and WSS. Unfortunately I'm travelling the next 3 days, maybe someone can quickly pick it up? Thanks, Andreas

2 1

git:master: permissions: update allow_trusted documentation.
by Victor Seva 26 Aug '13

26 Aug '13

Module: sip-router Branch: master Commit: 8097c2bccb2161f63900bbd5fb87a10eacdd282c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8097c2b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Aug 27 00:07:58 2013 +0200 permissions: update allow_trusted documentation. --- modules/permissions/doc/permissions_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/permissions/doc/permissions_admin.xml b/modules/permissions/doc/permissions_admin.xml index aff55ba..8e2ba00 100644 --- a/modules/permissions/doc/permissions_admin.xml +++ b/modules/permissions/doc/permissions_admin.xml @@ -1088,7 +1088,7 @@ if ($var(group) != -1) { Source address and transport protocol given in pvar arguments must be in string format. Valid transport protocol values are (ignoring case) "any", "udp, "tcp", "tls", - and "sctp". + "ws", "wss" and "sctp". </para> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.

1 0

git:master: tm: readme regenerated
by Daniel-Constantin Mierla 23 Aug '13

23 Aug '13

Module: sip-router Branch: master Commit: b2a536f0f577026ffa57d0b603c60e6232bc8e78 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2a536f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 23 21:04:06 2013 +0200 tm: readme regenerated --- modules/tm/README | 69 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 42 insertions(+), 27 deletions(-) diff --git a/modules/tm/README b/modules/tm/README index 090ea3f..2462d12 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -113,10 +113,11 @@ Juha Heinanen 5.41. t_check_trans() 5.42. t_set_disable_6xx(0|1) 5.43. t_set_disable_failover(0|1) - 5.44. t_replicate(params) - 5.45. t_relay_to(proxy, flags) - 5.46. t_set_no_e2e_cancel_reason(0|1) - 5.47. t_is_set(target) + 5.44. t_set_disable_internal_reply(0|1) + 5.45. t_replicate(params) + 5.46. t_relay_to(proxy, flags) + 5.47. t_set_no_e2e_cancel_reason(0|1) + 5.48. t_is_set(target) 6. TM Module API @@ -221,11 +222,12 @@ Juha Heinanen 1.79. t_check_trans usage 1.80. t_set_disable_6xx usage 1.81. t_set_disable_failover usage - 1.82. t_replicate usage + 1.82. t_set_disable_internal_reply usage 1.83. t_replicate usage - 1.84. t_set_no_e2e_cancel_reason usage - 1.85. t_replicate usage - 1.86. event_route[tm:branch-failure] usage + 1.84. t_replicate usage + 1.85. t_set_no_e2e_cancel_reason usage + 1.86. t_replicate usage + 1.87. event_route[tm:branch-failure] usage Chapter 1. Admin Guide @@ -327,10 +329,11 @@ Chapter 1. Admin Guide 5.41. t_check_trans() 5.42. t_set_disable_6xx(0|1) 5.43. t_set_disable_failover(0|1) - 5.44. t_replicate(params) - 5.45. t_relay_to(proxy, flags) - 5.46. t_set_no_e2e_cancel_reason(0|1) - 5.47. t_is_set(target) + 5.44. t_set_disable_internal_reply(0|1) + 5.45. t_replicate(params) + 5.46. t_relay_to(proxy, flags) + 5.47. t_set_no_e2e_cancel_reason(0|1) + 5.48. t_is_set(target) 6. TM Module API @@ -1594,10 +1597,11 @@ modparam("tm", "dns_reuse_rcv_socket", 1) 5.41. t_check_trans() 5.42. t_set_disable_6xx(0|1) 5.43. t_set_disable_failover(0|1) - 5.44. t_replicate(params) - 5.45. t_relay_to(proxy, flags) - 5.46. t_set_no_e2e_cancel_reason(0|1) - 5.47. t_is_set(target) + 5.44. t_set_disable_internal_reply(0|1) + 5.45. t_replicate(params) + 5.46. t_relay_to(proxy, flags) + 5.47. t_set_no_e2e_cancel_reason(0|1) + 5.48. t_is_set(target) 5.1. t_relay([host, port]) @@ -2505,7 +2509,19 @@ route { ... } -5.44. t_replicate(params) +5.44. t_set_disable_internal_reply(0|1) + + Turn off/on sending internally a SIP reply in case of relay errors. + + Example 1.82. t_set_disable_internal_reply usage +... +t_set_disable_internal_reply(1); # turn off sending internal reply on error +if(!t_relay()) { + send_reply("500", "Server error"); +} +... + +5.45. t_replicate(params) Replicate the SIP request to a specific address. @@ -2527,7 +2543,7 @@ route { * hostport - address in "host:port" format. It can be given via an AVP. - Example 1.82. t_replicate usage + Example 1.83. t_replicate usage ... # sent to 1.2.3.4:5060 over tcp t_replicate("sip:1.2.3.4:5060;transport=tcp"); @@ -2540,7 +2556,7 @@ t_replicate("sip:$var(h);transport=tls"); t_replicate_to_udp("1.2.3.4", "5060"); ... -5.45. t_relay_to(proxy, flags) +5.46. t_relay_to(proxy, flags) Forward the SIP request to a specific address, controlling internal behavior via flags. @@ -2558,11 +2574,10 @@ t_replicate_to_udp("1.2.3.4", "5060"); * flags - bitmask integer value to control the internal behavior. Bits can be: + 0x01 - do not generate 100 reply. - + 0x02 - do not generate reply on internal error (NOTE: has no - effect anymore). + + 0x02 - do not generate reply on internal error. + 0x04 - disable dns failover. - Example 1.83. t_replicate usage + Example 1.84. t_replicate usage ... # sent to 1.2.3.4:5060 over tcp t_relay_to("tcp:1.2.3.4:5060"); @@ -2574,7 +2589,7 @@ t_relay_to("tls:1.2.3.4"); t_relay_to("0x01"); ... -5.46. t_set_no_e2e_cancel_reason(0|1) +5.47. t_set_no_e2e_cancel_reason(0|1) Enables/disables reason header (RFC 3326) copying from the triggering received CANCEL to the generated hop-by-hop CANCEL. 0 enables and 1 @@ -2585,7 +2600,7 @@ t_relay_to("0x01"); See also: e2e_cancel_reason. - Example 1.84. t_set_no_e2e_cancel_reason usage + Example 1.85. t_set_no_e2e_cancel_reason usage ... route { ... @@ -2595,7 +2610,7 @@ opying ... } -5.47. t_is_set(target) +5.48. t_is_set(target) Return true if the attribute specified by 'target' is set for transaction. @@ -2608,7 +2623,7 @@ opying * onreply_route - the function returns true if an onreply route is set to be executed. - Example 1.85. t_replicate usage + Example 1.86. t_replicate usage ... if(!t_is_set("failure_route")) LM_DBG("no failure route will be executed for current transaction\n"); @@ -2795,7 +2810,7 @@ action *route) enabled with the t_on_branch_failure function. This event_route uses the BRANCH_FAILURE_ROUTE route type. - Example 1.86. event_route[tm:branch-failure] usage + Example 1.87. event_route[tm:branch-failure] usage ... route { t_on_branch_failure("myroute");

1 0

git:master: tm: updated xml docs with t_set_disable_internal_reply()
by Daniel-Constantin Mierla 23 Aug '13

23 Aug '13

Module: sip-router Branch: master Commit: 6073949aa224ea7a973058891a88a58cc0841860 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6073949… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 23 21:02:24 2013 +0200 tm: updated xml docs with t_set_disable_internal_reply() --- modules/tm/doc/functions.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index 5ee830c..464554f 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1428,6 +1428,26 @@ route { </example> </section> + <section id="tm.f.t_set_disable_internal_reply"> + <title> + <function>t_set_disable_internal_reply(0|1)</function> + </title> + <para> + Turn off/on sending internally a SIP reply in case of relay errors. + </para> + <example> + <title><function>t_set_disable_internal_reply</function> usage</title> + <programlisting> +... +t_set_disable_internal_reply(1); # turn off sending internal reply on error +if(!t_relay()) { + send_reply("500", "Server error"); +} +... + </programlisting> + </example> + </section> + <section id="tm.f.t_replicate"> <title> <function>t_replicate(params)</function>

1 0

git:master: tm: re-added the option for no-internal reply on error
by Daniel-Constantin Mierla 23 Aug '13

23 Aug '13

Module: sip-router Branch: master Commit: 0f2f9c85eff0b6ad35b4c58dfcde74c8a65559d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f2f9c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 23 20:53:55 2013 +0200 tm: re-added the option for no-internal reply on error - new function t_set_disable_internal_reply(0|1) to disable|enable this option per transaction - t_relay_to() flags re-enabled for this option --- modules/tm/h_table.h | 2 ++ modules/tm/t_funcs.c | 10 ++++++++++ modules/tm/tm.c | 13 +++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index e260d7e..3b71801 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -310,6 +310,8 @@ struct totag_elem { # define pass_provisional(_t_) ((_t_)->flags&T_PASS_PROVISIONAL_FLAG) #endif +#define T_DISABLE_INTERNAL_REPLY (1<<12) /* don't send internal negative reply */ + /* unsigned short should be enough for a retr. timer: max. 65535 ms => * max retr. = 65 s which should be enough and saves us 2*2 bytes */ typedef unsigned short retr_timeout_t; diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index e9d9598..531f4bd 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -358,12 +358,22 @@ handle_ret: /* we don't want to pass upstream any reply regarding replicating * a request; replicated branch must stop at us*/ if (likely(!replicate)) { + if(t->flags&T_DISABLE_INTERNAL_REPLY) { + /* flag set to don't generate the internal negative reply + * - let the transaction live further, processing should + * continue in config */ + DBG("not generating immediate reply for error %d\n", ser_error); + tm_error=ser_error; + ret = -4; + goto done; + } #ifdef TM_DELAYED_REPLY /* current error in tm_error */ tm_error=ser_error; set_kr(REQ_ERR_DELAYED); DBG("%d error reply generation delayed \n", ser_error); #else + reply_ret=kill_transaction( t, ser_error ); if (reply_ret>0) { /* we have taken care of all -- do nothing in diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 5b410c1..7df7ade 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -291,6 +291,7 @@ static int t_set_disable_failover(struct sip_msg* msg, char* on_off, char* f); static int t_set_no_e2e_cancel_reason(struct sip_msg* msg, char* on_off, char* f); #endif /* CANCEL_REASON_SUPPORT */ +static int t_set_disable_internal_reply(struct sip_msg* msg, char* on_off, char* f); static int t_branch_timeout(struct sip_msg* msg, char*, char*); static int t_branch_replied(struct sip_msg* msg, char*, char*); static int t_any_timeout(struct sip_msg* msg, char*, char*); @@ -456,6 +457,8 @@ static cmd_export_t cmds[]={ fixup_var_int_1, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, #endif /* CANCEL_REASON_SUPPORT */ + {"t_set_disable_internal_reply", t_set_disable_internal_reply, 1, fixup_var_int_1, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_branch_timeout", t_branch_timeout, 0, 0, FAILURE_ROUTE|EVENT_ROUTE}, {"t_branch_replied", t_branch_replied, 0, 0, @@ -1873,6 +1876,10 @@ T_SET_FLAG_GEN_FUNC(t_set_no_e2e_cancel_reason, T_NO_E2E_CANCEL_REASON) #endif /* CANCEL_REASON_SUPPORT */ +/* disable internal negative reply for the current transaction */ +T_SET_FLAG_GEN_FUNC(t_set_disable_internal_reply, T_DISABLE_INTERNAL_REPLY) + + /* script function, FAILURE_ROUTE and BRANCH_FAILURE_ROUTE only, * returns true if the choosed "failure" branch failed because of a timeout, * -1 otherwise */ @@ -2282,13 +2289,11 @@ inline static int w_t_relay_to(struct sip_msg *msg, char *proxy, char *flags) param.v.i = 0; t_set_auto_inv_100(msg, (char*)(&param), 0); } - /* no auto negative reply - not implemented */ - /* + /* no auto negative reply */ if(fl&2) { param.v.i = 1; - t_set_disable_internal_reply(msg, (char*)param, 0); + t_set_disable_internal_reply(msg, (char*)(&param), 0); } - */ /* no dns failover */ if(fl&4) { param.v.i = 1;

1 0

git:master: tm: removed note about no-implentation for no-reply flag for t_relay_to()
by Daniel-Constantin Mierla 23 Aug '13

23 Aug '13

Module: sip-router Branch: master Commit: ef9b69bbb54302e9985dd37d79831b6f80463fc1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef9b69b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 23 21:03:13 2013 +0200 tm: removed note about no-implentation for no-reply flag for t_relay_to() --- modules/tm/doc/functions.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index 464554f..b08c153 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1567,7 +1567,7 @@ t_replicate_to_udp("1.2.3.4", "5060"); </listitem> <listitem> <para><emphasis>0x02</emphasis> - do not generate reply on internal - error (NOTE: has no effect anymore). + error. </para> </listitem> <listitem>

1 0

git:master: Very basic DNS-Zone file-example for IMS ( for use in the online-tutorial on howto install IMS with Kamailio)
by Carsten Bock 23 Aug '13

23 Aug '13

Module: sip-router Branch: master Commit: 7255693f73bae008e5c7b6b560c52394f7c85308 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7255693… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Fri Aug 23 17:29:43 2013 +0200 Very basic DNS-Zone file-example for IMS (for use in the online-tutorial on howto install IMS with Kamailio) --- examples/ims_dnszone/kamailio-ims.org.dnszone | 34 +++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/examples/ims_dnszone/kamailio-ims.org.dnszone b/examples/ims_dnszone/kamailio-ims.org.dnszone new file mode 100644 index 0000000..9ee6ff5 --- /dev/null +++ b/examples/ims_dnszone/kamailio-ims.org.dnszone @@ -0,0 +1,34 @@ +$ORIGIN kamailio-ims.org. +$TTL 1W +@ 1D IN SOA localhost. root.localhost. ( + 2006101001 ; serial + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum + + 1D IN NS ns +ns 1D IN A 127.0.0.1 + +pcscf 1D IN A 127.0.0.1 +_sip.pcscf 1D SRV 0 0 5060 pcscf +_sip._udp.pcscf 1D SRV 0 0 5060 pcscf +_sip._tcp.pcscf 1D SRV 0 0 5060 pcscf + + +icscf 1D IN A 127.0.0.1 +_sip 1D SRV 0 0 5060 icscf +_sip._udp 1D SRV 0 0 5060 icscf +_sip._tcp 1D SRV 0 0 5060 icscf + +kamailio-ims.org. 1D IN A 127.0.0.1 +kamailio-ims.org. 1D IN NAPTR 10 50 "s" "SIP+D2U" "" _sip._udp +kamailio-ims.org. 1D IN NAPTR 20 50 "s" "SIP+D2T" "" _sip._tcp + +scscf 1D IN A 127.0.0.1 +_sip.scscf 1D SRV 0 0 5060 scscf +_sip._udp.scscf 1D SRV 0 0 5060 scscf +_sip._tcp.scscf 1D SRV 0 0 5060 scscf + +hss 1D IN A 127.0.0.1 +

1 0

git:master: pkg/kamailio/(centos|fedora): Added rtpproxy-ng module to the build
by Peter Dunkley 22 Aug '13

22 Aug '13

Module: sip-router Branch: master Commit: 134158df11ebf9b6c3deaf71b6010588535eb386 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=134158d… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Thu Aug 22 20:39:41 2013 +0100 pkg/kamailio/(centos|fedora): Added rtpproxy-ng module to the build --- pkg/kamailio/fedora/17/kamailio.spec | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index a18e5ec..2ceb8ea 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 4.1.0 -%define rel dev7.1%{dist} +%define rel dev7.2%{dist} @@ -613,6 +613,7 @@ fi %doc %{_docdir}/kamailio/modules/README.rr %doc %{_docdir}/kamailio/modules/README.rtimer %doc %{_docdir}/kamailio/modules/README.rtpproxy +%doc %{_docdir}/kamailio/modules/README.rtpproxy-ng %doc %{_docdir}/kamailio/modules/README.sanity %doc %{_docdir}/kamailio/modules/README.sca %doc %{_docdir}/kamailio/modules/README.sdpops @@ -753,6 +754,7 @@ fi %{_libdir}/kamailio/modules/rr.so %{_libdir}/kamailio/modules/rtimer.so %{_libdir}/kamailio/modules/rtpproxy.so +%{_libdir}/kamailio/modules/rtpproxy-ng.so %{_libdir}/kamailio/modules/sanity.so %{_libdir}/kamailio/modules/sca.so %{_libdir}/kamailio/modules/seas.so @@ -1155,6 +1157,8 @@ fi %changelog +* Thu Aug 22 2013 Peter Dunkley <peter(a)dunkley.me.uk> + - Added rtpproxy-ng module to build * Wed Aug 14 2013 Peter Dunkley <peter(a)dunkley.me.uk> - Updated rel to dev7 * Mon May 27 2013 Peter Dunkley <peter(a)dunkley.me.uk>

1 0

rtpproxy-ng in master
by Peter Dunkley 22 Aug '13

22 Aug '13

Hello, I know Juha mentioned this last month, but I think it would be helpful if the rtpproxy-ng module were merged into Git master. >From my point-of-view it would help with the packaging and testing I do with Kamailio (and the live system I am running that is based on master). The module looks quite stand-alone so I don't think there is any risk of anything being broken by putting it into master. BTW, thanks for all the excellent work there! Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 2

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2013