sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

git:master:5ce98491: app_mono: safety check for anchor lump
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 5ce984913f54849b841675955f971b73b8d76eb5 URL: https://github.com/kamailio/kamailio/commit/5ce984913f54849b841675955f971b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:40:47+02:00 app_mono: safety check for anchor lump --- Modified: src/modules/app_mono/app_mono_api.c --- Diff: https://github.com/kamailio/kamailio/commit/5ce984913f54849b841675955f971b7… Patch: https://github.com/kamailio/kamailio/commit/5ce984913f54849b841675955f971b7… --- diff --git a/src/modules/app_mono/app_mono_api.c b/src/modules/app_mono/app_mono_api.c index efd17e8226..2343b1d922 100644 --- a/src/modules/app_mono/app_mono_api.c +++ b/src/modules/app_mono/app_mono_api.c @@ -778,7 +778,7 @@ static int sr_mono_hdr_append (MonoString *hv) hdr[txt.len] = '\0'; anchor = anchor_lump(env_M->msg, hf->name.s + hf->len - env_M->msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, txt.len, 0) == 0) + if((anchor==NULL) || (insert_new_lump_before(anchor, hdr, txt.len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); @@ -873,7 +873,7 @@ static int sr_mono_hdr_insert (MonoString *hv) hdr[txt.len] = '\0'; anchor = anchor_lump(env_M->msg, hf->name.s + hf->len - env_M->msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, txt.len, 0) == 0) + if((anchor==NULL) || (insert_new_lump_before(anchor, hdr, txt.len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr);

1 0

git:master:875bd485: core: kemi - safety check for lump archor for hdr operations
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 875bd485267cf77783ecab0f09f518304c1d2cd2 URL: https://github.com/kamailio/kamailio/commit/875bd485267cf77783ecab0f09f5183… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:31:12+02:00 core: kemi - safety check for lump archor for hdr operations --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/875bd485267cf77783ecab0f09f5183… Patch: https://github.com/kamailio/kamailio/commit/875bd485267cf77783ecab0f09f5183… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 039ba1557f..6a1d61af43 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1679,7 +1679,8 @@ static int sr_kemi_hdr_append(sip_msg_t *msg, str *txt) memcpy(hdr, txt->s, txt->len); /* anchor after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { + if((anchor==NULL) + || (insert_new_lump_before(anchor, hdr, txt->len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); return -1; @@ -1744,13 +1745,15 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); } - LM_DBG("append after [%.*s] the hf: [%.*s]\n", hname->len, hname->s, - txt->len, txt->s); - if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { + if((anchor==NULL) + || (insert_new_lump_before(anchor, hdr, txt->len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); return -1; } + LM_DBG("appended after [%.*s] the hf: [%.*s]\n", hname->len, hname->s, + txt->len, txt->s); + return 1; } @@ -1871,7 +1874,8 @@ static int sr_kemi_hdr_insert(sip_msg_t *msg, str *txt) memcpy(hdr, txt->s, txt->len); /* anchor before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { + if((anchor==NULL) + || (insert_new_lump_before(anchor, hdr, txt->len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); return -1; @@ -1934,13 +1938,15 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) } else { /* before hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } - LM_DBG("insert before [%.*s] the hf: %.*s\n", hname->len, hname->s, - txt->len, txt->s); - if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { + if((anchor==NULL) + || (insert_new_lump_before(anchor, hdr, txt->len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); return -1; } + LM_DBG("inserted before [%.*s] the hf: %.*s\n", hname->len, hname->s, + txt->len, txt->s); + return 1; }

1 0

git:master:7660f30c: tm: debug message if kemi on-reply route callback returns negative
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 7660f30cabfcca004e6eed1cf60d7530fc2cc7ee URL: https://github.com/kamailio/kamailio/commit/7660f30cabfcca004e6eed1cf60d753… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:25:09+02:00 tm: debug message if kemi on-reply route callback returns negative --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/7660f30cabfcca004e6eed1cf60d753… Patch: https://github.com/kamailio/kamailio/commit/7660f30cabfcca004e6eed1cf60d753… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 202b8d826f..60518e15e0 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2421,8 +2421,10 @@ int reply_received( struct sip_msg *p_msg ) bctx = sr_kemi_act_ctx_get(); init_run_actions_ctx(&ctx); sr_kemi_act_ctx_set(&ctx); - sr_kemi_route(keng, p_msg, TM_ONREPLY_ROUTE, - sr_kemi_cbname_lookup_idx(onreply_route), NULL); + if(sr_kemi_route(keng, p_msg, TM_ONREPLY_ROUTE, + sr_kemi_cbname_lookup_idx(onreply_route), NULL)<0) { + LM_DBG("negative return from on-reply kemi callback\n"); + } sr_kemi_act_ctx_set(bctx); } else { run_top_route(onreply_rt.rlist[onreply_route], p_msg, &ctx);

1 0

git:master:a1d9adb3: core: init timeval variables to avoid compile warning
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: a1d9adb329d261b8b3856a39c5ccaa27ce8f0849 URL: https://github.com/kamailio/kamailio/commit/a1d9adb329d261b8b3856a39c5ccaa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:18:22+02:00 core: init timeval variables to avoid compile warning --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/a1d9adb329d261b8b3856a39c5ccaa2… Patch: https://github.com/kamailio/kamailio/commit/a1d9adb329d261b8b3856a39c5ccaa2… --- diff --git a/src/core/action.c b/src/core/action.c index 06775a88fc..8b6725598c 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1527,7 +1527,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) { struct action* t; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:2f12d7e1: siptrace: do not free unallocated dest_info_t structure on error
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 2f12d7e1b497346bb6569781dfa83a85a586b595 URL: https://github.com/kamailio/kamailio/commit/2f12d7e1b497346bb6569781dfa83a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:12:17+02:00 siptrace: do not free unallocated dest_info_t structure on error --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/2f12d7e1b497346bb6569781dfa83a8… Patch: https://github.com/kamailio/kamailio/commit/2f12d7e1b497346bb6569781dfa83a8… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index e3ddfeda76..df848c7ad2 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -800,7 +800,6 @@ static int parse_siptrace_uri(str* duri, dest_info_t* dst) p = mk_proxy(&uri.host, (uri.port_no) ? uri.port_no : SIP_PORT, dst->proto); if(p == 0) { LM_ERR("bad host name in uri\n"); - pkg_free(dst); return -1; }

1 0

git:master:313fc935: siptrace: safety check for msg pointer in trace_transaction()
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 313fc93529cb61dbf1e7c173dd2e4fa6ffc4af70 URL: https://github.com/kamailio/kamailio/commit/313fc93529cb61dbf1e7c173dd2e4fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:08:46+02:00 siptrace: safety check for msg pointer in trace_transaction() --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/313fc93529cb61dbf1e7c173dd2e4fa… Patch: https://github.com/kamailio/kamailio/commit/313fc93529cb61dbf1e7c173dd2e4fa… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 7bfa5a60ee..e3ddfeda76 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1844,6 +1844,11 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info) { + if(msg == NULL) { + LM_DBG("nothing to trace\n"); + return; + } + /* trace current message on out */ msg->msg_flags |= FL_SIPTRACE; if (info->uriState == STRACE_RAW_URI) {

1 0

git:master:0956a130: Makefile.defs: version set to 5.3.0-dev5
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 0956a130db0343bc334038c388ae25cacd54fb71 URL: https://github.com/kamailio/kamailio/commit/0956a130db0343bc334038c388ae25c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T12:40:28+02:00 Makefile.defs: version set to 5.3.0-dev5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0956a130db0343bc334038c388ae25c… Patch: https://github.com/kamailio/kamailio/commit/0956a130db0343bc334038c388ae25c… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9b1f9e50c6..21ca28e097 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -dev5 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:1c4ddc7e: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 1c4ddc7ebe538d8dbbe824203ef3537b07b1e624 URL: https://github.com/kamailio/kamailio/commit/1c4ddc7ebe538d8dbbe824203ef3537… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-17T10:16:50+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/1c4ddc7ebe538d8dbbe824203ef3537… Patch: https://github.com/kamailio/kamailio/commit/1c4ddc7ebe538d8dbbe824203ef3537… --- diff --git a/src/modules/kex/README b/src/modules/kex/README index 3b58fbae06..318f48e3fb 100644 --- a/src/modules/kex/README +++ b/src/modules/kex/README @@ -84,7 +84,9 @@ Ovidiu Sas 4.27. system.listMethods 4.28. system.methodHelp 4.29. system.methodSignature - 4.30. mod.stats module_name/all pkg/shm/all + 4.30. mod.mem_stats + 4.31. mod.stats + 4.32. mod.mem_statsx List of Examples @@ -160,7 +162,9 @@ Chapter 1. Admin Guide 4.27. system.listMethods 4.28. system.methodHelp 4.29. system.methodSignature - 4.30. mod.stats module_name/all pkg/shm/all + 4.30. mod.mem_stats + 4.31. mod.stats + 4.32. mod.mem_statsx 1. Overview @@ -460,7 +464,9 @@ resetdebug(); 4.27. system.listMethods 4.28. system.methodHelp 4.29. system.methodSignature - 4.30. mod.stats module_name/all pkg/shm/all + 4.30. mod.mem_stats + 4.31. mod.stats + 4.32. mod.mem_statsx 4.1. core.aliases_list @@ -716,7 +722,7 @@ kamcmd system.listMethods Returns signature of given method. -4.30. mod.stats module_name/all pkg/shm/all +4.30. mod.mem_stats Print private(pkg) or shared(shm) memory currently allocated a given module or by all modules. @@ -760,3 +766,15 @@ loc pkg_proc_stats_init(79): 864 Total: 864 } + +4.31. mod.stats + + Same as RPC command "mod.mem_stats", this is an alias command to + preserve backward compatibility. + +4.32. mod.mem_statsx + + Similar to RPC command "mod.mem_stats", but the output has an extended + format, printing info that includes the allocated size and the count of + allocated chunks in a combined string value. The parameters are the + same like for "mod.mem_stats".

1 0

git:master:68d437a7: kex: docs for rpc command mod.mem_statsx
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 68d437a745b67516953aa77c31863e8d79a850c6 URL: https://github.com/kamailio/kamailio/commit/68d437a745b67516953aa77c31863e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T10:04:05+02:00 kex: docs for rpc command mod.mem_statsx --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/68d437a745b67516953aa77c31863e8… Patch: https://github.com/kamailio/kamailio/commit/68d437a745b67516953aa77c31863e8… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 9d2a203425..53380b7676 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -847,9 +847,9 @@ resetdebug(); </para> </section> - <section id="kex.r.mod.stats"> + <section id="kex.r.mod.mem_stats"> <title> - <function moreinfo="none">mod.stats module_name/all pkg/shm/all</function> + <function moreinfo="none">mod.mem_stats</function> </title> <para> Print private(pkg) or shared(shm) memory currently allocated a given module or by all modules. @@ -923,6 +923,27 @@ Module: kex } </programlisting> </section> + <section id="kex.r.mod.stats"> + <title> + <function moreinfo="none">mod.stats</function> + </title> + <para> + Same as RPC command "mod.mem_stats", this is an alias command to + preserve backward compatibility. + </para> + </section> + <section id="kex.r.mod.mem_statsx"> + <title> + <function moreinfo="none">mod.mem_statsx</function> + </title> + <para> + Similar to RPC command "mod.mem_stats", but the output has an + extended format, printing info that includes the allocated size + and the count of allocated chunks in a combined string value. The + parameters are the same like for "mod.mem_stats". + </para> + </section> + </section> </chapter>

1 0

git:master:9cc1c638: kex: new rpc command mod.mem_statsx
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 9cc1c63888d6d1811819157aa57f12c4df9e08fb URL: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T09:56:34+02:00 kex: new rpc command mod.mem_statsx - print also the count of allocated chunks in summary - aliased old rpc mod.stats to mod.mem_stats to reflect better the purpose of printing memory usage stats --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c… Patch: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c…

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019