sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
364 discussions

git:master:819f9eae: usrloc: fix ucontact shared leak
by Victor Seva 22 Feb '17

22 Feb '17

Module: kamailio Branch: master Commit: 819f9eae0066a94081b0805dadf69bd57050e4f0 URL: https://github.com/kamailio/kamailio/commit/819f9eae0066a94081b0805dadf69bd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T08:36:54+01:00 usrloc: fix ucontact shared leak keep a copy of urecord if mode is DB_ONLY as it is static preventing leaking ucontact to shared memory Fix #1000 See #997 for details --- Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/819f9eae0066a94081b0805dadf69bd… Patch: https://github.com/kamailio/kamailio/commit/819f9eae0066a94081b0805dadf69bd… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index a5531f4..630a4bd 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -1672,6 +1672,7 @@ static inline int update_contact_db(ucontact_t* _c) */ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) { + struct urecord _ur; /* we have to update memory in any case, but database directly * only in db_mode 1 */ if (mem_update_ucontact( _c, _ci) < 0) { @@ -1680,6 +1681,8 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) } if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + if (_r) memcpy(&_ur, _r, sizeof(struct urecord)); if (update_contact_db(_c) < 0) return -1; } @@ -1690,8 +1693,14 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) run_ul_callbacks( UL_CONTACT_UPDATE, _c); } - if (_r && db_mode!=DB_ONLY) - update_contact_pos( _r, _c); + if (_r) { + if (db_mode!=DB_ONLY) { + update_contact_pos( _r, _c); + } else { + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + } + } st_update_ucontact(_c); diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index 0ff43c9..9223b85 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -568,12 +568,16 @@ void release_urecord(urecord_t* _r) int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, ucontact_t** _c) { + struct urecord _ur; if ( ((*_c)=mem_insert_ucontact(_r, _contact, _ci)) == 0) { LM_ERR("failed to insert contact\n"); return -1; } if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + memcpy(&_ur, _r, sizeof(struct urecord)); + if (db_insert_ucontact(*_c) < 0) { LM_ERR("failed to insert in database\n"); return -1; @@ -586,13 +590,19 @@ int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, run_ul_callbacks( UL_CONTACT_INSERT, *_c); } - if (db_mode == WRITE_THROUGH) { - if (db_insert_ucontact(*_c) < 0) { - LM_ERR("failed to insert in database\n"); - return -1; - } else { - (*_c)->state = CS_SYNC; - } + switch (db_mode) { + case WRITE_THROUGH: + if (db_insert_ucontact(*_c) < 0) { + LM_ERR("failed to insert in database\n"); + return -1; + } else { + (*_c)->state = CS_SYNC; + } + break; + case DB_ONLY: + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + break; } return 0; @@ -608,11 +618,22 @@ int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, int delete_ucontact(urecord_t* _r, struct ucontact* _c) { int ret = 0; + struct urecord _ur; + + if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + memcpy(&_ur, _r, sizeof(struct urecord)); + } if (exists_ulcb_type(UL_CONTACT_DELETE)) { run_ul_callbacks( UL_CONTACT_DELETE, _c); } + if (db_mode==DB_ONLY) { + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + } + if (st_delete_ucontact(_c) > 0) { if (db_mode == WRITE_THROUGH || db_mode==DB_ONLY) { if (db_delete_ucontact(_c) < 0) {

1 0

[kamailio/kamailio] usrloc: fix ucontact shared leak (#1000)
by Victor Seva 22 Feb '17

22 Feb '17

keep a copy of ``urecord`` if mode is DB_ONLY as it is static preventing leaking ``ucontact`` to shared memory See #997 for details You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1000 -- Commit Summary -- * usrloc: fix ucontact shared leak -- File Changes -- M src/modules/usrloc/ucontact.c (13) M src/modules/usrloc/urecord.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1000.patch https://github.com/kamailio/kamailio/pull/1000.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1000

2 3

git:5.0:04e5d5e8: pua_reginfo: fix memory leak when usrloc is DB_ONLY
by Victor Seva 22 Feb '17

22 Feb '17

Module: kamailio Branch: 5.0 Commit: 04e5d5e8cc8f9593e2cc809dabb5c6303e7c3214 URL: https://github.com/kamailio/kamailio/commit/04e5d5e8cc8f9593e2cc809dabb5c63… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T08:16:25+01:00 pua_reginfo: fix memory leak when usrloc is DB_ONLY As release_urecord() clearly says: /*! * \brief Release urecord previously obtained through get_urecord * \warning Failing to calls this function after get_urecord will * result in a memory leak when the DB_ONLY mode is used. When * the records is later deleted, e.g. with delete_urecord, then * its not necessary, as this function already releases the record. * \param _r released record */ (cherry picked from commit 1b0e1c3cbdd162fcd438a7d9bb412ddce73bc214) --- Modified: src/modules/pua_reginfo/notify.c Modified: src/modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/04e5d5e8cc8f9593e2cc809dabb5c63… Patch: https://github.com/kamailio/kamailio/commit/04e5d5e8cc8f9593e2cc809dabb5c63… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index 317f3e8..853dbcc 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -458,7 +458,7 @@ int process_body(str notify_body, udomain_t * domain) { } } next_registration: - // if (ul_record) ul.release_urecord(ul_record); + if (ul_record) ul.release_urecord(ul_record); /* Unlock the domain for this AOR: */ if (aor_key.len > 0) ul.unlock_udomain(domain, &aor_key); diff --git a/src/modules/pua_reginfo/usrloc_cb.c b/src/modules/pua_reginfo/usrloc_cb.c index 7f84788..3e00a0e 100644 --- a/src/modules/pua_reginfo/usrloc_cb.c +++ b/src/modules/pua_reginfo/usrloc_cb.c @@ -223,7 +223,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { publ_info_t publ; str content_type; udomain_t * domain; - urecord_t * record; + urecord_t * record = NULL; int res; str uri = {NULL, 0}; str user = {NULL, 0}; @@ -332,6 +332,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { if(body->s) xmlFree(body->s); pkg_free(body); } + if(record) ul.release_urecord(record); return; }

1 0

git:master:1b0e1c3c: pua_reginfo: fix memory leak when usrloc is DB_ONLY
by Victor Seva 22 Feb '17

22 Feb '17

Module: kamailio Branch: master Commit: 1b0e1c3cbdd162fcd438a7d9bb412ddce73bc214 URL: https://github.com/kamailio/kamailio/commit/1b0e1c3cbdd162fcd438a7d9bb412dd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T08:14:55+01:00 pua_reginfo: fix memory leak when usrloc is DB_ONLY As release_urecord() clearly says: /*! * \brief Release urecord previously obtained through get_urecord * \warning Failing to calls this function after get_urecord will * result in a memory leak when the DB_ONLY mode is used. When * the records is later deleted, e.g. with delete_urecord, then * its not necessary, as this function already releases the record. * \param _r released record */ --- Modified: src/modules/pua_reginfo/notify.c Modified: src/modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/1b0e1c3cbdd162fcd438a7d9bb412dd… Patch: https://github.com/kamailio/kamailio/commit/1b0e1c3cbdd162fcd438a7d9bb412dd… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index 317f3e8..853dbcc 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -458,7 +458,7 @@ int process_body(str notify_body, udomain_t * domain) { } } next_registration: - // if (ul_record) ul.release_urecord(ul_record); + if (ul_record) ul.release_urecord(ul_record); /* Unlock the domain for this AOR: */ if (aor_key.len > 0) ul.unlock_udomain(domain, &aor_key); diff --git a/src/modules/pua_reginfo/usrloc_cb.c b/src/modules/pua_reginfo/usrloc_cb.c index 7f84788..3e00a0e 100644 --- a/src/modules/pua_reginfo/usrloc_cb.c +++ b/src/modules/pua_reginfo/usrloc_cb.c @@ -223,7 +223,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { publ_info_t publ; str content_type; udomain_t * domain; - urecord_t * record; + urecord_t * record = NULL; int res; str uri = {NULL, 0}; str user = {NULL, 0}; @@ -332,6 +332,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { if(body->s) xmlFree(body->s); pkg_free(body); } + if(record) ul.release_urecord(record); return; }

1 0

[kamailio/kamailio] pua_reginfo: fix memory leak when usrloc is DB_ONLY (#998)
by Victor Seva 22 Feb '17

22 Feb '17

As release_urecord() clearly says: /*! * \brief Release urecord previously obtained through get_urecord * \warning Failing to calls this function after get_urecord will * result in a memory leak when the DB_ONLY mode is used. When * the records is later deleted, e.g. with delete_urecord, then * its not necessary, as this function already releases the record. * \param _r released record */ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/998 -- Commit Summary -- * pua_reginfo: fix memory leak when usrloc is DB_ONLY -- File Changes -- M src/modules/pua_reginfo/notify.c (2) M src/modules/pua_reginfo/usrloc_cb.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/998.patch https://github.com/kamailio/kamailio/pull/998.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/998

2 2

git:master:d40635aa: topos: group storage function in an api structure
by Daniel-Constantin Mierla 22 Feb '17

22 Feb '17

Module: kamailio Branch: master Commit: d40635aa946d2d9e49227ab87cba4e045bcc5ebd URL: https://github.com/kamailio/kamailio/commit/d40635aa946d2d9e49227ab87cba4e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-22T07:36:36+01:00 topos: group storage function in an api structure --- Added: src/modules/topos/api.h Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/d40635aa946d2d9e49227ab87cba4e0… Patch: https://github.com/kamailio/kamailio/commit/d40635aa946d2d9e49227ab87cba4e0…

1 0

git:master:15b746b9: modules: readme files regenerated - pua ... [skip ci]
by Kamailio Dev 21 Feb '17

21 Feb '17

Module: kamailio Branch: master Commit: 15b746b93548bf3d45b69018c175f4a521f16c20 URL: https://github.com/kamailio/kamailio/commit/15b746b93548bf3d45b69018c175f4a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-02-21T15:46:22+01:00 modules: readme files regenerated - pua ... [skip ci] --- Modified: src/modules/pua/README --- Diff: https://github.com/kamailio/kamailio/commit/15b746b93548bf3d45b69018c175f4a… Patch: https://github.com/kamailio/kamailio/commit/15b746b93548bf3d45b69018c175f4a… --- diff --git a/src/modules/pua/README b/src/modules/pua/README index c6116b8..22fd964 100644 --- a/src/modules/pua/README +++ b/src/modules/pua/README @@ -120,18 +120,17 @@ Chapter 1. Admin Guide Kamailio's SIP presence package, implementing SIMPLE and various shared line appearance implementations. - It can be used with the following modules: pua_mi, pua_usrloc, pua_bla, - pua_dialoginfo, pua_reginfo and pua_xmpp. The pua_mi module offer the - possibility to publish any kind of information or subscribing to a - resource through the manager interface. The pua_usrloc module calls a - function exported by pua modules to publish elementary presence - information, such as basic status "open" or "closed", for clients that - do not implement client-to-server presence. Through pua_bla , BRIDGED - LINE APPEARANCE features are added to Kamailio The pua_xmpp module - represents a gateway between SIP and XMPP, so that jabber and SIP - clients can exchange presence information. The pua_reginfo modules - presents registration information from the usrloc module using the - reginfo event package. + It can be used with the following modules: pua_rpc, pua_usrloc, + pua_bla, pua_dialoginfo, pua_reginfo and pua_xmpp. The pua_rpc module + offer the possibility to publish any kind of information via the RPC + transport. The pua_usrloc module calls a function exported by pua + modules to publish elementary presence information, such as basic + status "open" or "closed", for clients that do not implement + client-to-server presence. Through pua_bla , BRIDGED LINE APPEARANCE + features are added to Kamailio The pua_xmpp module represents a gateway + between SIP and XMPP, so that jabber and SIP clients can exchange + presence information. The pua_reginfo modules presents registration + information from the usrloc module using the reginfo event package. The module supports 2 modes of operation. In the first a cache is used to store the presentity list and writes to database on timer to be able

1 0

git:5.0:7dc1f60d: pua: update documentation, replace pua_mi reference with pua_rpc
by Victor Seva 21 Feb '17

21 Feb '17

Module: kamailio Branch: 5.0 Commit: 7dc1f60d6713527d182f4414365eed2546f82a90 URL: https://github.com/kamailio/kamailio/commit/7dc1f60d6713527d182f4414365eed2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-21T15:21:17+01:00 pua: update documentation, replace pua_mi reference with pua_rpc [skip ci] (cherry picked from commit dbac66fa165d4058973a49d7ca9035b7ce7b07d2) --- Modified: src/modules/pua/doc/pua_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7dc1f60d6713527d182f4414365eed2… Patch: https://github.com/kamailio/kamailio/commit/7dc1f60d6713527d182f4414365eed2… --- diff --git a/src/modules/pua/doc/pua_admin.xml b/src/modules/pua/doc/pua_admin.xml index 8df2c27..51d0fa3 100644 --- a/src/modules/pua/doc/pua_admin.xml +++ b/src/modules/pua/doc/pua_admin.xml @@ -22,10 +22,9 @@ implementations. </para> <para> - It can be used with the following modules: pua_mi, pua_usrloc, + It can be used with the following modules: pua_rpc, pua_usrloc, pua_bla, pua_dialoginfo, pua_reginfo and pua_xmpp. - The <emphasis>pua_mi</emphasis> module offer the possibility to publish any kind of information - or subscribing to a resource through the manager interface. + The <emphasis>pua_rpc</emphasis> module offer the possibility to publish any kind of information via the RPC transport. The <emphasis>pua_usrloc</emphasis> module calls a function exported by pua modules to publish elementary presence information, such as basic status "open" or "closed", for clients that do not implement client-to-server presence.

1 0

git:master:dbac66fa: pua: update documentation, replace pua_mi reference with pua_rpc
by Victor Seva 21 Feb '17

21 Feb '17

Module: kamailio Branch: master Commit: dbac66fa165d4058973a49d7ca9035b7ce7b07d2 URL: https://github.com/kamailio/kamailio/commit/dbac66fa165d4058973a49d7ca9035b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-21T15:19:02+01:00 pua: update documentation, replace pua_mi reference with pua_rpc --- Modified: src/modules/pua/doc/pua_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dbac66fa165d4058973a49d7ca9035b… Patch: https://github.com/kamailio/kamailio/commit/dbac66fa165d4058973a49d7ca9035b… --- diff --git a/src/modules/pua/doc/pua_admin.xml b/src/modules/pua/doc/pua_admin.xml index 8df2c27..51d0fa3 100644 --- a/src/modules/pua/doc/pua_admin.xml +++ b/src/modules/pua/doc/pua_admin.xml @@ -22,10 +22,9 @@ implementations. </para> <para> - It can be used with the following modules: pua_mi, pua_usrloc, + It can be used with the following modules: pua_rpc, pua_usrloc, pua_bla, pua_dialoginfo, pua_reginfo and pua_xmpp. - The <emphasis>pua_mi</emphasis> module offer the possibility to publish any kind of information - or subscribing to a resource through the manager interface. + The <emphasis>pua_rpc</emphasis> module offer the possibility to publish any kind of information via the RPC transport. The <emphasis>pua_usrloc</emphasis> module calls a function exported by pua modules to publish elementary presence information, such as basic status "open" or "closed", for clients that do not implement client-to-server presence.

1 0

[kamailio/kamailio] presense memory leak (#1001)
by Dmitri Savolainen 20 Feb '17

20 Feb '17

### Description pkg memory leak in register/publish scenario #### Reproduction my presense part ``` loadmodule "presence.so" modparam("presence", "subs_db_mode", 2) # Write-Back default scheme modparam("presence", "db_update_period", 150) # 100 - default modparam("presence", "server_address", "sip:213.170.66.150:5071" ) loadmodule "presence_xml.so" modparam("presence_xml", "force_active", 1) modparam("presence_xml", "integrated_xcap_server", 1) loadmodule "pua.so" loadmodule "pua_usrloc.so" modparam("pua_usrloc", "default_domain", "siptest.ringme.ru") ``` my REGISTER processing config part ``` pua_set_publish(); if (!save("location")) sl_reply_error(); ``` without pua_set_publish() everything is ok. #### Log Messages [kamcmd corex.pkg_summary pid 10376](https://github.com/kamailio/kamailio/files/784021/corexpkg_summary.t… #### SIP Traffic sipp -sf register.xml -r 500 -m 100000 -s 111*222 myhost ### Additional Information * **Kamailio Version** - output of `kamailio -v` latest git version: kamailio 5.1.0-dev1 (x86_64/linux) & kamailio 4.4.5 * **Operating System**: centos7 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1001

3 8

← Newer
1
...
9
10
11
12
13
14
15
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2017