sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
418 discussions

git:5.2:4e6345bb: sipdump: small whitespace fixes
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: 4e6345bbd0ca9b484b3031a4177040d524868a5c URL: https://github.com/kamailio/kamailio/commit/4e6345bbd0ca9b484b3031a4177040d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:03:10+01:00 sipdump: small whitespace fixes (cherry picked from commit 5d523e81c2a6ad1394254a36e9e143cb04e0171b) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4e6345bbd0ca9b484b3031a4177040d… Patch: https://github.com/kamailio/kamailio/commit/4e6345bbd0ca9b484b3031a4177040d… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 3714eb39e9..bf2c90c20f 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -206,7 +206,7 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) if(!sipdump_enabled()) return 1; - + memset(&sdi, 0, sizeof(sipdump_info_t)); sdi.buf.s = msg->buf; @@ -267,14 +267,14 @@ static int w_sipdump_send(sip_msg_t *msg, char *ptag, char *str2) } /** - * + * */ int sipdump_msg_received(sr_event_param_t *evp) { str wdata; sipdump_info_t sdi; char srcip_buf[IP_ADDR_MAX_STRZ_SIZE]; - + if(!sipdump_enabled()) return 0; @@ -319,7 +319,7 @@ int sipdump_msg_received(sr_event_param_t *evp) } /** - * + * */ int sipdump_msg_sent(sr_event_param_t *evp) { @@ -327,7 +327,7 @@ int sipdump_msg_sent(sr_event_param_t *evp) sipdump_info_t sdi; ip_addr_t ip; char dstip_buf[IP_ADDR_MAX_STRZ_SIZE]; - + if(!sipdump_enabled()) return 0;

1 0

git:5.2:7f66bb3b: seas: docs - removed mi_fifo from examples
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: 7f66bb3beccdb9489388dec24be48d6a0e810876 URL: https://github.com/kamailio/kamailio/commit/7f66bb3beccdb9489388dec24be48d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:02:46+01:00 seas: docs - removed mi_fifo from examples (cherry picked from commit 31b710b5ec402bf75b3babe5ffe440c429d3ec63) --- Modified: src/modules/seas/doc/seas_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7f66bb3beccdb9489388dec24be48d6… Patch: https://github.com/kamailio/kamailio/commit/7f66bb3beccdb9489388dec24be48d6… --- diff --git a/src/modules/seas/doc/seas_admin.xml b/src/modules/seas/doc/seas_admin.xml index 86af359f2d..2d734f6b6a 100644 --- a/src/modules/seas/doc/seas_admin.xml +++ b/src/modules/seas/doc/seas_admin.xml @@ -698,9 +698,7 @@ loadmodule "/usr/local/lib/kamailio/modules/usrloc.so" loadmodule "/usr/local/lib/kamailio/modules/registrar.so" loadmodule "/usr/local/lib/kamailio/modules/textops.so" loadmodule "/usr/local/lib/kamailio/modules/seas.so" -loadmodule "/usr/local/lib/kamailio/modules/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("usrloc", "db_mode", 0) modparam("rr", "enable_full_lr", 1) modparam("seas", "listen_sockets", "127.0.0.1:5080"); @@ -759,16 +757,14 @@ port=5060 children=4 reply_to_via=1 -listen = tcp:localhost:5060 -listen = udp:localhost:5060 +listen = tcp:localhost:5060 +listen = udp:localhost:5060 mpath="/home/elias/src/sipservlet/seas" loadmodule "modules/tm/tm.so" loadmodule "modules/seas/seas.so" -loadmodule "modules/mi_fifo/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("seas", "listen_sockets","127.0.0.1:5080") route{

1 0

git:master:936d58fc: modules: readme files regenerated - seas ... [skip ci]
by Kamailio Dev 22 Jan '20

22 Jan '20

Module: kamailio Branch: master Commit: 936d58fcbd7b7d929d227427ee578a25aa02af39 URL: https://github.com/kamailio/kamailio/commit/936d58fcbd7b7d929d227427ee578a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-22T17:46:11+01:00 modules: readme files regenerated - seas ... [skip ci] --- Modified: src/modules/seas/README --- Diff: https://github.com/kamailio/kamailio/commit/936d58fcbd7b7d929d227427ee578a2… Patch: https://github.com/kamailio/kamailio/commit/936d58fcbd7b7d929d227427ee578a2… --- diff --git a/src/modules/seas/README b/src/modules/seas/README index 2a93361aa8..6acbd8accf 100644 --- a/src/modules/seas/README +++ b/src/modules/seas/README @@ -754,9 +754,7 @@ loadmodule "/usr/local/lib/kamailio/modules/usrloc.so" loadmodule "/usr/local/lib/kamailio/modules/registrar.so" loadmodule "/usr/local/lib/kamailio/modules/textops.so" loadmodule "/usr/local/lib/kamailio/modules/seas.so" -loadmodule "/usr/local/lib/kamailio/modules/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("usrloc", "db_mode", 0) modparam("rr", "enable_full_lr", 1) modparam("seas", "listen_sockets", "127.0.0.1:5080"); @@ -820,9 +818,7 @@ mpath="/home/elias/src/sipservlet/seas" loadmodule "modules/tm/tm.so" loadmodule "modules/seas/seas.so" -loadmodule "modules/mi_fifo/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("seas", "listen_sockets","127.0.0.1:5080") route{

1 0

git:master:31b710b5: seas: docs - removed mi_fifo from examples
by Daniel-Constantin Mierla 22 Jan '20

22 Jan '20

Module: kamailio Branch: master Commit: 31b710b5ec402bf75b3babe5ffe440c429d3ec63 URL: https://github.com/kamailio/kamailio/commit/31b710b5ec402bf75b3babe5ffe440c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-22T17:40:19+01:00 seas: docs - removed mi_fifo from examples --- Modified: src/modules/seas/doc/seas_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/31b710b5ec402bf75b3babe5ffe440c… Patch: https://github.com/kamailio/kamailio/commit/31b710b5ec402bf75b3babe5ffe440c… --- diff --git a/src/modules/seas/doc/seas_admin.xml b/src/modules/seas/doc/seas_admin.xml index 86af359f2d..2d734f6b6a 100644 --- a/src/modules/seas/doc/seas_admin.xml +++ b/src/modules/seas/doc/seas_admin.xml @@ -698,9 +698,7 @@ loadmodule "/usr/local/lib/kamailio/modules/usrloc.so" loadmodule "/usr/local/lib/kamailio/modules/registrar.so" loadmodule "/usr/local/lib/kamailio/modules/textops.so" loadmodule "/usr/local/lib/kamailio/modules/seas.so" -loadmodule "/usr/local/lib/kamailio/modules/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("usrloc", "db_mode", 0) modparam("rr", "enable_full_lr", 1) modparam("seas", "listen_sockets", "127.0.0.1:5080"); @@ -759,16 +757,14 @@ port=5060 children=4 reply_to_via=1 -listen = tcp:localhost:5060 -listen = udp:localhost:5060 +listen = tcp:localhost:5060 +listen = udp:localhost:5060 mpath="/home/elias/src/sipservlet/seas" loadmodule "modules/tm/tm.so" loadmodule "modules/seas/seas.so" -loadmodule "modules/mi_fifo/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("seas", "listen_sockets","127.0.0.1:5080") route{

1 0

git:master:704c7f49: sipdump: kemi functions to return buf and tag values
by Daniel-Constantin Mierla 22 Jan '20

22 Jan '20

Module: kamailio Branch: master Commit: 704c7f490adc519038d5c2fbb31dd019cc221566 URL: https://github.com/kamailio/kamailio/commit/704c7f490adc519038d5c2fbb31dd01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-22T17:40:19+01:00 sipdump: kemi functions to return buf and tag values --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/704c7f490adc519038d5c2fbb31dd01… Patch: https://github.com/kamailio/kamailio/commit/704c7f490adc519038d5c2fbb31dd01… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index cbb3dfe8aa..1b77d13508 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -467,6 +467,43 @@ int sipdump_msg_sent(sr_event_param_t *evp) return 0; } +/** + * + */ +static sr_kemi_xval_t _ksr_kemi_sipdump_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_sipdump_get_buf(sip_msg_t *msg) +{ + memset(&_ksr_kemi_sipdump_xval, 0, sizeof(sr_kemi_xval_t)); + + if (sipdump_event_info==NULL) { + sr_kemi_xval_null(&_ksr_kemi_sipdump_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_sipdump_xval; + } + _ksr_kemi_sipdump_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sipdump_xval.v.s = sipdump_event_info->buf; + return &_ksr_kemi_sipdump_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_sipdump_get_tag(sip_msg_t *msg) +{ + memset(&_ksr_kemi_sipdump_xval, 0, sizeof(sr_kemi_xval_t)); + + if (sipdump_event_info==NULL) { + sr_kemi_xval_null(&_ksr_kemi_sipdump_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_sipdump_xval; + } + _ksr_kemi_sipdump_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sipdump_xval.v.s = sipdump_event_info->tag; + return &_ksr_kemi_sipdump_xval; +} + /** * */ @@ -477,6 +514,16 @@ static sr_kemi_t sr_kemi_sipdump_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sipdump"), str_init("get_buf"), + SR_KEMIP_XVAL, ki_sipdump_get_buf, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sipdump"), str_init("get_tag"), + SR_KEMIP_XVAL, ki_sipdump_get_tag, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:8ea44a69: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 22 Jan '20

22 Jan '20

Module: kamailio Branch: master Commit: 8ea44a690f308e0122660a13acf933de99a06250 URL: https://github.com/kamailio/kamailio/commit/8ea44a690f308e0122660a13acf933d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-22T13:31:13+01:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/8ea44a690f308e0122660a13acf933d… Patch: https://github.com/kamailio/kamailio/commit/8ea44a690f308e0122660a13acf933d…

1 0

git:master:2bdb4308: sipdump: docs for event route sipdump:msg
by Daniel-Constantin Mierla 22 Jan '20

22 Jan '20

Module: kamailio Branch: master Commit: 2bdb43082fefe107dc0348cfb5bcd96a99b11277 URL: https://github.com/kamailio/kamailio/commit/2bdb43082fefe107dc0348cfb5bcd96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-22T13:27:24+01:00 sipdump: docs for event route sipdump:msg --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2bdb43082fefe107dc0348cfb5bcd96… Patch: https://github.com/kamailio/kamailio/commit/2bdb43082fefe107dc0348cfb5bcd96… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 3369069b26..1a3e1db271 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -274,5 +274,25 @@ sipdump_send("cfg"); </section> </section> + <section> + <title>Event Routes</title> + <section> + <title> + <function moreinfo="none">sipdump:msg</function> + </title> + <para> + Executed when sipdump handles messages and mode parameter has flag 2 set. + The variable $sipdump(...) is available inside the event route. + </para> +<programlisting format="linespecific"> +... +event_route[sipdump:msg] { + xinfo("[$sipdump(tag)] [[$sipdump(buf)]]\n"); +} +... +</programlisting> + </section> + </section> + </chapter>

1 0

git:master:3a6a55ac: sipdump: docs for mode and event_callback parameters
by Daniel-Constantin Mierla 22 Jan '20

22 Jan '20

Module: kamailio Branch: master Commit: 3a6a55ac982fe06c73563a7030e3c79aaf693804 URL: https://github.com/kamailio/kamailio/commit/3a6a55ac982fe06c73563a7030e3c79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-22T13:17:34+01:00 sipdump: docs for mode and event_callback parameters --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3a6a55ac982fe06c73563a7030e3c79… Patch: https://github.com/kamailio/kamailio/commit/3a6a55ac982fe06c73563a7030e3c79… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 6581238de1..3369069b26 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -76,7 +76,7 @@ <section id="sipdump.p.enable"> <title><varname>enable</varname> (int)</title> <para> - Enable storage. + Enable sipdump activity. </para> <para> <emphasis> @@ -89,6 +89,26 @@ ... modparam("sipdump", "enable", 1) ... +</programlisting> + </example> + </section> + <section id="sipdump.p.mode"> + <title><varname>mode</varname> (int)</title> + <para> + Set the type of activity done by the module, the value can be set + based on flags: 1 - write to files; 2 - execute event route + </para> + <para> + <emphasis> + Default value is 1 (write to files). + </emphasis> + </para> + <example> + <title>Set <varname>mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sipdump", "mode", 3) +... </programlisting> </example> </section> @@ -166,6 +186,31 @@ modparam("sipdump", "folder", "/run/kamailio") ... modparam("sipdump", "fprefix", "ksipdump-") ... +</programlisting> + </example> + </section> + <section id="sipdump.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + Name of the KEMI function to be executed instead of the event route. + </para> + <para> + <emphasis> + Default value is not set. + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sipdump", "event_callback", "ksr_sipdump_event") +... +-- event callback function implemented in Lua +function ksr_sipdump_event(evname) + KSR.info("===== sipdump module triggered event: " .. evname .. "\n"); + return 1; +end +... </programlisting> </example> </section>

1 0

git:master:801eaa92: sipdump: option to run event_route[sipdump:msg] on rcv/snd messages
by Daniel-Constantin Mierla 22 Jan '20

22 Jan '20

Module: kamailio Branch: master Commit: 801eaa92b0ad67131744b8ec58ded01ba78c1bbe URL: https://github.com/kamailio/kamailio/commit/801eaa92b0ad67131744b8ec58ded01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-22T13:07:47+01:00 sipdump: option to run event_route[sipdump:msg] on rcv/snd messages - new modparam mode to control the behaviour, its values can be built from flags: - 1 - write to files (the existing behaviour), default - 2 - execute event route - inside event route, $sipdump(...) variable is available to get the buffer content and other related attributes - new modparam event_callback to set the KEMI function to be run instead of the event route --- Modified: src/modules/sipdump/sipdump_mod.c Modified: src/modules/sipdump/sipdump_write.h --- Diff: https://github.com/kamailio/kamailio/commit/801eaa92b0ad67131744b8ec58ded01… Patch: https://github.com/kamailio/kamailio/commit/801eaa92b0ad67131744b8ec58ded01…

1 0

git:master:5d523e81: sipdump: small whitespace fixes
by Daniel-Constantin Mierla 22 Jan '20

22 Jan '20

Module: kamailio Branch: master Commit: 5d523e81c2a6ad1394254a36e9e143cb04e0171b URL: https://github.com/kamailio/kamailio/commit/5d523e81c2a6ad1394254a36e9e143c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-22T11:02:39+01:00 sipdump: small whitespace fixes --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5d523e81c2a6ad1394254a36e9e143c… Patch: https://github.com/kamailio/kamailio/commit/5d523e81c2a6ad1394254a36e9e143c… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 3714eb39e9..bf2c90c20f 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -206,7 +206,7 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) if(!sipdump_enabled()) return 1; - + memset(&sdi, 0, sizeof(sipdump_info_t)); sdi.buf.s = msg->buf; @@ -267,14 +267,14 @@ static int w_sipdump_send(sip_msg_t *msg, char *ptag, char *str2) } /** - * + * */ int sipdump_msg_received(sr_event_param_t *evp) { str wdata; sipdump_info_t sdi; char srcip_buf[IP_ADDR_MAX_STRZ_SIZE]; - + if(!sipdump_enabled()) return 0; @@ -319,7 +319,7 @@ int sipdump_msg_received(sr_event_param_t *evp) } /** - * + * */ int sipdump_msg_sent(sr_event_param_t *evp) { @@ -327,7 +327,7 @@ int sipdump_msg_sent(sr_event_param_t *evp) sipdump_info_t sdi; ip_addr_t ip; char dstip_buf[IP_ADDR_MAX_STRZ_SIZE]; - + if(!sipdump_enabled()) return 0;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020