sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:5.0:cb42b988: pkg/obs: enable the same modules for RHEL 7 as for Centos 7
by Ãyvind Kolbu 07 Nov '17

07 Nov '17

Module: kamailio Branch: 5.0 Commit: cb42b9881b3d1f90f3cb54765eef65ce9d773f92 URL: https://github.com/kamailio/kamailio/commit/cb42b9881b3d1f90f3cb54765eef65c… Author: Oyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-11-07T10:42:46+01:00 pkg/obs: enable the same modules for RHEL 7 as for Centos 7 - GH #1293 (cherry picked from commit 612e96d8a2cc2a9ac31a7fb05508084fb82dbcf5) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cb42b9881b3d1f90f3cb54765eef65c… Patch: https://github.com/kamailio/kamailio/commit/cb42b9881b3d1f90f3cb54765eef65c… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 4cf0d11441..9f0b2a9f12 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -132,18 +132,18 @@ %if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 %define dist_name rhel %define dist_version %{?rhel} -%bcond_with cnxcc +%bcond_without cnxcc %bcond_with dnssec -%bcond_with geoip -%bcond_with http_async_client -%bcond_with jansson -%bcond_with json -%bcond_with kazoo -%bcond_with memcached +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without kazoo +%bcond_without memcached %bcond_without perl %bcond_without redis -%bcond_with sctp -%bcond_with websocket +%bcond_without sctp +%bcond_without websocket %bcond_without xmlrpc %endif

1 0

[kamailio/kamailio] kamailio as sipcapture node, hep3 over tcp (#1294)
by Amit Zigelman 06 Nov '17

06 Nov '17

### Description I tried using the Kamailio as a sip capture node, with TCP and captagent sending data to it using HEP3 protocol #### Reproduction send sip traffic to the Kamailio node over tcp - hep3 #### SIP Traffic  ``` T 10.62.232.8:59218 -> 172.17.0.2:9060 [AP] HEP3..................................... Y...... . ................ ......... >....... "./.......myhep.....SOPTIONS sip:34.222.33.444:5060 SIP/2.0. Via: SIP/2.0/UDP 34.222.33.444:5060;branch=z9hG4bKadc3.94894fb2.0. To: sip:34.222.33.444:5060. From: <sip:dispatcher@localhost>;tag=8176c6985887ae1fa077926d61f38185-6330. CSeq: 14 OPTIONS. Call-ID: 524281af251ad3ae-5781(a)10.62.232.8. Max-Forwards: 70. Content-Length: 0. User-Agent: user. . ERROR MSG: ############### 8(16359) ERROR: <core> [core/tcp_read.c:1391]: tcp_read_req(): bad request, state=7, error=4 buf: HEP3� parsed: HEP3� ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.0-dev8 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 15:58:15 Nov 1 2017 with gcc 4.9.2 ``` * **Operating System**:  ``` Linux 15e97661fc7f 4.9.43-17.39.amzn1.x86_64 #1 SMP Fri Sep 15 23:39:41 UTC 2017 x86_64 GNU/Linux ``` I saw it on the master branch updated to 1/11/2017 I also saw it was addressed before, but it still doesn't seem to work for me, am I missing something? https://github.com/kamailio/kamailio/issues/599 -- 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/1294

2 18

git:master:684059ca: dmq_usrloc: include server_id in replicated contacts
by Charles Chance 06 Nov '17

06 Nov '17

Module: kamailio Branch: master Commit: 684059ca5bb76e2006a9560ac1efa8c3540d3a58 URL: https://github.com/kamailio/kamailio/commit/684059ca5bb76e2006a9560ac1efa8c… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-11-06T15:39:41Z dmq_usrloc: include server_id in replicated contacts --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/684059ca5bb76e2006a9560ac1efa8c… Patch: https://github.com/kamailio/kamailio/commit/684059ca5bb76e2006a9560ac1efa8c… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index de01bc2062..1a7eef0ab8 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -323,12 +323,12 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action, dmq_node_t* node) { static ucontact_info_t ci; srjson_t *it = NULL; unsigned int action, expires, cseq, flags, cflags, q, last_modified, - methods, reg_id; + methods, reg_id, server_id; str aor=STR_NULL, ruid=STR_NULL, received=STR_NULL, instance=STR_NULL; static str c=STR_NULL, callid=STR_NULL, path=STR_NULL, user_agent=STR_NULL; action = expires = cseq = flags = cflags = q = last_modified - = methods = reg_id = 0; + = methods = reg_id = server_id = 0; for(it=jdoc_action; it; it = it->next) { if (it->string == NULL) continue; @@ -375,6 +375,8 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action, dmq_node_t* node) { methods = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "reg_id")==0) { reg_id = SRJSON_GET_UINT(it); + } else if (strcmp(it->string, "server_id")==0) { + server_id = SRJSON_GET_UINT(it); } else { LM_ERR("unrecognized field in json object\n"); } @@ -394,6 +396,7 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action, dmq_node_t* node) { ci.methods = methods; ci.instance = instance; ci.reg_id = reg_id; + ci.server_id = server_id; ci.tcpconn_id = -1; ci.last_modified = last_modified; @@ -646,7 +649,7 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node return -1; } LM_DBG("group size[%d]\n", jdoc_contact_group.size); - jdoc_contact_group.size += 188; // json overhead ("":{"action":,"aor":"","ruid":"","c":""...) + jdoc_contact_group.size += 201; // json overhead ("":{"action":,"aor":"","ruid":"","c":""...) srjson_AddNumberToObject(jdoc, jdoc_contact, "action", action); jdoc_contact_group.size += snprintf(NULL,0,"%d", action); @@ -683,6 +686,8 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node jdoc_contact_group.size += snprintf(NULL,0,"%u", ptr->methods); srjson_AddNumberToObject(jdoc, jdoc_contact, "reg_id", ptr->reg_id); jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->reg_id); + srjson_AddNumberToObject(jdoc, jdoc_contact, "server_id", ptr->server_id); + jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->server_id); char idx[5]; jdoc_contact_group.count++; @@ -729,6 +734,7 @@ int usrloc_dmq_send_contact(ucontact_t* ptr, str aor, int action, dmq_node_t* no srjson_AddNumberToObject(&jdoc, jdoc.root, "last_modified", ptr->last_modified); srjson_AddNumberToObject(&jdoc, jdoc.root, "methods", ptr->methods); srjson_AddNumberToObject(&jdoc, jdoc.root, "reg_id", ptr->reg_id); + srjson_AddNumberToObject(&jdoc, jdoc.root, "server_id", ptr->server_id); jdoc.buf.s = srjson_PrintUnformatted(&jdoc, jdoc.root); if(jdoc.buf.s==NULL) {

1 0

git:master:76718ed2: core: tcp - execute receive msg after nonsip-hook for hep3 packets
by Daniel-Constantin Mierla 06 Nov '17

06 Nov '17

Module: kamailio Branch: master Commit: 76718ed2622be33d3aa28621889e02338e886094 URL: https://github.com/kamailio/kamailio/commit/76718ed2622be33d3aa28621889e023… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-06T12:54:18+01:00 core: tcp - execute receive msg after nonsip-hook for hep3 packets --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/76718ed2622be33d3aa28621889e023… Patch: https://github.com/kamailio/kamailio/commit/76718ed2622be33d3aa28621889e023… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index fc4c7a1248..8fb371bd9d 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -70,6 +70,7 @@ #include "forward.h" #include "events.h" #include "stun.h" +#include "nonsip_hooks.h" #ifdef READ_HTTP11 #define HTTP11CONTINUE "HTTP/1.1 100 Continue\r\nContent-Length: 0\r\n\r\n" @@ -1325,9 +1326,21 @@ static int hep3_process_msg(char* tcpbuf, unsigned int len, evp.data = (void*)(&msg); ret=sr_event_exec(SREV_RCV_NOSIP, &evp); LM_DBG("running hep3 handling event returned %d\n", ret); + if(ret == NONSIP_MSG_DROP) { + free_sip_msg(&msg); + return 0; + } + if(ret < 0) { + LM_ERR("error running hep3 handling event: %d\n", ret); + free_sip_msg(&msg); + return -1; + } + + ret = receive_msg(msg.buf, msg.len, rcv_info); + LM_DBG("running hep3-enclosed sip request route returned %d\n", ret); free_sip_msg(&msg); - return 0; + return ret; } /**

1 0

git:master:b0de27c7: core: tcp - fixed condition to match HEP3 packet header
by Daniel-Constantin Mierla 05 Nov '17

05 Nov '17

Module: kamailio Branch: master Commit: b0de27c797b60d75db882d2da606e9e38ebd5304 URL: https://github.com/kamailio/kamailio/commit/b0de27c797b60d75db882d2da606e9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T17:14:11+01:00 core: tcp - fixed condition to match HEP3 packet header --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/b0de27c797b60d75db882d2da606e9e… Patch: https://github.com/kamailio/kamailio/commit/b0de27c797b60d75db882d2da606e9e… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index c3e87ee34d..fc4c7a1248 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1271,7 +1271,7 @@ static int tcp_read_hep3(struct tcp_connection *c, int* read_flags) goto skip; } - if(p[0]!='H' || p[1]!='E' || p[2]!='P' || p[3]=='3') { + if(p[0]!='H' || p[1]!='E' || p[2]!='P' || p[3]!='3') { /* not hep3 */ LM_DBG("not HEP3 packet header (%u): %c %c %c %c / %x %x %x %x\n", size, p[0], p[1], p[2], p[3], p[0], p[1], p[2], p[3]);

1 0

git:master:875ac29b: core: tcp - print first characters if matching hep3 header fails
by Daniel-Constantin Mierla 05 Nov '17

05 Nov '17

Module: kamailio Branch: master Commit: 875ac29b629f570ada81462c384e2abe9952a249 URL: https://github.com/kamailio/kamailio/commit/875ac29b629f570ada81462c384e2ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T13:44:45+01:00 core: tcp - print first characters if matching hep3 header fails --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/875ac29b629f570ada81462c384e2ab… Patch: https://github.com/kamailio/kamailio/commit/875ac29b629f570ada81462c384e2ab… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 18868f1d7a..c3e87ee34d 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1273,7 +1273,8 @@ static int tcp_read_hep3(struct tcp_connection *c, int* read_flags) if(p[0]!='H' || p[1]!='E' || p[2]!='P' || p[3]=='3') { /* not hep3 */ - LM_DBG("not HEP3 packet header\n"); + LM_DBG("not HEP3 packet header (%u): %c %c %c %c / %x %x %x %x\n", + size, p[0], p[1], p[2], p[3], p[0], p[1], p[2], p[3]); goto skip; } r->flags |= F_TCP_REQ_HEP3; @@ -1293,7 +1294,7 @@ static int tcp_read_hep3(struct tcp_connection *c, int* read_flags) } r->flags |= F_TCP_REQ_COMPLETE; - r->parsed = &p[len]; + r->parsed = p + len; LM_DBG("reading of HEP3 packet is complete (%u / %u)\n", len, size); skip:

1 0

git:master:c70f0941: modules: readme files regenerated - msrp ... [skip ci]
by Kamailio Dev 05 Nov '17

05 Nov '17

Module: kamailio Branch: master Commit: c70f094138033b987bb5b276363de2388d86d47a URL: https://github.com/kamailio/kamailio/commit/c70f094138033b987bb5b276363de23… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-05T11:31:25+01:00 modules: readme files regenerated - msrp ... [skip ci] --- Modified: src/modules/msrp/README Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/c70f094138033b987bb5b276363de23… Patch: https://github.com/kamailio/kamailio/commit/c70f094138033b987bb5b276363de23… --- diff --git a/src/modules/msrp/README b/src/modules/msrp/README index f96b350a7d..b55af6955d 100644 --- a/src/modules/msrp/README +++ b/src/modules/msrp/README @@ -264,7 +264,7 @@ modparam("msrp", "use_path_addr", "msrp.kamailio.org:5061") Example 1.7. Set event_callback parameter ... -modparam("htable", "event_callback", "ksr_msrp_event") +modparam("msrp", "event_callback", "ksr_msrp_event") ... -- event callback function implemented in Lua function ksr_msrp_event(evname) diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index fa373d261a..c4adc983e6 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -50,6 +50,7 @@ Alexandr Dubovikov 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) 3.21. nonsip_hook (int) + 3.22. event_callback (str) 4. Functions @@ -91,10 +92,11 @@ Alexandr Dubovikov 1.19. Set callid_aleg_header parameter 1.20. Set topoh_unmask parameter 1.21. Set nonsip_hook parameter - 1.22. sip_capture() usage - 1.23. report_capture() usage + 1.22. Set event_callback parameter + 1.23. sip_capture() usage 1.24. report_capture() usage - 1.25. event_route[sipcapture:request] usage + 1.25. report_capture() usage + 1.26. event_route[sipcapture:request] usage Chapter 1. Admin Guide @@ -129,6 +131,7 @@ Chapter 1. Admin Guide 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) 3.21. nonsip_hook (int) + 3.22. event_callback (str) 4. Functions @@ -202,6 +205,7 @@ Chapter 1. Admin Guide 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) 3.21. nonsip_hook (int) + 3.22. event_callback (str) 3.1. db_url (str) @@ -484,6 +488,28 @@ modparam("sipcapture", "topoh_unmask", 1) modparam("sipcapture", "nonsip_hook", 1) ... +3.22. event_callback (str) + + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks. + + The function receives a string parameter with the name of the event, + the values can be: 'sipcapture:request'. + + Default value is 'empty' (no function is executed for events). + + Example 1.22. Set event_callback parameter +... +modparam("sipcapture", "event_callback", "ksr_sipcapture_event") +... +-- event callback function implemented in Lua +function ksr_sipcapture_event(evname) + KSR.info("===== sipcapture module triggered event: " .. evname .. "\n"); + return 1; +end +... + 4. Functions 4.1. sip_capture([table], [cmode]) @@ -506,7 +532,7 @@ modparam("sipcapture", "nonsip_hook", 1) This function can be used from ANY_ROUTE. Default value is "NULL". - Example 1.22. sip_capture() usage + Example 1.23. sip_capture() usage ... sip_capture(); ... @@ -527,7 +553,7 @@ sip_capture("", "cmode"); This function can be used from ANY_ROUTE. Default value is "NULL". - Example 1.23. report_capture() usage + Example 1.24. report_capture() usage ... report_capture(); ... @@ -543,7 +569,7 @@ report_capture("report_data", "$ci", "{\"MOS\":4.1,\"PACKET_LOST\":100"}); This function can be used from ANY_ROUTE. - Example 1.24. report_capture() usage + Example 1.25. report_capture() usage ... $var(res) = float2int("10.5", "1"); ... @@ -557,7 +583,7 @@ $var(res) = float2int("10.5", "1"); Event route block to be executed when HEP packet is received. It requires module parameter 'nonsip_hook' to be set to 1. - Example 1.25. event_route[sipcapture:request] usage + Example 1.26. event_route[sipcapture:request] usage ... # new event sipcapture socket modparam("sipcapture", "nonsip_hook", 1)

1 0

git:master:872ef07a: sipcapture: documentation for event_callback parameter
by Daniel-Constantin Mierla 05 Nov '17

05 Nov '17

Module: kamailio Branch: master Commit: 872ef07aec3aaf72d5ade9360fc5eb5e72aa5668 URL: https://github.com/kamailio/kamailio/commit/872ef07aec3aaf72d5ade9360fc5eb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T11:23:08+01:00 sipcapture: documentation for event_callback parameter --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/872ef07aec3aaf72d5ade9360fc5eb5… Patch: https://github.com/kamailio/kamailio/commit/872ef07aec3aaf72d5ade9360fc5eb5… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index ef89683153..57b84f96bb 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -513,7 +513,40 @@ modparam("sipcapture", "nonsip_hook", 1) </example> </section> -</section> + <section id="sipcapture.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks. + </para> + <para> + The function receives a string parameter with the name of the event, + the values can be: 'sipcapture:request'. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sipcapture", "event_callback", "ksr_sipcapture_event") +... +-- event callback function implemented in Lua +function ksr_sipcapture_event(evname) + KSR.info("===== sipcapture module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> + +</section> + <section> <title>Functions</title> <section id="sipcapture.f.sip_capture">

1 0

git:master:d56a48ac: msrp: fixed module name in event_callback example
by Daniel-Constantin Mierla 05 Nov '17

05 Nov '17

Module: kamailio Branch: master Commit: d56a48ac7390199e893ea478704c9589c4a14012 URL: https://github.com/kamailio/kamailio/commit/d56a48ac7390199e893ea478704c958… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T11:23:08+01:00 msrp: fixed module name in event_callback example --- Modified: src/modules/msrp/doc/msrp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d56a48ac7390199e893ea478704c958… Patch: https://github.com/kamailio/kamailio/commit/d56a48ac7390199e893ea478704c958… --- diff --git a/src/modules/msrp/doc/msrp_admin.xml b/src/modules/msrp/doc/msrp_admin.xml index ca1720d893..b1f75f9fed 100644 --- a/src/modules/msrp/doc/msrp_admin.xml +++ b/src/modules/msrp/doc/msrp_admin.xml @@ -233,7 +233,7 @@ modparam("msrp", "use_path_addr", "msrp.kamailio.org:5061") <title>Set <varname>event_callback</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("htable", "event_callback", "ksr_msrp_event") +modparam("msrp", "event_callback", "ksr_msrp_event") ... -- event callback function implemented in Lua function ksr_msrp_event(evname)

1 0

git:master:58014d89: sipcapture: ability to run event route callback via kemi framework
by Daniel-Constantin Mierla 05 Nov '17

05 Nov '17

Module: kamailio Branch: master Commit: 58014d8915e550848fbf9eacb505d91fd99e24a3 URL: https://github.com/kamailio/kamailio/commit/58014d8915e550848fbf9eacb505d91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T11:23:08+01:00 sipcapture: ability to run event route callback via kemi framework - parameter event_callback has to be set to kemi callback function name --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/58014d8915e550848fbf9eacb505d91… Patch: https://github.com/kamailio/kamailio/commit/58014d8915e550848fbf9eacb505d91… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index ede6d87a47..fbb697d18b 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -246,9 +246,9 @@ int hep_offset = 0; str raw_socket_listen = {0, 0}; str raw_interface = {0, 0}; char *authkey = NULL, *correlation_id = NULL; - str callid_aleg_headers[MAX_HEADERS]; int n_callid_aleg_headers = 0; +str sc_event_callback = STR_NULL; struct ifreq ifr; /* interface structure */ @@ -395,6 +395,7 @@ static param_export_t params[] = { {"table_time_sufix", PARAM_STR, &table_time_sufix}, {"topoh_unmask", PARAM_INT, &sc_topoh_unmask}, {"nonsip_hook", PARAM_INT, &nonsip_hook}, + {"event_callback", PARAM_STR, &sc_event_callback}, {0, 0, 0} }; @@ -746,6 +747,7 @@ static int mod_init(void) { struct ip_addr *ip = NULL; char *def_params = NULL; + sr_kemi_eng_t *keng = NULL; #ifdef STATISTICS int cnt = 0; @@ -884,18 +886,28 @@ static int mod_init(void) *capture_on_flag = capture_on; if(nonsip_hook) { - route_no = route_get(&event_rt, "sipcapture:request"); - if(route_no == -1) { - LM_ERR("failed to find event_route[sipcapture:request]\n"); - return -1; - } + if(sc_event_callback.s == NULL || sc_event_callback.len <= 0) { + route_no = route_get(&event_rt, "sipcapture:request"); + if(route_no == -1) { + LM_ERR("failed to find event_route[sipcapture:request]\n"); + return -1; + } - if(event_rt.rlist[route_no] == 0) { - LM_ERR("event_route[sipcapture:request] is empty\n"); - return -1; - } + if(event_rt.rlist[route_no] == 0) { + LM_ERR("event_route[sipcapture:request] is empty\n"); + return -1; + } - hep_route_no = route_no; + hep_route_no = route_no; + } else { + hep_route_no = -1; + keng = sr_kemi_eng_get(); + if(keng == NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + sc_event_callback.s); + return -1; + } + } if(sr_event_register_cb(SREV_RCV_NOSIP, nosip_hep_msg) < 0) { LM_ERR("failed to register SREV_RCV_NOSIP event\n"); @@ -2880,6 +2892,9 @@ static int nosip_hep_msg(sr_event_param_t *evp) int len = 0; struct run_act_ctx ra_ctx; int ret = 0; + int rtb; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("sipcapture:request"); msg = (sip_msg_t *)evp->data; @@ -2888,12 +2903,37 @@ static int nosip_hep_msg(sr_event_param_t *evp) buf = msg->buf; len = msg->len; - /* first send to route */ - init_run_actions_ctx(&ra_ctx); - ret = run_actions(&ra_ctx, event_rt.rlist[hep_route_no], msg); - - if(ret != 1) - return ret; + rtb = get_route_type(); + set_route_type(EVENT_ROUTE); + if(hep_route_no>=-1) { + /* first send to route */ + init_run_actions_ctx(&ra_ctx); + ret = run_actions(&ra_ctx, event_rt.rlist[hep_route_no], msg); + + if(ret != 1) { + LM_DBG("return code from event route: %d - skipping\n", ret); + set_route_type(rtb); + return ret; + } + } else { + if(sc_event_callback.s == NULL || sc_event_callback.len <= 0) { + LM_ERR("no kemi callback set\n"); + set_route_type(rtb); + return -1; + } + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_ERR("kemi engine not available\n"); + set_route_type(rtb); + return -1; + } + if(keng->froute(msg, EVENT_ROUTE, &sc_event_callback, &evname) < 0) { + LM_ERR("error running event route kemi callback\n"); + set_route_type(rtb); + return -1; + } + } + set_route_type(rtb); /* hep_hdr */ heph = (struct hep_hdr *)msg->buf; @@ -2925,7 +2965,6 @@ static int nosip_hep_msg(sr_event_param_t *evp) msg->buf = buf; msg->len = len; } else { - LOG(L_ERR, "ERROR: sipcapture:hep_msg_received: not supported version " "or bad length: v:[%d] l:[%d]\n", heph->hp_v, heph->hp_l);

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017