sr-dev July 2020

sr-dev@lists.kamailio.org

26 participants
390 discussions

git:5.4:d6dbd6aa: core: only skip over proto in alias inside uri_trim_rcv_alias()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: d6dbd6aa1816ca3f18059db20cb6c47b4a9fb17a URL: https://github.com/kamailio/kamailio/commit/d6dbd6aa1816ca3f18059db20cb6c47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-14T11:20:52+02:00 core: only skip over proto in alias inside uri_trim_rcv_alias() - variable not used if set to the corresponding integer id (cherry picked from commit 58b0631aafd7d6efa5534009fab197336468a9f8) --- Modified: src/core/dset.c --- Diff: https://github.com/kamailio/kamailio/commit/d6dbd6aa1816ca3f18059db20cb6c47… Patch: https://github.com/kamailio/kamailio/commit/d6dbd6aa1816ca3f18059db20cb6c47… --- diff --git a/src/core/dset.c b/src/core/dset.c index db2de4cfc7..16e1cdc12e 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -1039,7 +1039,6 @@ int uri_trim_rcv_alias(str *uri, str *nuri) char *p; str skip; str ip, port; - int proto; if(uri == NULL || nuri == NULL) { LM_ERR("invalid parameter value\n"); @@ -1089,7 +1088,7 @@ int uri_trim_rcv_alias(str *uri, str *nuri) /* proper alias parameter not found */ return 0; } - proto = (int)(*p - '0'); + /* jump over proto */ p++; if(p != uri->s + uri->len && *p != ';') {

4 years

git:master:58b0631a: core: only skip over proto in alias inside uri_trim_rcv_alias()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 58b0631aafd7d6efa5534009fab197336468a9f8 URL: https://github.com/kamailio/kamailio/commit/58b0631aafd7d6efa5534009fab1973… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-14T11:18:53+02:00 core: only skip over proto in alias inside uri_trim_rcv_alias() - variable not used if set to the corresponding integer id --- Modified: src/core/dset.c --- Diff: https://github.com/kamailio/kamailio/commit/58b0631aafd7d6efa5534009fab1973… Patch: https://github.com/kamailio/kamailio/commit/58b0631aafd7d6efa5534009fab1973… --- diff --git a/src/core/dset.c b/src/core/dset.c index db2de4cfc7..16e1cdc12e 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -1039,7 +1039,6 @@ int uri_trim_rcv_alias(str *uri, str *nuri) char *p; str skip; str ip, port; - int proto; if(uri == NULL || nuri == NULL) { LM_ERR("invalid parameter value\n"); @@ -1089,7 +1088,7 @@ int uri_trim_rcv_alias(str *uri, str *nuri) /* proper alias parameter not found */ return 0; } - proto = (int)(*p - '0'); + /* jump over proto */ p++; if(p != uri->s + uri->len && *p != ';') {

4 years

[kamailio/kamailio] core: don't close tcp connection for dropped non sip messages (#2396)

by lazedo

#### 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) - [X] 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) - [ ] New feature (non-breaking change which adds new functionality) - [X] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description when handling non sip messages in a module thru the callback, if we return `NONSIP_MSG_DROP` the tcp/websocket connection is closed. this was observed when receiving non sip messages with websocket module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2396 -- Commit Summary -- * core: don't close tcp connection for dropped non sip messages -- File Changes -- M src/core/receive.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2396.patch https://github.com/kamailio/kamailio/pull/2396.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/2396

4 years

git:master:db61ed94: Merge pull request #2396 from kamailio/lazedo-patch-1

by GitHub

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) {

4 years

git:master:007f9869: core: don't close tcp connection for dropped non sip messages

by GitHub

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) {

4 years

git:master:491a8327: misc/examples: kemi lua - added debug callback function

by Daniel-Constantin Mierla

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

4 years

Re: [sr-dev] [SR-Users] xHTTP_PROM with older Kamailio

by Marat Gareev

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

4 years

[kamailio/kamailio] siptrace: add methods_blacklist_auto modparam (#2374)

by Nuno Ferreira

#### 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

4 years

git:master:bcce030f: modules: readme files regenerated - siptrace ... [skip ci]

by Kamailio Dev

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…

4 years

git:master:e9eeb088: siptrace: docs for evcb_msg param and event_route[siptrace:msg]

by Daniel-Constantin Mierla

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>

4 years

← Newer
1
...
21
22
23
24
25
26
27
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2020