sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:2e7710e2: tmx: safety check of expected route blocks for using $T_*() variables
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: 2e7710e292a649c6c57e46d5994d3b2cf3815865 URL: https://github.com/kamailio/kamailio/commit/2e7710e292a649c6c57e46d5994d3b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-17T14:21:30+02:00 tmx: safety check of expected route blocks for using $T_*() variables - related to GH #2479 --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2e7710e292a649c6c57e46d5994d3b2… Patch: https://github.com/kamailio/kamailio/commit/2e7710e292a649c6c57e46d5994d3b2… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 15938fcd9e..1aa1dc0cff 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -305,6 +305,11 @@ int pv_get_t_var_req(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(CORE_ONREPLY_ROUTE|TM_ONREPLY_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_req(msg)) return pv_get_null(msg, param, res); @@ -320,6 +325,11 @@ int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(FAILURE_ROUTE|BRANCH_FAILURE_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_rpl(msg)) return pv_get_null(msg, param, res); @@ -335,6 +345,11 @@ int pv_get_t_var_branch(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(FAILURE_ROUTE|BRANCH_FAILURE_ROUTE|TM_ONREPLY_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_rpl(msg)) return pv_get_null(msg, param, res); @@ -350,6 +365,11 @@ int pv_get_t_var_inv(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(REQUEST_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_inv(msg)) return pv_get_null(msg, param, res);

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Not familiar with the cfgt module, when is it executed in this case? I can see in the trace that it relies on some debugger api, maybe you can present more details about execution context to understand what happens behind the module. -- 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/2479#issuecomment-694181287

1 0

git:master:105e90ab: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: 105e90ab7d42f63c24b7c2bce447f64f416dceac URL: https://github.com/kamailio/kamailio/commit/105e90ab7d42f63c24b7c2bce447f64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-17T13:31:23+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/105e90ab7d42f63c24b7c2bce447f64… Patch: https://github.com/kamailio/kamailio/commit/105e90ab7d42f63c24b7c2bce447f64… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 027450415f..175cce91ce 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -70,6 +70,7 @@ Muhammad Shahzad Shafi 5.4. corex.shm_status 5.5. corex.shm_summary 5.6. corex.pkg_summary + 5.7. corex.shm.info 6. Event Routes @@ -165,6 +166,7 @@ Chapter 1. Admin Guide 5.4. corex.shm_status 5.5. corex.shm_summary 5.6. corex.pkg_summary + 5.7. corex.shm.info 6. Event Routes @@ -724,6 +726,7 @@ event_route[dispatcher:dst-down] { 5.4. corex.shm_status 5.5. corex.shm_summary 5.6. corex.pkg_summary + 5.7. corex.shm.info 5.1. corex.debug @@ -776,6 +779,13 @@ event_route[dispatcher:dst-down] { kamcmd corex.pkg_summary pid 2345 kamcmd corex.pkg_summary idx 1 +5.7. corex.shm.info + + Return shared memory manager details. + + Example: + kamcli rpc shm.info + 6. Event Routes 6.1. event_route[network:msg]

1 0

git:master:57d33a2d: lib/srdb1: db_use_table() more suggestive error messages
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: 57d33a2d76219ae3d1eb503044dadaeddc7e06fd URL: https://github.com/kamailio/kamailio/commit/57d33a2d76219ae3d1eb503044dadae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-17T12:55:10+02:00 lib/srdb1: db_use_table() more suggestive error messages --- Modified: src/lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/57d33a2d76219ae3d1eb503044dadae… Patch: https://github.com/kamailio/kamailio/commit/57d33a2d76219ae3d1eb503044dadae… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index d33c9390c8..54b66d330b 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -477,8 +477,12 @@ int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, */ int db_use_table(db1_con_t* _h, const str* _t) { - if (!_h || !_t || !_t->s) { - LM_ERR("invalid parameter value\n"); + if (!_h) { + LM_ERR("invalid connection parameter\n"); + return -1; + } + if (!_t || !_t->s) { + LM_ERR("invalid table parameter value\n"); return -1; }

1 0

git:master:f1278a20: corex: added rpc command shm.info
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: f1278a20bb37b29285c9d7cac298a3b1905f1c88 URL: https://github.com/kamailio/kamailio/commit/f1278a20bb37b29285c9d7cac298a3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-17T13:19:13+02:00 corex: added rpc command shm.info --- Added: src/modules/corex/corex_rpc_shm.c Added: src/modules/corex/corex_rpc_shm.h Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f1278a20bb37b29285c9d7cac298a3b… Patch: https://github.com/kamailio/kamailio/commit/f1278a20bb37b29285c9d7cac298a3b… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 8d0e649548..194efcdb8e 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -39,6 +39,7 @@ #include "corex_lib.h" #include "corex_rpc.h" +#include "corex_rpc_shm.h" #include "corex_var.h" #include "corex_nio.h" @@ -188,6 +189,12 @@ static int mod_init(void) return -1; } + if(corex_init_rpc_shm()<0) + { + LM_ERR("failed to register RPC shm commands\n"); + return -1; + } + if(corex_register_check_self()<0) { LM_ERR("failed to register check self callback\n"); diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c new file mode 100644 index 0000000000..5316cdc7bc --- /dev/null +++ b/src/modules/corex/corex_rpc_shm.c @@ -0,0 +1,72 @@ +/** + * Copyright (C) 2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> + +#include "../../core/dprint.h" +#include "../../core/ut.h" +#include "../../core/mem/shm.h" +#include "../../core/globals.h" +#include "../../core/rpc.h" +#include "../../core/rpc_lookup.h" + +static const char* corex_rpc_shm_info_doc[2] = { + "Return details of the shared memory manager", + 0 +}; + + +/* + * RPC command to list the listening sockets + */ +static void corex_rpc_shm_info(rpc_t* rpc, void* ctx) +{ + void* th; + + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "su", + "name", (_shm_root.mname)?_shm_root.mname:"unknown", + "size", (unsigned int)shm_mem_size) <0) { + rpc->fault(ctx, 500, "Internal error adding fields"); + return; + } +} + +rpc_export_t corex_rpc_shm_cmds[] = { + {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {0, 0, 0, 0} +}; + +/** + * register RPC shm commands + */ +int corex_init_rpc_shm(void) +{ + if (rpc_register_array(corex_rpc_shm_cmds)!=0) { + LM_ERR("failed to register RPC shm commands\n"); + return -1; + } + return 0; +} diff --git a/src/modules/corex/corex_rpc_shm.h b/src/modules/corex/corex_rpc_shm.h new file mode 100644 index 0000000000..392dcafc08 --- /dev/null +++ b/src/modules/corex/corex_rpc_shm.h @@ -0,0 +1,25 @@ +/** + * Copyright (C) 2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#ifndef _COREX_RPC_SHM_H_ +#define _COREX_RPC_SHM_H_ + +int corex_init_rpc_shm(void); + +#endif

1 0

git:master:4dd854a3: corex: docs added for rpc command shm.info
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: 4dd854a32ccd7bbb3fd97d072c69071ab0ef4850 URL: https://github.com/kamailio/kamailio/commit/4dd854a32ccd7bbb3fd97d072c69071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-17T13:21:24+02:00 corex: docs added for rpc command shm.info --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4dd854a32ccd7bbb3fd97d072c69071… Patch: https://github.com/kamailio/kamailio/commit/4dd854a32ccd7bbb3fd97d072c69071… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 96c6fe4ae3..aecc5e895c 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -968,6 +968,20 @@ event_route[dispatcher:dst-down] { &sercmd; corex.pkg_summary pid 2345 &sercmd; corex.pkg_summary idx 1 </programlisting> + </section> + <section id="corex.rpc.shm.info"> + <title> + <function moreinfo="none">corex.shm.info</function> + </title> + <para> + Return shared memory manager details. + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc shm.info + </programlisting> </section> </section>

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Victor Seva 16 Sep '20

16 Sep '20

and we have the check of the value before at tmx/t_var.c 176: ``` if(t->uac[branch].reply==NULL || t->uac[branch].reply==FAKED_REPLY) return 1; ``` So it seems other worker touched that shared memory part meanwhile -- 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/2479#issuecomment-693346859

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Victor Seva 16 Sep '20

16 Sep '20

crash is due to tmx/t_var.c at 206: `` memcpy(_pv_trpl.buf, t->uac[branch].reply->buf, t->uac[branch].reply->len); `` ``` (gdb) f 1 #1 pv_t_update_rpl (msg=<optimized out>) at t_var.c:206 206 in t_var.c (gdb) p t $1 = (struct cell *) 0x7f59ab5c4f28 (gdb) p t->uac $2 = (struct ua_client *) 0x7f59ab5c51b8 (gdb) p t->uac[branch] $3 = {reply = 0x0, end_reply = 0x0, request = {rbtype = 0, flags = 172, t_active = 0, branch = 0, buffer_len = 1657, buffer = 0x7f59ab600680 "INVITE sip:testuser1003@127.1.0.1:50604 SIP/2.0\r\nRecord-Route: <sip:127.0.0.1:5062;lr=on;ftag=11791SIPpTag001;did=5a5.6a01;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=SlRwVBghIw0wLT9zNQYk"..., my_T = 0x7f59ab5c4f28, timer = {next = 0x0, prev = 0x0, expire = 352338360, initial_timeout = 16, data = 0x7d0, f = 0x7f59b5a813c0 <retr_buf_handler>, flags = 513, slow_idx = 0}, dst = {send_sock = 0x7f59b68e9290, to = {s = {sa_family = 2, sa_data = "\023\330\177\000\000\001\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 55315, sin_addr = {s_addr = 16777343}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 55315, sin6_flowinfo = 16777343, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 2, __ss_padding = "\023\330\177\000\000\001", '\000' <repeats 111 times>, __ss_align = 0}}, id = 0, send_flags = {f = 4, blst_imask = 0}, proto = 1 '\001', proto_pad0 = 0 '\000', proto_pad1 = 0}, retr_expire = 352338360, fr_expire = 352341219}, local_cancel = {rbtype = 0, flags = 0, t_active = 0, branch = 0, buffer_len = 0, buffer = 0x0, my_T = 0x7f59ab5c4f28, timer = {next = 0x0, prev = 0x0, expire = 0, initial_timeout = 0, data = 0x0, f = 0x7f59b5a813c0 <retr_buf_handler>, flags = 0, slow_idx = 0}, dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 0, __ss_padding = '\000' <repeats 117 times>, __ss_align = 0}}, id = 0, send_flags = {f = 0, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0}, retr_expire = 0, fr_expire = 0}, dns_h = {srv = 0x0, a = 0x0, srv_tried_rrs = 0, port = 0, srv_no = 0 '\000', ip_no = 0 '\000', proto = 0 '\000'}, uri = { s = 0x7f59ab600687 "sip:testuser1003@127.1.0.1:50604 SIP/2.0\r\nRecord-Route: <sip:127.0.0.1:5062;lr=on;ftag=11791SIPpTag001;did=5a5.6a01;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=SlRwVBghIw0wLT9zNQYkMA93fEh"..., len = 32}, path = { s = 0x7f59ab600d68 "<sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060>", len = 47}, instance = {s = 0x0, len = 0}, ruid = {s = 0x7f59ab600e00 "uloc-5f61608a-7966-8", len = 20}, location_ua = {s = 0x7f59ab600e80 "n/a", len = 3}, last_received = 302, flags = 5, branch_flags = 134259714, icode = 0, local_ack = 0x0, on_failure = 6, on_branch_failure = 0, on_reply = 2, on_unused = 0} (gdb) p t->uac[branch].reply $4 = (struct sip_msg *) 0x0 ``` -- 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/2479#issuecomment-693343276

1 0

git:master:c4d7b74b: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 16 Sep '20

16 Sep '20

Module: kamailio Branch: master Commit: c4d7b74be399cb1e4a5d40969b533f55398dd523 URL: https://github.com/kamailio/kamailio/commit/c4d7b74be399cb1e4a5d40969b533f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-16T09:01:19+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/c4d7b74be399cb1e4a5d40969b533f5… Patch: https://github.com/kamailio/kamailio/commit/c4d7b74be399cb1e4a5d40969b533f5…

1 0

git:master:01e8e339: kex: added pkg.info rpc command
by Daniel-Constantin Mierla 16 Sep '20

16 Sep '20

Module: kamailio Branch: master Commit: 01e8e339149ce1554747929cb63b843866c53aba URL: https://github.com/kamailio/kamailio/commit/01e8e339149ce1554747929cb63b843… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-16T07:22:09+02:00 kex: added pkg.info rpc command - get details about pkg manager --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/01e8e339149ce1554747929cb63b843… Patch: https://github.com/kamailio/kamailio/commit/01e8e339149ce1554747929cb63b843… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 9a2f4a2d37..ee6c637ace 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -259,11 +259,39 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) } } +/** + * + */ +static const char* rpc_pkg_info_doc[2] = { + "Private memory manager details", + 0 +}; + +/** + * + */ +static void rpc_pkg_info(rpc_t* rpc, void* ctx) +{ + void* th; + + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "su", + "name", (_pkg_root.mname)?_pkg_root.mname:"unknown", + "size", (unsigned int)pkg_mem_size) <0) { + rpc->fault(ctx, 500, "Internal error adding fields"); + return; + } +} + /** * */ rpc_export_t kex_pkg_rpc[] = { {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, RET_ARRAY}, + {"pkg.info", rpc_pkg_info, rpc_pkg_info_doc, 0}, {0, 0, 0, 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