sr-dev August 2013

sr-dev@lists.kamailio.org

29 participants
150 discussions

git:mgw/free_faked_req: tm: fix memory leak in free_faked_req
by Matthew Williams 09 Aug '13

09 Aug '13

Module: sip-router Branch: mgw/free_faked_req Commit: f326b3070d8af8f84b3b9b077e029d43ec7f7000 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f326b30… Author: Matthew Williams <mgwilliams(a)gmail.com> Committer: Matthew Williams <mgwilliams(a)gmail.com> Date: Thu Aug 8 16:43:08 2013 -0700 tm: fix memory leak in free_faked_req --- modules/tm/t_reply.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 97b813f..ce1301a 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -973,6 +973,11 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t) faked_req->dst_uri.s = 0; } + if (faked_req->path_vec.s) { + pkg_free(faked_req->path_vec.s); + faked_req->path_vec.len=0; + } + /* free all types of lump that were added in failure handlers */ del_nonshm_lump( &(faked_req->add_rm) ); del_nonshm_lump( &(faked_req->body_lumps) );

2 2

[tracker] Comment added: SCA - Primary line appearance hangs when secondary is picked up.
by sip-router 09 Aug '13

09 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#329 - SCA - Primary line appearance hangs when secondary is picked up. User who did this - Andrew Mortensen (admorten) ---------- I've tested this myself now with the admorten/sca branch, and it appears to be working correctly. I'll commit the changes to the 4.x branch, and will let you know when it's done. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=329#comment1043 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.

1 0

git:mgw/free_faked_req: tm: properly check for double free in free_faked_req
by Matthew Williams 09 Aug '13

09 Aug '13

Module: sip-router Branch: mgw/free_faked_req Commit: 4fa0ba937e5bbbff1dfd19193ff32537d22b5f20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fa0ba9… Author: Matthew Williams <mgwilliams(a)gmail.com> Committer: Matthew Williams <mgwilliams(a)gmail.com> Date: Thu Aug 8 17:31:10 2013 -0700 tm: properly check for double free in free_faked_req --- modules/tm/t_reply.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index ce1301a..94c0927 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -975,7 +975,8 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t) if (faked_req->path_vec.s) { pkg_free(faked_req->path_vec.s); - faked_req->path_vec.len=0; + faked_req->path_vec.s = 0; + faked_req->path_vec.len = 0; } /* free all types of lump that were added in failure handlers */

1 0

[tracker] User took ownership: debugger: new RPC command dbg.reset_msgid
by sip-router 08 Aug '13

08 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#330 - debugger: new RPC command dbg.reset_msgid More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=330 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.

1 0

[tracker] Task opened: debugger: new RPC command dbg.reset_msgid (Attachment added)
by sip-router 08 Aug '13

08 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - debugger: new RPC command dbg.reset_msgid Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - This patch allows by a RPC command to reset the message sequential numbering (msg->id). I use this on my unit testing framework. I relay on the numbering of the messages and need not to restart kamailio for every test I make. I'm getting errors with fifo if I restart kamailio every 10 secs. will this change affect other parts of kamailio? One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=330 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.

1 0

git:master: Fixed two bugs related to new capture_mode changes.
by Lucian Balaceanu 07 Aug '13

07 Aug '13

Module: sip-router Branch: master Commit: 0c590e00796573681fd7ee0a99dd324919a9e4e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c590e0… Author: Dragos Dinu <dragos.dinu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Wed Aug 7 17:29:06 2013 +0300 Fixed two bugs related to new capture_mode changes. --- modules/sipcapture/sipcapture.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index c8f2fba..932ba4d 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -573,11 +573,6 @@ void * capture_mode_init(str *name, str * params) { goto error; } memcpy(n->name.s, name->s, n->name.len); - n->db_con = (db1_con_t *)pkg_malloc(sizeof(db1_con_t)); - if (!n->db_con){ - LM_ERR("no more pkg memory\n"); - goto error; - } n->table_names = (str *)pkg_malloc(sizeof(str)); if (!n->table_names){ LM_ERR("no more pkg memory\n"); @@ -599,9 +594,6 @@ error: if (n->name.s){ pkg_free(n->name.s); } - if (n->db_con){ - pkg_free(n->db_con); - } if (n->table_names){ pkg_free(n->table_names); } @@ -1073,7 +1065,6 @@ static void destroy(void) } if (c->db_con){ c->db_funcs.close(c->db_con); - pkg_free(c->db_con); } if (c->table_names){ pkg_free(c->table_names); @@ -1696,9 +1687,9 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * #ifdef STATISTICS if(msg->first_line.type==SIP_REPLY) { - sco.stat = cm_data->sipcapture_rpl; + sco.stat = (cm_data)?cm_data->sipcapture_rpl:capture_def->sipcapture_rpl; } else { - sco.stat = cm_data->sipcapture_req; + sco.stat = (cm_data)?cm_data->sipcapture_req:capture_def->sipcapture_req; } #endif //LM_DBG("DONE");

1 0

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support
by Richard Good 07 Aug '13

07 Aug '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 57b41189a08e3cfac6a47581d7c352713d5532fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57b4118… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Aug 7 09:50:07 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support ---

1 0

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media
by Richard Good 07 Aug '13

07 Aug '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 8f94babb588116043f8d5c406fdfc3d6b58e27ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f94bab… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Aug 7 09:49:08 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

1 0

git:master: Fix previous commit (forgot this file)
by admin＠sip-router.org 06 Aug '13

06 Aug '13

Module: sip-router Branch: master Commit: 93c39f86ce0cd337212579bd7bd1e58cabed79ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93c39f8… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Aug 7 01:20:43 2013 +0200 Fix previous commit (forgot this file) --- modules/dialog_ng/dlg_load.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/dialog_ng/dlg_load.h b/modules/dialog_ng/dlg_load.h index dc8407e..5f9c8a1 100644 --- a/modules/dialog_ng/dlg_load.h +++ b/modules/dialog_ng/dlg_load.h @@ -35,6 +35,8 @@ /* terminate_dlg function prototype */ typedef int (*terminate_dlg_f)(str *callid, str *ftag, str *ttag, str *hdrs, str *reason); +typedef int (*lookup_terminate_dlg_f)(unsigned int h_entry, unsigned int h_id, str *hdrs); + /* get the current dialog based on message function prototype */ typedef struct dlg_cell *(*get_dlg_f)(struct sip_msg *msg); @@ -45,6 +47,7 @@ struct dlg_binds { register_dlgcb_f register_dlgcb; register_dlgcb_nodlg_f register_dlgcb_nodlg; terminate_dlg_f terminate_dlg; + lookup_terminate_dlg_f lookup_terminate_dlg; set_dlg_variable_f set_dlg_var; get_dlg_variable_f get_dlg_var; get_dlg_expires_f get_dlg_expires;

1 0

git:master: Extension to the API: lookup_terminate_dlg(unsigned int, unsigned int, str hdrs)
by admin＠sip-router.org 06 Aug '13

06 Aug '13

Module: sip-router Branch: master Commit: 25240becdd83801a788b65f52eada5dd63665e8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25240be… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Aug 6 22:48:39 2013 +0200 Extension to the API: lookup_terminate_dlg(unsigned int, unsigned int, str hdrs) - Terminate a dialog using the API by providing h_entry and h_id (similar to the MI-Function) --- modules/dialog_ng/dialog.c | 1 + modules/dialog_ng/dlg_req_within.c | 18 ++++++++++++++++++ modules/dialog_ng/dlg_req_within.h | 1 + modules/dialog_ng/doc/dialog_ng.xml | 4 ++-- modules/dialog_ng/doc/dialog_ng_devel.xml | 29 +++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 2 deletions(-) diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index bcec0e5..4e1b547 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -321,6 +321,7 @@ int load_dlg(struct dlg_binds *dlgb) { dlgb->set_dlg_var = api_set_dlg_variable; dlgb->get_dlg_var = api_get_dlg_variable; dlgb->terminate_dlg = w_api_terminate_dlg; + dlgb->lookup_terminate_dlg = w_api_lookup_terminate_dlg; dlgb->get_dlg_expires = api_get_dlg_expires; dlgb->get_dlg = dlg_get_msg_dialog; diff --git a/modules/dialog_ng/dlg_req_within.c b/modules/dialog_ng/dlg_req_within.c index 9a2d598..2d366eb 100644 --- a/modules/dialog_ng/dlg_req_within.c +++ b/modules/dialog_ng/dlg_req_within.c @@ -519,3 +519,21 @@ int dlg_bye_all(struct dlg_cell *dlg, str *hdrs) { } + +/* Wrapper for terminating dialog from API - from other modules */ +int w_api_lookup_terminate_dlg(unsigned int h_entry, unsigned int h_id, str *hdrs) { + struct dlg_cell *dlg; + + dlg = lookup_dlg(h_entry, h_id); //increments ref count! + + if (!dlg) { + LM_ERR("Asked to tear down non existent dialog\n"); + return -1; + } + + unref_dlg(dlg, 1); + + return dlg_terminate(dlg, NULL, NULL/*reason*/, 2, hdrs); + +} + diff --git a/modules/dialog_ng/dlg_req_within.h b/modules/dialog_ng/dlg_req_within.h index 34316a5..43d11a7 100644 --- a/modules/dialog_ng/dlg_req_within.h +++ b/modules/dialog_ng/dlg_req_within.h @@ -53,6 +53,7 @@ int free_tm_dlg(dlg_t *td); int dlg_bye(struct dlg_cell *dlg, str *hdrs, int side); int dlg_bye_all(struct dlg_cell *dlg, str *hdrs); int w_api_terminate_dlg(str *call_id, str *from_tag, str *to_tag, str *hdrs, str* reason); +int w_api_lookup_terminate_dlg(unsigned int h_entry, unsigned int h_id, str *hdrs); int dlg_terminate(struct dlg_cell *dlg, struct sip_msg* msg, str *reason, int side, str *extra_headers); #endif diff --git a/modules/dialog_ng/doc/dialog_ng.xml b/modules/dialog_ng/doc/dialog_ng.xml index 7835c66..820538f 100644 --- a/modules/dialog_ng/doc/dialog_ng.xml +++ b/modules/dialog_ng/doc/dialog_ng.xml @@ -27,7 +27,7 @@ <firstname>Carsten</firstname> <surname>Bock</surname> <affiliation> - <orgname>ng-voice.com</orgname> + <orgname>ng-voice GmbH</orgname> </affiliation> <address> <email>carsten(a)ng-voice.com</email> @@ -88,7 +88,7 @@ <holder>Voice Sistem SRL</holder> </copyright> <copyright> - <year>2011</year> + <year>2011-2013</year> <holder>Carsten Bock, http://www.ng-voice.com</holder> </copyright> </bookinfo> diff --git a/modules/dialog_ng/doc/dialog_ng_devel.xml b/modules/dialog_ng/doc/dialog_ng_devel.xml index 148edd1..d6102b3 100644 --- a/modules/dialog_ng/doc/dialog_ng_devel.xml +++ b/modules/dialog_ng/doc/dialog_ng_devel.xml @@ -200,6 +200,35 @@ </listitem> </itemizedlist> </section> + + <section> + <title> + <function moreinfo="none">lookup_terminate_dlg (unsigned int h_entry, unsigned int h_id, hdrs)</function> + </title> + <para> + Terminate a Dialog identified by h_entry and h_id (similar to dlg_end_dlg command via XMLRPC). + </para> + <para>Meaning of parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>unsigned int h_entry</emphasis> - Number of the table, where to find the dialog + </para> + </listitem> + <listitem> + <para> + <emphasis>unsigned int h_id</emphasis> - Number of the entry in the table, where to find the dialog + terminate. + </para> + </listitem> + <listitem> + <para> + <emphasis>str* hdrs</emphasis> - string containg extra headers (full format) + to be added to the BYE requests of the dialog. + </para> + </listitem> + </itemizedlist> + </section> <section> <title>

1 0

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