sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

git:master: pkg/kamailio/centos: added mohqueue to CentOS build

by Peter Dunkley

Module: sip-router Branch: master Commit: 121e828e2bedd3f76a1343f7257978153e78fc8f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=121e828… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Tue Oct 8 02:37:43 2013 +0100 pkg/kamailio/centos: added mohqueue to CentOS build --- pkg/kamailio/centos/6/kamailio.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 620b2f8..eff49b7 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 4.1.0 -%define rel dev9.0%{dist} +%define rel dev9.4%{dist} @@ -458,6 +458,7 @@ fi %doc %{_docdir}/kamailio/modules/README.mi_datagram %doc %{_docdir}/kamailio/modules/README.mi_fifo %doc %{_docdir}/kamailio/modules/README.mi_rpc +%doc %{_docdir}/kamailio/modules/README.mohqueue %doc %{_docdir}/kamailio/modules/README.mqueue %doc %{_docdir}/kamailio/modules/README.msilo %doc %{_docdir}/kamailio/modules/README.msrp @@ -597,6 +598,7 @@ fi %{_libdir}/kamailio/modules/mi_datagram.so %{_libdir}/kamailio/modules/mi_fifo.so %{_libdir}/kamailio/modules/mi_rpc.so +%{_libdir}/kamailio/modules/mohqueue.so %{_libdir}/kamailio/modules/mqueue.so %{_libdir}/kamailio/modules/msilo.so %{_libdir}/kamailio/modules/msrp.so @@ -971,11 +973,12 @@ fi %changelog -* Mon Sep 30 2013 Peter Dunkley <peter.dunkley(a)crocodilertc.net> +* Mon Oct 7 2013 Peter Dunkley <peter.dunkley(a)crocodilertc.net> - Consolidating changelog for 4.1.0 into a single entry... - Added new modules to main package: - cnxcc - gzcompress + - mohqueue - rtpproxy-ng - sipt - stun (STUN functionality moved from compile time in core to own module)

11 years, 1 month

git:master: modules/mohqueue: created text README file from doc source

by Peter Dunkley

Module: sip-router Branch: master Commit: 03dbfd4c97290028212ddb04eea5faf5ef4ba007 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03dbfd4… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Tue Oct 8 02:27:24 2013 +0100 modules/mohqueue: created text README file from doc source --- modules/mohqueue/README | 406 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 406 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=03d…

11 years, 1 month

topoh Via parsing

by Klaus Darilion

Hi! On initial INVITE requests, topoh will add the following cookies to the messages (th_msg_received): Via: ...;TH=div TH: dih When the message is forwarded, the cookie will be parsed again in th_msg_sent():th_get_cookie(). th_get_cookie tries to parse the cookie from the header, and if this fails, from the Via header: th_get_via_cookie(msg, msg->via1); But I guess msg->via1 points to the newly added Via header. So, shouldn't this be th_get_via_cookie(msg, msg->via2); instead? But of course when processing replies then I guess it must be via1. So, maybe there should be different code for requests and responses. I found this because I accidentially deleted the TH header with keep_hf(); regards Klaus

11 years, 1 month

git:master: ims_charging: Add statistic ccr_timeouts

by Carsten Bock

Module: sip-router Branch: master Commit: a39adb3497b5b095126e835104d637669dee2a7e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a39adb3… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Oct 7 16:17:53 2013 +0200 ims_charging: Add statistic ccr_timeouts --- modules/ims_charging/README | 25 +++++++++++++++------- modules/ims_charging/doc/ims_charging_admin.xml | 4 +++ modules/ims_charging/ims_ro.c | 21 ++++++++++++++++++- modules/ims_charging/mod.c | 2 + modules/ims_charging/stats.h | 1 + 5 files changed, 44 insertions(+), 9 deletions(-) diff --git a/modules/ims_charging/README b/modules/ims_charging/README index 1b4d0ea..d6abf37 100644 --- a/modules/ims_charging/README +++ b/modules/ims_charging/README @@ -75,8 +75,11 @@ Carlos Ruiz Diaz 6.9. Failed final CCRs (failed_final_ccrs) 6.10. CCRs average response time (ccr_avg_response_time) 6.11. CCRs responses time (ccr_responses_time) - 6.12. Billed seconds (billed_secs) - 6.13. Killed calls (killed_calls) + 6.12. CCRs requests, which ended with a timeout + (ccr_timeouts) + + 6.13. Billed seconds (billed_secs) + 6.14. Killed calls (killed_calls) List of Examples @@ -155,8 +158,9 @@ Chapter 1. Admin Guide 6.9. Failed final CCRs (failed_final_ccrs) 6.10. CCRs average response time (ccr_avg_response_time) 6.11. CCRs responses time (ccr_responses_time) - 6.12. Billed seconds (billed_secs) - 6.13. Killed calls (killed_calls) + 6.12. CCRs requests, which ended with a timeout (ccr_timeouts) + 6.13. Billed seconds (billed_secs) + 6.14. Killed calls (killed_calls) 1. Overview @@ -645,8 +649,9 @@ n"); 6.9. Failed final CCRs (failed_final_ccrs) 6.10. CCRs average response time (ccr_avg_response_time) 6.11. CCRs responses time (ccr_responses_time) - 6.12. Billed seconds (billed_secs) - 6.13. Killed calls (killed_calls) + 6.12. CCRs requests, which ended with a timeout (ccr_timeouts) + 6.13. Billed seconds (billed_secs) + 6.14. Killed calls (killed_calls) 6.1. Initial CCRs (initial_ccrs) @@ -696,10 +701,14 @@ n"); Total CCA arrival time in milliseconds. -6.12. Billed seconds (billed_secs) +6.12. CCRs requests, which ended with a timeout (ccr_timeouts) + + Number of CCR-Requests, which ran into an timeout. + +6.13. Billed seconds (billed_secs) Number of seconds billed in total. -6.13. Killed calls (killed_calls) +6.14. Killed calls (killed_calls) Number of calls that were killed due to lack of credit. diff --git a/modules/ims_charging/doc/ims_charging_admin.xml b/modules/ims_charging/doc/ims_charging_admin.xml index e07b71e..a6ef005 100644 --- a/modules/ims_charging/doc/ims_charging_admin.xml +++ b/modules/ims_charging/doc/ims_charging_admin.xml @@ -634,6 +634,10 @@ route[CHARGING_CCR_REPLY] <para>Total CCA arrival time in milliseconds.</para> </section> <section> + <title>CCRs requests, which ended with a timeout (ccr_timeouts)</title> + <para>Number of CCR-Requests, which ran into an timeout.</para> + </section> + <section> <title>Billed seconds (billed_secs)</title> <para>Number of seconds billed in total.</para> </section> diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 1df9537..1748237 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -651,6 +651,12 @@ static void resume_on_interim_ccr(int is_timeout, void *param, AAAMessage *cca, struct interim_ccr *i_req = (struct interim_ccr *) param; Ro_CCA_t * ro_cca_data = NULL; + if (is_timeout) { + update_stat(ccr_timeouts, 1); + LM_ERR("Transaction timeout - did not get CCA\n"); + goto error; + } + update_stat(ccr_responses_time, elapsed_msecs); if (!i_req) { @@ -833,6 +839,12 @@ error0: static void resume_on_termination_ccr(int is_timeout, void *param, AAAMessage *cca, long elapsed_msecs) { Ro_CCA_t *ro_cca_data = NULL; + if (is_timeout) { + update_stat(ccr_timeouts, 1); + LM_ERR("Transaction timeout - did not get CCA\n"); + goto error; + } + update_stat(ccr_responses_time, elapsed_msecs); if (!cca) { @@ -1021,6 +1033,13 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, struct session_setup_data *ssd = (struct session_setup_data *) param; int error_code = RO_RETURN_ERROR; + if (is_timeout) { + update_stat(ccr_timeouts, 1); + LM_ERR("Transaction timeout - did not get CCA\n"); + error_code = RO_RETURN_ERROR; + goto error0; + } + update_stat(ccr_responses_time, elapsed_msecs); if (!cca) { @@ -1039,7 +1058,7 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, if (tmb.t_lookup_ident(&t, ssd->tindex, ssd->tlabel) < 0) { LM_ERR("t_continue: transaction not found\n"); error_code = RO_RETURN_ERROR; - goto error1; + goto error0; } // we bring the list of AVPs of the transaction to the current context diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index d275487..7c118e5 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -60,6 +60,7 @@ stat_var *successful_final_ccrs; stat_var *ccr_responses_time; stat_var *billed_secs; stat_var *killed_calls; +stat_var *ccr_timeouts; /** module functions */ static int mod_init(void); @@ -113,6 +114,7 @@ stat_export_t charging_stats[] = { {"ccr_responses_time", STAT_NO_RESET, &ccr_responses_time}, {"billed_secs", STAT_NO_RESET, &billed_secs}, {"killed_calls", STAT_NO_RESET, &killed_calls}, + {"ccr_timeouts", STAT_NO_RESET, &ccr_timeouts}, {0, 0, 0} }; diff --git a/modules/ims_charging/stats.h b/modules/ims_charging/stats.h index 3bba982..9b0e3fc 100644 --- a/modules/ims_charging/stats.h +++ b/modules/ims_charging/stats.h @@ -19,6 +19,7 @@ extern stat_var *successful_final_ccrs; extern stat_var *ccr_responses_time; extern stat_var *billed_secs; extern stat_var *killed_calls; +extern stat_var *ccr_timeouts; unsigned long get_failed_initial_ccrs(); unsigned long get_failed_interim_ccrs();

11 years, 1 month

Re: [sr-dev] sr-dev Digest, Vol 60, Issue 31

by Timo Teras

On Mon, 07 Oct 2013 15:07:37 +0200 sr-dev-request(a)lists.sip-router.org wrote: > Date: Mon, 07 Oct 2013 11:56:10 +0100 > From: Hugh Waite <hugh.waite(a)crocodile-rcs.com> > To: sr-dev(a)lists.sip-router.org > Subject: Re: [sr-dev] git:master: Merge branch 'tteras/mohqueue' > Message-ID: <5252934A.1090909(a)crocodile-rcs.com> > Content-Type: text/plain; charset=UTF-8; format=flowed > > Hi, > When I try to build (using the .spec file for CentOS) I get this > compile error. > > mohq_funcs.c: In function 'mohq_debug': > mohq_funcs.c:2327: error: too few arguments to function > 'get_debug_level' Sorry about this. Should have tested better in the real branch, instead of old releases. I added minimal fix that should fix the build error. And asked the author to look at better solution, e.g. remove the whole debug helper and use core functions directly if feasible (now that per-module debugging is possible). Then again, the debug helper seems to have per-queue things, so it might be needed to some degree. - Timo

11 years, 1 month

git:master: Merge branch 'tteras/mohqueue'

by Timo Teras

Module: sip-router Branch: master Commit: ca060f98bbecb407d5d29cbe19cec821d3990330 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca060f9… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Mon Oct 7 11:18:02 2013 +0300 Merge branch 'tteras/mohqueue' ---

11 years, 1 month

git:master: mohqueue: fix build error due to get_debug_level api change

by Timo Teras

Module: sip-router Branch: master Commit: e4e84c80232a5acc60b64adb541b54b6967189f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4e84c8… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Mon Oct 7 17:09:59 2013 +0300 mohqueue: fix build error due to get_debug_level api change Should have tested better before merging. Should probably remove the whole debug print helper and use core functions directly now that the core supports per-module debugging. --- modules/mohqueue/mohq_funcs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/mohqueue/mohq_funcs.c b/modules/mohqueue/mohq_funcs.c index d3e7ee9..ae0fc51 100644 --- a/modules/mohqueue/mohq_funcs.c +++ b/modules/mohqueue/mohq_funcs.c @@ -2324,7 +2324,7 @@ void mohq_debug (mohq_lst *pmohq, char *pfmt, ...) * o reset log level **********/ -int nsys_log = get_debug_level (); +int nsys_log = get_debug_level (LOG_MNAME, LOG_MNAME_LEN); int nmohq_log = (pmohq->mohq_flags & MOHQF_DBG) ? L_DBG : L_INFO; if (nmohq_log < L_DBG && nsys_log < L_DBG) { return; }

11 years, 1 month

Crash in free_sip_msg -> reset_ruid

by Hugh Waite

Hi, We've had some more crashes on the current master build. (gdb) bt #0 qm_insert_free (qm=0x7fc1e1b9e010, p=<value optimized out>) at mem/q_malloc.c:181 #1 qm_free (qm=0x7fc1e1b9e010, p=<value optimized out>) at mem/q_malloc.c:527 #2 0x000000000055027f in reset_ruid (msg=0x7fc1e1c35360) at parser/msg_parser.c:911 #3 free_sip_msg (msg=0x7fc1e1c35360) at parser/msg_parser.c:730 #4 0x00000000004a4012 in receive_msg (buf=<value optimized out>, len=<value optimized out>, rcv_info=<value optimized out>) at receive.c:297 #5 0x000000000052a251 in tcp_read_req (con=0x7fc1ca4c6e00, bytes_read=0x7fff041b327c, read_flags=0x7fff041b3274) at tcp_read.c:1387 #6 0x000000000052c53b in handle_io (fm=<value optimized out>, events=1, idx=-1) at tcp_read.c:1617 #7 0x000000000052eb69 in io_wait_loop_epoll (unix_sock=<value optimized out>) at io_wait.h:1092 #8 tcp_receive_loop (unix_sock=<value optimized out>) at tcp_read.c:1728 #9 0x00000000004fc0eb in tcp_init_children () at tcp_main.c:4959 #10 0x000000000046c3d5 in main_loop () at main.c:1702 #11 0x000000000046dec9 in main (argc=<value optimized out>, argv=<value optimized out>) at main.c:2533 (gdb) frame 2 #2 0x000000000055027f in reset_ruid (msg=0x7fc1e1c35360) at parser/msg_parser.c:911 911 pkg_free(msg->ruid.s); (gdb) p msg->ruid $7 = {s = 0x845d20 "", len = 20} Might this be related to the changes made on Sept 19th to the free_sip_msg functions? Regards, Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

11 years, 1 month

git:master: tm: Restore ruid value in sip_msg struct after creating transactions from branches

by Hugh Waite

Module: sip-router Branch: master Commit: 62860094af838710ee5b9892cfb9f99f615055f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6286009… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Mon Oct 7 10:01:56 2013 +0100 tm: Restore ruid value in sip_msg struct after creating transactions from branches - Fixes crash when freeing memory --- modules/tm/t_fwd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 0fb4be3..af4952b 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -630,6 +630,7 @@ error03: i_req->parsed_uri_ok=parsed_uri_ok_bak; i_req->path_vec=path_bak; i_req->instance=instance_bak; + i_req->ruid=ruid_bak; i_req->location_ua=ua_bak; /* Delete the duplicated lump lists, this will also delete

11 years, 1 month

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support

by Richard Good

Module: sip-router Branch: tmp/tm_async_reply_support Commit: a0e53295d53ecc113e800807ff002462b3732bcd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0e5329… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Oct 7 12:52:53 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support Conflicts: modules/tm/h_table.c ---

11 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2013