sr-dev

sr-dev@lists.kamailio.org

20 participants
45160 discussions

git:master:db61ed94: Merge pull request #2396 from kamailio/lazedo-patch-1
by GitHub 14 Jul '20

14 Jul '20

Module: kamailio Branch: master Commit: db61ed942fa4caf33e8fd44219f082632d3faee0 URL: https://github.com/kamailio/kamailio/commit/db61ed942fa4caf33e8fd44219f0826… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-07-14T10:06:58+02:00 Merge pull request #2396 from kamailio/lazedo-patch-1 core: don't close tcp connection for dropped non sip messages --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/db61ed942fa4caf33e8fd44219f0826… Patch: https://github.com/kamailio/kamailio/commit/db61ed942fa4caf33e8fd44219f0826… --- diff --git a/src/core/receive.c b/src/core/receive.c index a76fd14519..42f5382bbe 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -300,7 +300,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) LM_DBG("attempt of nonsip message processing failed\n"); } else if(ret == NONSIP_MSG_DROP) { LM_DBG("nonsip message processing completed\n"); - goto error02; + goto end; } } if(errsipmsg==1) {

1 0

git:master:007f9869: core: don't close tcp connection for dropped non sip messages
by GitHub 14 Jul '20

14 Jul '20

Module: kamailio Branch: master Commit: 007f98692bb6f7cb35adbb86ec6fb06f034614cc URL: https://github.com/kamailio/kamailio/commit/007f98692bb6f7cb35adbb86ec6fb06… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2020-07-13T13:01:43+01:00 core: don't close tcp connection for dropped non sip messages --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/007f98692bb6f7cb35adbb86ec6fb06… Patch: https://github.com/kamailio/kamailio/commit/007f98692bb6f7cb35adbb86ec6fb06… --- diff --git a/src/core/receive.c b/src/core/receive.c index a76fd14519..42f5382bbe 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -300,7 +300,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) LM_DBG("attempt of nonsip message processing failed\n"); } else if(ret == NONSIP_MSG_DROP) { LM_DBG("nonsip message processing completed\n"); - goto error02; + goto end; } } if(errsipmsg==1) {

1 0

git:master:491a8327: misc/examples: kemi lua - added debug callback function
by Daniel-Constantin Mierla 14 Jul '20

14 Jul '20

Module: kamailio Branch: master Commit: 491a8327933cb4471260fdd09ff93296a7a0ccfd URL: https://github.com/kamailio/kamailio/commit/491a8327933cb4471260fdd09ff9329… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-14T09:22:12+02:00 misc/examples: kemi lua - added debug callback function - commented - can be enabled to track the execution trace of the lua script --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/491a8327933cb4471260fdd09ff9329… Patch: https://github.com/kamailio/kamailio/commit/491a8327933cb4471260fdd09ff9329… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index f5906d0bde..a896529965 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -12,6 +12,43 @@ -- the execution of the script. Use KSR.x.exit() after it or KSR.x.drop() -- +-- debug callback function to print details of execution trace +--[[ +local ksr_exec_level=0 + +local function ksr_exec_hook(event) + local s = ""; + local t = debug.getinfo(3) + s = s .. ksr_exec_level .. ">>> " .. string.rep(" ", ksr_exec_level); + if t~=nil and t.currentline>=0 then + s = s .. t.short_src .. ":" .. t.currentline .. " "; + end + t=debug.getinfo(2) + if event=="call" then + ksr_exec_level = ksr_exec_level + 1; + else + ksr_exec_level = ksr_exec_level - 1; + if ksr_exec_level < 0 then + ksr_exec_level = 0; + end + end + if t.what=="main" then + if event=="call" then + s = s .. "begin " .. t.short_src; + else + s = s .. "end " .. t.short_src; + end + elseif t.what=="Lua" then + s = s .. event .. " " .. t.name or "(Lua)" .. " <" .. t.linedefined .. ":" .. t.short_src .. ">"; + else + s = s .. event .. " " .. t.name or "(C)" .. " [" .. t.what .. "] "; + end + KSR.info(s .. "\n"); +end + +debug.sethook(ksr_exec_hook, "cr") +ksr_exec_level=0 +]]-- -- global variables corresponding to defined values (e.g., flags) in kamailio.cfg FLT_ACC=1

1 0

Re: [sr-dev] [SR-Users] xHTTP_PROM with older Kamailio
by Marat Gareev 13 Jul '20

13 Jul '20

Hello, Karsten, Thanks for the link. I will definitely examine it.

1 0

[kamailio/kamailio] siptrace: add methods_blacklist_auto modparam (#2374)
by Nuno Ferreira 13 Jul '20

13 Jul '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description - Adds a new methods_blacklist_auto modparam that allows to ignore SIP method ids before mirroring traffic to a SIP capture server when trace_mode=1. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2374 -- Commit Summary -- * siptrace: add methods_blacklist_auto modparam -- File Changes -- M src/modules/siptrace/README (98) M src/modules/siptrace/doc/siptrace_admin.xml (109) M src/modules/siptrace/siptrace.c (56) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2374.patch https://github.com/kamailio/kamailio/pull/2374.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/2374

2 7

git:master:bcce030f: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 13 Jul '20

13 Jul '20

Module: kamailio Branch: master Commit: bcce030f65182995b96c04d3ed45e8cf43dd2a9a URL: https://github.com/kamailio/kamailio/commit/bcce030f65182995b96c04d3ed45e8c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-13T12:46:17+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/bcce030f65182995b96c04d3ed45e8c… Patch: https://github.com/kamailio/kamailio/commit/bcce030f65182995b96c04d3ed45e8c…

1 0

git:master:f39eca3d: siptrace: exec event_route[siptrace:msg] on message replication with core events
by Daniel-Constantin Mierla 13 Jul '20

13 Jul '20

Module: kamailio Branch: master Commit: f39eca3d9926372dd005ed60418f55a29a17a715 URL: https://github.com/kamailio/kamailio/commit/f39eca3d9926372dd005ed60418f55a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-13T12:24:44+02:00 siptrace: exec event_route[siptrace:msg] on message replication with core events - new parameter evcb_msg to set the kemi function name to be executed for this event callback - alternative to GH #2374 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/f39eca3d9926372dd005ed60418f55a… Patch: https://github.com/kamailio/kamailio/commit/f39eca3d9926372dd005ed60418f55a… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1368e954a6..1b7b014d0e 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -178,6 +178,9 @@ socket_info_t *trace_send_sock_info = 0; str trace_dup_uri_str = {0, 0}; sip_uri_t *trace_dup_uri = 0; +static str _siptrace_evcb_msg = STR_NULL; +static int _siptrace_evrt_msg_idx = -1; + static unsigned short traced_user_avp_type = 0; static int_str traced_user_avp; static str traced_user_avp_str = {NULL, 0}; @@ -254,6 +257,7 @@ static param_export_t params[] = { {"trace_db_mode", INT_PARAM, &trace_db_mode}, {"trace_init_mode", PARAM_INT, &_siptrace_init_mode}, {"trace_mode", PARAM_INT, &_siptrace_mode}, + {"evcb_msg", PARAM_STR, &_siptrace_evcb_msg}, {0, 0, 0} }; /* clang-format on */ @@ -302,6 +306,8 @@ static int mod_init(void) } #endif + _siptrace_evrt_msg_idx = route_lookup(&event_rt, "siptrace:msg"); + if(trace_db_delayed!=0) { trace_db_mode = 1; } @@ -2017,6 +2023,56 @@ static void trace_free_info(void* trace_info) shm_free(trace_info); } +static int siptrace_exec_evcb_msg(siptrace_data_t *sto) +{ + int backup_rt; + run_act_ctx_t ctx; + run_act_ctx_t *bctx; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("siptrace:msg"); + sip_msg_t msg; + + if(_siptrace_evrt_msg_idx < 0 && _siptrace_evcb_msg.len<=0) { + return 0; + } + + if(sto == NULL || sto->body.s == NULL || sto->body.len <= 0) { + return -1; + } + + memset(&msg, 0, sizeof(sip_msg_t)); + msg.buf = sto->body.s; + msg.len = sto->body.len; + if(parse_msg(msg.buf, msg.len, &msg) != 0) { + LM_DBG("parse_msg failed\n"); + return -1; + } + + backup_rt = get_route_type(); + set_route_type(EVENT_ROUTE); + init_run_actions_ctx(&ctx); + + if(_siptrace_evrt_msg_idx>=0) { + run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, 0); + } else { + keng = sr_kemi_eng_get(); + if (keng!=NULL) { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + (void)sr_kemi_route(keng, &msg, EVENT_ROUTE, + &_siptrace_evcb_msg, &evname); + sr_kemi_act_ctx_set(bctx); + } + } + + free_sip_msg(&msg); + set_route_type(backup_rt); + if(ctx.run_flags & DROP_R_F) { + return DROP_R_F; + } + return RETURN_R_F; +} + /** * */ @@ -2067,6 +2123,11 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.dir = "in"; + if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { + /* drop() used in event_route - all done */ + return 0; + } + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); } @@ -2187,6 +2248,11 @@ int siptrace_net_data_send(sr_event_param_t *evp) sto.dir = "out"; + if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { + /* drop() used in event_route - all done */ + return 0; + } + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); }

1 0

git:master:e9eeb088: siptrace: docs for evcb_msg param and event_route[siptrace:msg]
by Daniel-Constantin Mierla 13 Jul '20

13 Jul '20

Module: kamailio Branch: master Commit: e9eeb0881569f77bcdd9d9590bfa0d9cf144b4a4 URL: https://github.com/kamailio/kamailio/commit/e9eeb0881569f77bcdd9d9590bfa0d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-13T12:33:50+02:00 siptrace: docs for evcb_msg param and event_route[siptrace:msg] --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e9eeb0881569f77bcdd9d9590bfa0d9… Patch: https://github.com/kamailio/kamailio/commit/e9eeb0881569f77bcdd9d9590bfa0d9… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 7d5b0d34ef..6966289a69 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -629,6 +629,25 @@ Supported on HEPv3 only. ... modparam("siptrace", "auth_key", "spoihepuirthpeuia") ... +</programlisting> + </example> + </section> + <section id="siptrace.p.evcb_msg"> + <title><varname>evcb_msg</varname> (str)</title> + <para> + Set the name of KEMI function to be executed instead of + event_route[siptrace:msg]. + </para> + <para> + Default value is empty. + </para> + <example> + <title>Set <varname>evcb_msg</varname> + parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") +... </programlisting> </example> </section> @@ -794,6 +813,33 @@ hlog("$hdr(P-MyID)", "Another one with a custom correlation ID"); </section> </section> + <section> + <title>Event Routes</title> + <section id="siptrace.ev.siptrace_msg"> + <title> + <function moreinfo="none">event_route[siptrace:msg]</function> + </title> + <para> + The event route is executed when mirroring SIP traffic using core event + callbacks (data in/out on network). If drop() is used, then the mirroring + is no longer done. + </para> + <para> + Note: now only message content (e.g., headers, body) can be used for + conditions in the event route, the source and destination addresses are + not yet available. + </para> + <programlisting format="linespecific"> +... +event_route[siptrace:msg] { + if(is_method("OPTIONS")) { + drop(); + } +} +... + </programlisting> + </section> + </section> <section> <title>Database setup</title> <para>

1 0

git:master:65dd3957: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 13 Jul '20

13 Jul '20

Module: kamailio Branch: master Commit: 65dd39575729bf6271255f37f31a7721ba1d8e50 URL: https://github.com/kamailio/kamailio/commit/65dd39575729bf6271255f37f31a772… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-13T10:16:27+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/65dd39575729bf6271255f37f31a772… Patch: https://github.com/kamailio/kamailio/commit/65dd39575729bf6271255f37f31a772… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index c9688e65d7..e1841bf545 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2017 asipto.com + Copyright Â© 2017 asipto.com __________________________________________________________________ Table of Contents @@ -229,7 +229,7 @@ end 4.1. sipdump_send(tag) -4.1. sipdump_send(tag) +4.1. sipdump_send(tag) Send the details of the current SIP message to the writer process and get it stored in the file. @@ -248,7 +248,7 @@ sipdump_send("cfg"); 5.1. sipdump.enable -5.1. sipdump.enable +5.1. sipdump.enable Control the value for "enable" parameter. @@ -268,10 +268,13 @@ kamcmd sipdump.enable 0 6.1. sipdump:msg -6.1. sipdump:msg +6.1. sipdump:msg Executed when sipdump handles messages and mode parameter has flag 2 set. The variable $sipdump(...) is available inside the event route. + + If drop() is used in event_route, then writing to file is no longer + done when mode parameter has also the flag 1 set. ... event_route[sipdump:msg] { xinfo("[$sipdump(tag)] [[$sipdump(buf)]]\n");

1 0

git:master:f984505b: sipdump: docs - note about use of drop() in event route
by Daniel-Constantin Mierla 13 Jul '20

13 Jul '20

Module: kamailio Branch: master Commit: f984505b3ed41b7faf0fca5ab978c52240cd60a0 URL: https://github.com/kamailio/kamailio/commit/f984505b3ed41b7faf0fca5ab978c52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-13T10:08:42+02:00 sipdump: docs - note about use of drop() in event route --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f984505b3ed41b7faf0fca5ab978c52… Patch: https://github.com/kamailio/kamailio/commit/f984505b3ed41b7faf0fca5ab978c52…

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