sr-dev August 2015

sr-dev@lists.kamailio.org

30 participants
191 discussions

git:master:852703fa: mem: display the 2 levels matrix in TLSF status
by Camille Oudot 10 Aug '15

10 Aug '15

Module: kamailio Branch: master Commit: 852703fa28782520658925aa831669274b347da6 URL: https://github.com/kamailio/kamailio/commit/852703fa28782520658925aa8316692… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-10T15:50:23+02:00 mem: display the 2 levels matrix in TLSF status Displays a matrix of non-empty free blocks lists rather than the list of all used blocks. tlsf_status() displays a letter reflecting the order of magnitude of the free blocks list length in each bucket --- Modified: mem/tlsf.c --- Diff: https://github.com/kamailio/kamailio/commit/852703fa28782520658925aa8316692… Patch: https://github.com/kamailio/kamailio/commit/852703fa28782520658925aa8316692… --- diff --git a/mem/tlsf.c b/mem/tlsf.c index 3547233..6060a41 100644 --- a/mem/tlsf.c +++ b/mem/tlsf.c @@ -1125,27 +1125,13 @@ size_t tlsf_available(tlsf_t pool) return control->total_size - control->real_used; } -static void tlsf_status_cb(void* ptr, size_t size, int used, void* user) -{ -#ifdef DBG_TLSF_MALLOC - block_header_t* block = block_from_ptr(ptr); -#endif - -#ifdef DBG_TLSF_MALLOC - LOG_(DEFAULT_FACILITY, *(int*)user, "tlsf_status: ", "(%p): used=%s size=%zu was %s from %s: %s(%ld)\n", - ptr, used ? "true" : "false", size, used ? "alloc'd" : "free'd", block->alloc_info.file, block->alloc_info.func, block->alloc_info.line); -#else - LOG_(DEFAULT_FACILITY, *(int*)user, "tlsf_status: ", "(%p): used=%s size=%zu\n", - ptr, used ? "true" : "false", size); -#endif - - -} - void tlsf_status(tlsf_t pool) { - int memlog; + int memlog, fl, sl; + unsigned int len; + char summary[FL_INDEX_COUNT]; control_t* control = tlsf_cast(control_t*, pool); + block_header_t* pb; memlog=cfg_get(core, core_cfg, memlog); LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", "status of pool (%p):\n", pool); @@ -1158,9 +1144,34 @@ void tlsf_status(tlsf_t pool) LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", "max used (+overhead)=%zu, max fragments=%zu\n", control->max_used, control->max_fragments); #endif + + /* print a summary of the 2 levels bucket list */ + LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + "Used blocks matrix ('.': unused, 'X': between 2^X and (2^(X+1)-1) used blocks, X=A..Z, A=0, B=1, ...)\n"); LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", - "dumping all fragments:\n"); - tlsf_walk_pool(pool, tlsf_status_cb, (void *) &memlog); + "> first-level: %d block list arrays between 2^fl and 2^(fl+1) bytes (fl=%d..%d)\n", + FL_INDEX_COUNT, FL_INDEX_SHIFT, FL_INDEX_MAX); + LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + "v second-level: %d block lists between 2^fl+sl*2^(fl-%d) and 2^fl+(sl+1)*2^(fl-%d)-1 bytes (sl=0..%d)\n", + SL_INDEX_COUNT, SL_INDEX_COUNT_LOG2, SL_INDEX_COUNT_LOG2, SL_INDEX_COUNT-1); + for (sl = 0 ; sl < SL_INDEX_COUNT ; sl++) { + for (fl = 0 ; fl < FL_INDEX_COUNT ; fl++) { + if (control->blocks[fl][sl] == &control->block_null) { + summary[fl] = '.'; + } else { + /* count free list length */ + len = 1; + pb = control->blocks[fl][sl]; + while (pb->next_free != &control->block_null) { + pb = pb->next_free; + len++; + } + summary[fl] = 'A' + tlsf_fls(len); + } + } + LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + "%2d|%.*s|\n", sl, FL_INDEX_COUNT, summary); + } } #ifdef DBG_TLSF_MALLOC

1 0

git:4.3:084fb2db: rtpengine: regenerate README
by Camille Oudot 10 Aug '15

10 Aug '15

Module: kamailio Branch: 4.3 Commit: 084fb2db62b133eb528bb8682fc057001e64e91d URL: https://github.com/kamailio/kamailio/commit/084fb2db62b133eb528bb8682fc0570… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-10T15:35:09+02:00 rtpengine: regenerate README --- Modified: modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/084fb2db62b133eb528bb8682fc0570… Patch: https://github.com/kamailio/kamailio/commit/084fb2db62b133eb528bb8682fc0570… --- diff --git a/modules/rtpengine/README b/modules/rtpengine/README index ae5870f..fe4637b 100644 --- a/modules/rtpengine/README +++ b/modules/rtpengine/README @@ -101,7 +101,7 @@ Richard Fuchs 1.6. Set extra_id_pv parameter 1.7. Set setid_avp parameter 1.8. Set force_send_interface parameter - 1.9. Set write_sdp_avp parameter + 1.9. Set write_sdp_pv parameter 1.10. Set rtp_inst_pvar parameter 1.11. set_rtpengine_set usage 1.12. rtpengine_offer usage @@ -350,9 +350,11 @@ modparam("rtpengine", "force_send_interface", "10.3.7.123") There is no default value. - Example 1.9. Set write_sdp_avp parameter + Example 1.9. Set write_sdp_pv parameter ... -modparam("rtpengine", "write_sdp_avp", "$avp(sdp)") +modparam("rtpengine", "write_sdp_pv", "$avp(sdp)") + ... or +modparam("rtpengine", "write_sdp_pv", "$pv(sdp)") ... 4.10. rtp_inst_pvar (string)

1 0

git:4.3:df5761a5: rtpengine: fix typo in documentation
by Camille Oudot 10 Aug '15

10 Aug '15

Module: kamailio Branch: 4.3 Commit: df5761a59bc4da1854b081f0e68e98f6392aee5d URL: https://github.com/kamailio/kamailio/commit/df5761a59bc4da1854b081f0e68e98f… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-10T15:32:33+02:00 rtpengine: fix typo in documentation (cherry picked from commit e8927be015b4034d252479ba6fede4b749a43eed) --- Modified: modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/df5761a59bc4da1854b081f0e68e98f… Patch: https://github.com/kamailio/kamailio/commit/df5761a59bc4da1854b081f0e68e98f… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 6be5386..5a12f61 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -298,10 +298,12 @@ modparam("rtpengine", "force_send_interface", "2001:8d8:1ff:10c0:9a90:96ff:fea8: There is no default value. </para> <example> - <title>Set <varname>write_sdp_avp</varname> parameter</title> + <title>Set <varname>write_sdp_pv</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("rtpengine", "write_sdp_avp", "$avp(sdp)") +modparam("rtpengine", "write_sdp_pv", "$avp(sdp)") + ... or +modparam("rtpengine", "write_sdp_pv", "$pv(sdp)") ... </programlisting> </example>

1 0

git:master:38ee440e: rtpengine: regenerate README
by Camille Oudot 10 Aug '15

10 Aug '15

Module: kamailio Branch: master Commit: 38ee440e24528c20040580407e05428d06ec6098 URL: https://github.com/kamailio/kamailio/commit/38ee440e24528c20040580407e05428… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-10T15:30:26+02:00 rtpengine: regenerate README --- Modified: modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/38ee440e24528c20040580407e05428… Patch: https://github.com/kamailio/kamailio/commit/38ee440e24528c20040580407e05428… --- diff --git a/modules/rtpengine/README b/modules/rtpengine/README index 374bf5a..00b26f2 100644 --- a/modules/rtpengine/README +++ b/modules/rtpengine/README @@ -102,7 +102,7 @@ Richard Fuchs 1.6. Set extra_id_pv parameter 1.7. Set setid_avp parameter 1.8. Set force_send_interface parameter - 1.9. Set write_sdp_avp parameter + 1.9. Set write_sdp_pv parameter 1.10. Set rtp_inst_pvar parameter 1.11. set_rtpengine_set usage 1.12. rtpengine_offer usage @@ -360,9 +360,11 @@ fd99") There is no default value. - Example 1.9. Set write_sdp_avp parameter + Example 1.9. Set write_sdp_pv parameter ... -modparam("rtpengine", "write_sdp_avp", "$avp(sdp)") +modparam("rtpengine", "write_sdp_pv", "$avp(sdp)") + ... or +modparam("rtpengine", "write_sdp_pv", "$pv(sdp)") ... 4.10. rtp_inst_pvar (string)

1 0

git:master:e8927be0: rtpengine: fix typo in documentation
by Camille Oudot 10 Aug '15

10 Aug '15

Module: kamailio Branch: master Commit: e8927be015b4034d252479ba6fede4b749a43eed URL: https://github.com/kamailio/kamailio/commit/e8927be015b4034d252479ba6fede4b… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-10T15:24:27+02:00 rtpengine: fix typo in documentation --- Modified: modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e8927be015b4034d252479ba6fede4b… Patch: https://github.com/kamailio/kamailio/commit/e8927be015b4034d252479ba6fede4b… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 46d8903..f0029eb 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -298,10 +298,12 @@ modparam("rtpengine", "force_send_interface", "2001:8d8:1ff:10c0:9a90:96ff:fea8: There is no default value. </para> <example> - <title>Set <varname>write_sdp_avp</varname> parameter</title> + <title>Set <varname>write_sdp_pv</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("rtpengine", "write_sdp_avp", "$avp(sdp)") +modparam("rtpengine", "write_sdp_pv", "$avp(sdp)") + ... or +modparam("rtpengine", "write_sdp_pv", "$pv(sdp)") ... </programlisting> </example>

1 0

git:master:9c3ea838: dialog: re-entrant mutex for dialogs hash table slots
by Daniel-Constantin Mierla 10 Aug '15

10 Aug '15

Module: kamailio Branch: master Commit: 9c3ea838b31039ac067e17d519df67b64b0dada1 URL: https://github.com/kamailio/kamailio/commit/9c3ea838b31039ac067e17d519df67b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-16T15:18:27+02:00 dialog: re-entrant mutex for dialogs hash table slots - changed from a lock set usage to per slot lock field --- Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/9c3ea838b31039ac067e17d519df67b… Patch: https://github.com/kamailio/kamailio/commit/9c3ea838b31039ac067e17d519df67b…

2 4

git:master:edc25d73: dmq_usrloc: implement deleted contact replication
by Charles Chance 08 Aug '15

08 Aug '15

Module: kamailio Branch: master Commit: edc25d7373f9560d09a35640ab19741f19b97040 URL: https://github.com/kamailio/kamailio/commit/edc25d7373f9560d09a35640ab19741… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-08-08T18:00:21+01:00 dmq_usrloc: implement deleted contact replication --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/edc25d7373f9560d09a35640ab19741… Patch: https://github.com/kamailio/kamailio/commit/edc25d7373f9560d09a35640ab19741… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index c174ac9..dd87721 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -92,6 +92,30 @@ static int add_contact(str aor, ucontact_info_t* ci) return -1; } +static int delete_contact(str aor, ucontact_info_t* ci) +{ + udomain_t* _d; + urecord_t* r; + ucontact_t* c; + + dmq_ul.get_udomain("location", &_d); + + if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), + &ci->ruid, &r, &c) != 0) { + LM_WARN("AOR/Contact not found\n"); + return -1; + } + if (dmq_ul.delete_ucontact(r, c) != 0) { + dmq_ul.unlock_udomain(_d, &aor); + LM_WARN("could not delete contact\n"); + return -1; + } + dmq_ul.release_urecord(r); + dmq_ul.unlock_udomain(_d, &aor); + + return 0; +} + void usrloc_get_all_ucontact(dmq_node_t* node) { int rval, len=0; @@ -357,6 +381,7 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* break; case DMQ_RM: LM_DBG("Received DMQ_RM. Delete contact info...\n"); + delete_contact(aor, &ci); break; case DMQ_SYNC: LM_DBG("Received DMQ_SYNC. Sending all contacts...\n"); @@ -510,8 +535,7 @@ void dmq_ul_cb_contact(ucontact_t* ptr, int type, void* param) usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, 0); break; case UL_CONTACT_DELETE: - //usrloc_dmq_send_contact(ptr, aor, DMQ_RM); - LM_DBG("Contact <%.*s> deleted\n", aor.len, aor.s); + usrloc_dmq_send_contact(ptr, aor, DMQ_RM, 0); break; case UL_CONTACT_EXPIRE: //usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE);

1 0

4.2 build is b0rken
by Maxim Sobolev 08 Aug '15

08 Aug '15

According to the https://travis-ci.org/sippy/voiptests: LD (gcc) [M ratelimit.so] ratelimit.so CC (gcc) [M registrar.so] api.o CC (gcc) [M registrar.so] common.o CC (gcc) [M registrar.so] config.o CC (gcc) [M registrar.so] lookup.o CC (gcc) [M registrar.so] path.o CC (gcc) [M registrar.so] reg_mod.o CC (gcc) [M registrar.so] regpv.o CC (gcc) [M registrar.so] regtime.o CC (gcc) [M registrar.so] reply.o CC (gcc) [M registrar.so] rerrno.o CC (gcc) [M registrar.so] save.o save.c: In function ‘pack_ci’: save.c:325:5: error: ‘ucontact_info_t’ has no member named ‘server_id’ Please fix. Thanks! -- Maksym Sobolyev Sippy Software, Inc. Internet Telephony (VoIP) Experts Tel (Canada): +1-778-783-0474 Tel (Toll-Free): +1-855-747-7779 Fax: +1-866-857-6942 Web: http://www.sippysoft.com MSN: sales(a)sippysoft.com Skype: SippySoft

2 2

git:4.2:d5fbdd45: registrar: fix backport 5b62b14c065
by Victor Seva 08 Aug '15

08 Aug '15

Module: kamailio Branch: 4.2 Commit: d5fbdd45f009a7d67f62b5438b4a9e37ba368c7f URL: https://github.com/kamailio/kamailio/commit/d5fbdd45f009a7d67f62b5438b4a9e3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-08T08:01:50+02:00 registrar: fix backport 5b62b14c065 --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/d5fbdd45f009a7d67f62b5438b4a9e3… Patch: https://github.com/kamailio/kamailio/commit/d5fbdd45f009a7d67f62b5438b4a9e3… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 32c2c10..6d3f240 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -322,7 +322,6 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig ci.received = path_received; } - ci.server_id = server_id; if(_m->contact) { _c = (((contact_body_t*)_m->contact->parsed)->contacts); if(_c->instance!=NULL && _c->instance->body.len>0) {

1 0

git:4.1:29c81c48: registrar: fix backport f2d23c1a038703
by Victor Seva 08 Aug '15

08 Aug '15

Module: kamailio Branch: 4.1 Commit: 29c81c48b06c349c36f88f06404e7d3f93397be6 URL: https://github.com/kamailio/kamailio/commit/29c81c48b06c349c36f88f06404e7d3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-08T08:01:23+02:00 registrar: fix backport f2d23c1a038703 --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/29c81c48b06c349c36f88f06404e7d3… Patch: https://github.com/kamailio/kamailio/commit/29c81c48b06c349c36f88f06404e7d3… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index ef0e700..9f100ca 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -322,7 +322,6 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig ci.received = path_received; } - ci.server_id = server_id; if(_m->contact) { _c = (((contact_body_t*)_m->contact->parsed)->contacts); if(_c->instance!=NULL && _c->instance->body.len>0) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2015