sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

git:tteras/mohqueue: mohqueue schema files

by Timo Teras

Module: sip-router Branch: tteras/mohqueue Commit: 1af34ca5b9f799b83242a9ecddf8abe9521114dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1af34ca… Author: Robert Boisvert <rdboisvert(a)gmail.com> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu Oct 3 11:36:08 2013 -0400 mohqueue schema files --- lib/srdb1/schema/kamailio-mohqueue.xml | 14 ++++++ lib/srdb1/schema/mohqcalls.xml | 76 ++++++++++++++++++++++++++++++++ lib/srdb1/schema/mohqueues.xml | 75 +++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/kamailio-mohqueue.xml b/lib/srdb1/schema/kamailio-mohqueue.xml new file mode 100644 index 0000000..27d9a0d --- /dev/null +++ b/lib/srdb1/schema/kamailio-mohqueue.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<database xmlns:xi="http://www.w3.org/2001/XInclude"> + <name>mohqueue</name> + <xi:include href="mohqcalls.xml"/> + <xi:include href="mohqueues.xml"/> +</database> diff --git a/lib/srdb1/schema/mohqcalls.xml b/lib/srdb1/schema/mohqcalls.xml new file mode 100644 index 0000000..6c99ec2 --- /dev/null +++ b/lib/srdb1/schema/mohqcalls.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="mohqcalls" xmlns:db="http://docbook.org/ns/docbook"> + <name>mohqcalls</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the mohqueue module to store call information. This is a read-only table from the viewpoint of outside processes. More information about the mohqueue module can be found at: &KAMAILIO_MOD_DOC;mohqueue.html + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + + <column id="mohq_id"> + <name>mohq_id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <description>queue id</description> + </column> + + <column id="call_id"> + <name>call_id</name> + <type>string</type> + <size>100</size> + <description>Call-ID header</description> + </column> + + <column id="call_status"> + <name>call_status</name> + <type>unsigned int</type> + <description>status of call</description> + </column> + + <column id="call_from"> + <name>call_from</name> + <type>string</type> + <size>100</size> + <description>From header</description> + </column> + + <column id="call_contact"> + <name>call_contact</name> + <type>string</type> + <size>100</size> + <null/> + <description>Contact header</description> + </column> + + <column id="call_time"> + <name>call_time</name> + <type>datetime</type> + <default db="oracle">to_date('','yyyy-mm-dd hh24:mi:ss')</default> + <description>time when call first entered queue</description> + </column> + + <index> + <name>mohqcalls_idx</name> + <colref linkend="call_id" /> + <unique/> + </index> +</table> diff --git a/lib/srdb1/schema/mohqueues.xml b/lib/srdb1/schema/mohqueues.xml new file mode 100644 index 0000000..168e1ca --- /dev/null +++ b/lib/srdb1/schema/mohqueues.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="mohqueues" xmlns:db="http://docbook.org/ns/docbook"> + <name>mohqueues</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the mohqueue module to store queue definitions. This is a read-only table from the viewpoint of the module. More information about the mohqueue module can be found at: &KAMAILIO_MOD_DOC;mohqueue.html + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + + <column id="name"> + <name>name</name> + <type>string</type> + <size>25</size> + <description>queue name</description> + </column> + + <column id="uri"> + <name>uri</name> + <type>string</type> + <size>100</size> + <description>URI for the queue</description> + </column> + + <column id="mohdir"> + <name>mohdir</name> + <type>string</type> + <size>100</size> + <null/> + <description>directory for MOH files</description> + </column> + + <column id="mohfile"> + <name>mohfile</name> + <type>string</type> + <size>100</size> + <description>base name for the MOH file</description> + </column> + + <column id="debug"> + <name>debug</name> + <type>int</type> + <description>debug flag</description> + </column> + + <index> + <name>mohqueue_uri_idx</name> + <colref linkend="uri" /> + <unique/> + </index> + + <index> + <name>mohqueue_name_idx</name> + <colref linkend="name" /> + <unique/> + </index> +</table>

10 years, 7 months

[tracker] Comment added: presence_dialoginfo -> force_single doesn't sent most relevant xml

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#341 - presence_dialoginfo -> force_single doesn't sent most relevant xml User who did this - Devs Voicenter (voicenter) ---------- I saw the reply just now (apparently the notification to email by default is off :/ ) I'll fix it and re-apply new one. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=341#comment1104 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.

10 years, 7 months

New commits on branch master

by Andrew Mortensen

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8f3d34… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sat Oct 5 13:14:09 2013 -0400 modules/sca: fix compiler warning for macro. - correct "always evaluates to true" when using address of stack variable. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f0043b… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Sep 19 13:49:24 2013 -0400 modules/sca: fix return value of sca_call_info_uri_update() - return value of 0 can bubble up as return value of sca_call_info_update(), causing early script termination (exported function returning 0 in script is equivalent to "exit") - report and patch from Timo Teräs URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2efe3e3… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Aug 20 15:54:17 2013 -0400 modules/sca: AoR should not be treated as SCA if there are no subscribers. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58a47ac… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Aug 20 15:14:26 2013 -0400 modules/sca: improved handling of host-only Contact URIs URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b1f875… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Jul 22 00:48:46 2013 -0400 modules/sca: restore missing prototype. sca_subscription_aor_has_subscribers URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97653df… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Jul 22 00:42:18 2013 -0400 modules/sca: detect when an AoR is no longer SCA. Don't, for example, create an appearance for callees that do not send a Call-Info header, and whose AoR also has no subscribers. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6f8037… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Jul 22 00:37:32 2013 -0400 modules/sca: Clear stale line-seize appearances via timer. Some badly behaved/buggy UAs don't know when to say when. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84d1981… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Jun 13 16:06:10 2013 -0400 modules/sca: fix regression: restore purge expired timer URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0fb2a6… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Jun 13 15:34:00 2013 -0400 modules/sca: clear appearance on receipt of out-of-dialog SUBSCRIBE - If a call-info SUBSCRIBE with no To-tag arrives from a subscriber with an active subscription, release any appearances owned by the subscriber, on the assumption that the subscriber has lost track of SCA (reboot, power/network loss). URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef9b12d… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Jun 13 15:30:40 2013 -0400 modules/sca: detect and clear orphaned appearances caused by answer glare - set appearance state created by SCA callee answer to ACTIVE_PENDING, and promote to ACTIVE on ACK from caller. If no ACK from caller is received within 30 seconds (enough time for retransmission to fail), the ACTIVE_PENDING appearance will be cleared by the sca_appearance_purge_stale timer. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ef4587… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed May 15 16:13:23 2013 -0400 modules/sca: reconcile Contact and From URIs in ACK callback. - fix Music-on-Hold in Polycoms when SCA caller has MoH enabled and SCA callee does SCA hold/pickup with identical To & From URIs. Previously, module would end up looking up an appearance for callee in ACK callback instead of caller. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=185bd40… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue May 14 16:25:06 2013 -0400 modules/sca: improved BYE handling. - Clear appearances for both legs on BYE request if possible. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36ad807… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue May 14 16:23:46 2013 -0400 modules/sca: free previous appearance owner, callee, dialog if non-NULL. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb21b5e… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu May 2 15:12:16 2013 -0400 modules/sca: change logging level for failed lookup by appearance-index. - appearance-index won't be found yet if SCA callee is answering, logging at WARN is misleading. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98b8ba0… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Apr 30 23:31:12 2013 -0400 modules/sca: space-separate dialog tags in sca.all_appearances output URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=002dc46… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Apr 30 23:10:10 2013 -0400 modules/sca: track appearance times. Include time of last state chance in sca.all_appearances output. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac29844… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed Apr 24 11:30:35 2013 -0400 modules/sca: add sca.subscription_count to rpc exports list. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=815d70e… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed Apr 24 01:18:27 2013 -0400 modules/sca: RPC: fix sca.show_subscription, add sca.subscription_count - sca.subscription_count will eventually be subsumed by sca.stats. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e0af20… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Apr 18 13:52:10 2013 -0400 modules/sca: fall back to tag lookup if lookup by index fails. - Fix appearance tracking for SCA implementations with inconsistent Call-Info header inclusion. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6f0383… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Apr 15 20:16:36 2013 -0400 modules/sca: add SCA_DB_DEFAULT_FETCH_ROW_COUNT URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=562e49d… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Apr 15 20:11:08 2013 -0400 modules/sca: use DB fetch queries when restoring subscribers from database. - Previously used standard query, exhausting pkg memory when subscriber count is high. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92114b5… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Apr 15 20:09:01 2013 -0400 modules/sca: only check if callee is SCA if callee_aor has a value. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e97084… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Apr 15 17:17:05 2013 -0400 modules/sca: add check for empty AoR in lock_shared_appearance calls. - Sanity checking URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6cdc9c4… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Apr 11 22:34:10 2013 -0400 modules/sca: clear appearance on t_reply with error after receiving 18x. - Receiving a 18x provisional reply triggers line-seize subscription termination. Releasing the seized appearance while processing a t_reply with an error status *after* getting a 18x would fail because sca_subscription_terminate could not find a matching line-seize subscription. In that case, look up appearance by tags and release it.

10 years, 7 months

[tracker] Task opened: pua_reginfo: Duplicate contacts in the location table (Attachment added)

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 - Wonbin Cho (wbcho) Attached to Project - sip-router Summary - pua_reginfo: Duplicate contacts in the location table Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - Found a bug that the same contact for an AOR is inserted into the location table every time when receiving the 'reg' event notifications. Attached is a patch to fix this duplication. It will properly reflect the `use_domain` parameter for the USRLOC module. Thanks! 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=350 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.

10 years, 7 months

Htable dmq integration

by Charles Chance

Hi, Not sure whether it is appropriate to get this in before the upcoming freeze or wait until after. I have the additions to htable module nearly ready for review. What is the most convenient - patch or private branch? Just completing tests but should be available tomorrow or day after. I have kept disruption to existing code to a minimum and added all functions into a separate file. New functionality is disabled by default and must be enabled on a per table basis. What are everyone's thoughts? Maybe it is too close to deadline for such a new feature? Very happy to try though :) Cheers, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Unit 10 iBIC, Birmingham Science Park, Holt Court South, Birmingham B7 4EJ.

10 years, 7 months

git:master: dmq: fix memory leak in dmq_send_message()

by Charles Chance

Module: sip-router Branch: master Commit: 28978be4d825e08a455387209af6dda4aa4bdfde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28978be… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Fri Oct 4 18:40:42 2013 +0100 dmq: fix memory leak in dmq_send_message() --- modules/dmq/dmq_funcs.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c index cacf89f..df17fb9 100644 --- a/modules/dmq/dmq_funcs.c +++ b/modules/dmq/dmq_funcs.c @@ -166,7 +166,7 @@ int dmq_send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, { uac_req_t uac_r; str str_hdr = {0, 0}; - str from, to, req_uri; + str from, to; dmq_cback_param_t* cb_param = NULL; int result = 0; int len = 0; @@ -199,11 +199,10 @@ int dmq_send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, LM_ERR("error building to string\n"); goto error; } - req_uri = to; set_uac_req(&uac_r, &dmq_request_method, &str_hdr, body, NULL, TMCB_LOCAL_COMPLETED, dmq_tm_callback, (void*)cb_param); - result = tmb.t_request(&uac_r, &req_uri, + result = tmb.t_request(&uac_r, &to, &to, &from, NULL); if(result < 0) { @@ -211,9 +210,15 @@ int dmq_send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, goto error; } pkg_free(str_hdr.s); + pkg_free(from.s); + pkg_free(to.s); return 0; error: pkg_free(str_hdr.s); + if (from.s!=NULL) + pkg_free(from.s); + if (to.s!=NULL) + pkg_free(to.s); return -1; }

10 years, 7 months

git:master: nathelper: set_contact_alias() new function for adding alias parameter to contact uri

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 58659b0cabb623c6420c186755c968b4550ff09c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58659b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 3 09:16:38 2013 +0200 nathelper: set_contact_alias() new function for adding alias parameter to contact uri - similar to add_contact_alias(), but this works like fix_nated_contact(), in the way that new contact uri is immediately visible to other modules (e.g., dialog, presence) --- modules/nathelper/nathelper.c | 70 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 7cccdc1..6f0d28e 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -288,6 +288,7 @@ static int nat_uac_test_f(struct sip_msg* msg, char* str1, char* str2); static int fix_nated_contact_f(struct sip_msg *, char *, char *); static int add_contact_alias_0_f(struct sip_msg *, char *, char *); static int add_contact_alias_3_f(struct sip_msg *, char *, char *, char *); +static int set_contact_alias_f(struct sip_msg* msg, char* str1, char* str2); static int handle_ruri_alias_f(struct sip_msg *, char *, char *); static int pv_get_rr_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int pv_get_rr_top_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); @@ -368,6 +369,9 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"add_contact_alias", (cmd_function)add_contact_alias_3_f, 3, fixup_add_contact_alias, 0, + REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, + {"set_contact_alias", (cmd_function)set_contact_alias_f, 0, + 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"handle_ruri_alias", (cmd_function)handle_ruri_alias_f, 0, 0, 0, @@ -846,6 +850,72 @@ fix_nated_contact_f(struct sip_msg* msg, char* str1, char* str2) return 1; } +/* + * Replaces ip:port pair in the Contact: field with the source address + * of the packet. + */ +static int +set_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) +{ + char nbuf[MAX_URI_SIZE]; + str nuri; + int br; + + int offset, len; + char *buf; + contact_t *c; + struct lump *anchor; + struct sip_uri uri; + + nuri.s = nbuf; + nuri.len = MAX_URI_SIZE; + if (get_contact_uri(msg, &uri, &c) == -1) + return -1; + if ((c->uri.s < msg->buf) || (c->uri.s > (msg->buf + msg->len))) { + LM_ERR("you can't update contact twice, check your config!\n"); + return -1; + } + + if(uri_add_rcv_alias(msg, &c->uri, &nuri)<0) { + LM_DBG("cannot add the alias parameter\n"); + return -1; + } + + br = 1; + if(c->uri.s[-1]=='<') + br = 0; + + + len = nuri.len + 2*br; + buf = pkg_malloc(len + 1); + if (buf == NULL) { + LM_ERR("out of pkg memory\n"); + return -1; + } + if(br==1) { + buf[0] = '<'; + strncpy(buf+1, nuri.s, nuri.len); + buf[len-1] = '>'; + } else { + strncpy(buf, nuri.s, nuri.len); + } + buf[len] = '\0'; + + offset = c->uri.s - msg->buf; + anchor = del_lump(msg, offset, c->uri.len, HDR_CONTACT_T); + if (anchor == 0) + return -1; + + if (insert_new_lump_after(anchor, buf, len, HDR_CONTACT_T) == 0) { + pkg_free(buf); + return -1; + } + c->uri.s = buf; + c->uri.len = len; + + return 1; +} + #define SALIAS ";alias=" #define SALIAS_LEN (sizeof(SALIAS) - 1)

10 years, 7 months

memory leak in memcached module

by Daniel-Constantin Mierla

Hello, there is (still) a memory leak in memcached module, discovered on a report by Dragos Oancea. The pkg usage logs are like: 0(24328) NOTICE: qm_status: 19010. N address=0x7fb23683bc98 frag=0x7fb23683bc68 size=8 used=1 0(24328) NOTICE: qm_status: alloc'd from memcached: ../../parser/../ut.h: pkg_str_dup(733) 0(24328) NOTICE: qm_status: start check=f0f0f0f0, end check= c0c0c0c0, abcdefed 0(24328) NOTICE: qm_status: 19011. N address=0x7fb23683bd00 frag=0x7fb23683bcd0 size=48 used=1 0(24328) NOTICE: qm_status: alloc'd from memcached: memcached.c: mcd_malloc(127) 0(24328) NOTICE: qm_status: start check=f0f0f0f0, end check= c0c0c0c0, abcdefed 0(24328) NOTICE: qm_status: 19012. N address=0x7fb23683bd90 frag=0x7fb23683bd60 size=8 used=1 0(24328) NOTICE: qm_status: alloc'd from memcached: ../../parser/../ut.h: pkg_str_dup(733) 0(24328) NOTICE: qm_status: start check=f0f0f0f0, end check= c0c0c0c0, abcdefed 0(24328) NOTICE: qm_status: 19013. N address=0x7fb23683bdf8 frag=0x7fb23683bdc8 size=48 used=1 0(24328) NOTICE: qm_status: alloc'd from memcached: memcached.c: mcd_malloc(127) 0(24328) NOTICE: qm_status: start check=f0f0f0f0, end check= c0c0c0c0, abcdefed 0(24328) NOTICE: qm_status: 19014. N address=0x7fb23683be88 frag=0x7fb23683be58 size=8 used=1 0(24328) NOTICE: qm_status: alloc'd from memcached: memcached.c: mcd_malloc(127) 0(24328) NOTICE: qm_status: start check=f0f0f0f0, end check= c0c0c0c0, abcdefed 0(24328) NOTICE: qm_status: 19015. N address=0x7fb23683bef0 frag=0x7fb23683bec0 size=16 used=1 0(24328) NOTICE: qm_status: alloc'd from memcached: ../../parser/../ut.h: pkg_str_dup(733) 0(24328) NOTICE: qm_status: start check=f0f0f0f0, end check= c0c0c0c0, abcdefed 0(24328) NOTICE: qm_status: 19016. N address=0x7fb23683bf60 frag=0x7fb23683bf30 size=8 used=1 0(24328) NOTICE: qm_status: alloc'd from memcached: memcached.c: mcd_malloc(127) 0(24328) NOTICE: qm_status: start check=f0f0f0f0, end check= c0c0c0c0, abcdefed 0(24328) NOTICE: qm_status: 19017. N address=0x7fb23683bfc8 frag=0x7fb23683bf98 size=24 used=1 0(24328) NOTICE: qm_status: alloc'd from memcached: ../../parser/../ut.h: pkg_str_dup(733) 0(24328) NOTICE: qm_status: start check=f0f0f0f0, end check= c0c0c0c0, abcdefed The one related to pkg_str_dup() should be fixed by the commit: - http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6faf126… The other one is related to mcd_malloc(), which I guess it is due to the function that returns the value from memchache, memcached_get() used in pv_get_mcd_value_helper() -- the returned object has to be freed by calling code, according to: - http://docs.libmemcached.org/memcached_get.html Since the libmemcached was initialized with wrappers around pkg malloc/free, I expect the respective free function has to be used to free the result. Can any of memcached devs check my commit and investigate further the second leak? Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Nov 25-28; Miami, Nov 18-20, 2013 - more details about Kamailio trainings at http://www.asipto.com -

10 years, 7 months

git:master: memcached: fix memory leak, discovered on a report by Dragos Oancea

by Charles Chance

Module: sip-router Branch: master Commit: cf4275d4cb16dce4cbac48ca946a66e9f1626c35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf4275d… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Fri Oct 4 14:57:39 2013 +0100 memcached: fix memory leak, discovered on a report by Dragos Oancea --- modules/memcached/mcd_var.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/modules/memcached/mcd_var.c b/modules/memcached/mcd_var.c index b24888d..a5bdf25 100644 --- a/modules/memcached/mcd_var.c +++ b/modules/memcached/mcd_var.c @@ -162,6 +162,15 @@ static int pv_get_mcd_value_helper(struct sip_msg *msg, str *key, return 0; } +static void pv_free_mcd_value(char** buf) { + if (*buf!=NULL) { + if (mcd_memory) { + pkg_free(*buf); + } else { + free(*buf); + } + } +} /*! * \brief Get a cached value from memcached @@ -187,7 +196,7 @@ int pv_get_mcd_value(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { return pv_get_null(msg, param, res); if (pv_get_mcd_value_helper(msg, &key, &return_value, &return_flags) < 0) { - return pv_get_null(msg, param, res); + goto errout; } @@ -220,9 +229,11 @@ int pv_get_mcd_value(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { res->flags = PV_VAL_STR|PV_VAL_INT|PV_TYPE_INT; } + pv_free_mcd_value(&return_value); return 0; errout: + pv_free_mcd_value(&return_value); return pv_get_null(msg, param, res); } @@ -314,9 +325,12 @@ static int pv_mcd_atomic_helper(struct sip_msg* msg, pv_param_t *param, int op, return -1; if (pv_get_mcd_value_helper(msg, &key, &return_value, &return_flags) < 0) { + pv_free_mcd_value(&return_value); return -1; } + pv_free_mcd_value(&return_value); + if(return_flags&VAR_VAL_STR) { LM_ERR("could not do atomic operations on string for key %.*s\n", key.len, key.s); return -1; @@ -328,6 +342,7 @@ static int pv_mcd_atomic_helper(struct sip_msg* msg, pv_param_t *param, int op, } return 0; + } @@ -371,9 +386,9 @@ int pv_set_mcd_expire(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t { str key; unsigned int expiry = mcd_expire; - char *return_value; - uint32_t return_flags; - memcached_return rc; + char *return_value; + uint32_t return_flags; + memcached_return rc; if (!(val->flags&PV_VAL_INT)) { LM_ERR("invalid value %.*s for expire time, strings not allowed\n", @@ -385,17 +400,22 @@ int pv_set_mcd_expire(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t return -1; if (pv_get_mcd_value_helper(msg, &key, &return_value, &return_flags) < 0) { - return -1; + goto errout; } LM_DBG("set expire time %d for key %.*s with flag %d\n", val->ri, key.len, key.s, return_flags); if ((rc= memcached_set(memcached_h, key.s, key.len, return_value, strlen(return_value), val->ri, return_flags)) != MEMCACHED_SUCCESS) { LM_ERR("could not set expire time %d for key %.*s - error was %s\n", val->ri, key.len, key.s, memcached_strerror(memcached_h, rc)); - return -1; + goto errout; } + pv_free_mcd_value(&return_value); return 0; + +errout: + pv_free_mcd_value(&return_value); + return -1; }

10 years, 7 months

git:master: memcached: comment clarification for wrapper for libmemcache callbacks

by Henning Westerholt

Module: sip-router Branch: master Commit: 0f3a566dd699090cf6a558edc3aefac2c41e24e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f3a566… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Fri Oct 4 14:47:06 2013 +0200 memcached: comment clarification for wrapper for libmemcache callbacks --- modules/memcached/memcached.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/memcached/memcached.c b/modules/memcached/memcached.c index 86a08b3..431cf4e 100644 --- a/modules/memcached/memcached.c +++ b/modules/memcached/memcached.c @@ -106,7 +106,7 @@ struct module_exports exports = { /*! - * \brief Wrapper functions around our internal memory management + * \brief Wrapper functions around our internal memory management for libmemcache callback * \param mem freed memory * \note pkg_free does not allow NULL pointer as standard free, therefore we check it here * \see pkg_free @@ -118,7 +118,7 @@ static inline void mcd_free(memcached_st *ptr, void *mem, void *context) { /*! - * \brief Wrapper functions around our internal memory management + * \brief Wrapper functions around our internal memory management for libmemcache callback * \param size allocated size * \return allocated memory, or NULL on failure * \see pkg_malloc @@ -129,7 +129,7 @@ static inline void* mcd_malloc(memcached_st *ptr, const size_t size, void *conte /*! - * \brief Wrapper functions around our internal memory management + * \brief Wrapper functions around our internal memory management for libmemcache callback * \param mem pointer to allocated memory * \param size new size of memory area * \return allocated memory, or NULL on failure @@ -141,7 +141,7 @@ static inline void* mcd_realloc(memcached_st *ptr, void *mem, const size_t size, /*! - * \brief Wrapper functions around our internal memory management + * \brief Wrapper functions around our internal memory management for libmemcache callback * \param mem pointer to allocated memory * \param size new size of memory area * \return allocated memory, or NULL on failure

10 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
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