sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:master:19dda2ca: http_async_client: null terminated CURLOPT_

by Giacomo Vacca

Module: kamailio Branch: master Commit: 19dda2ca945b88295f1b608034950cf59621185e URL: https://github.com/kamailio/kamailio/commit/19dda2ca945b88295f1b608034950cf… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2017-11-05T10:55:50+01:00 http_async_client: null terminated CURLOPT_ (cherry picked from commit 574a11d8c0c20d3d0c058726609df8ed4e5b68dc) --- Modified: src/modules/http_async_client/async_http.c Modified: src/modules/http_async_client/async_http.h Modified: src/modules/http_async_client/hm_hash.h Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/19dda2ca945b88295f1b608034950cf… Patch: https://github.com/kamailio/kamailio/commit/19dda2ca945b88295f1b608034950cf…

7 years

git:master:a69aab1c: modules: readme files regenerated - msrp ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a69aab1c652b6645edf0349ecf7134f8dcd6b35e URL: https://github.com/kamailio/kamailio/commit/a69aab1c652b6645edf0349ecf7134f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-05T10:46:32+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/a69aab1c652b6645edf0349ecf7134f… Patch: https://github.com/kamailio/kamailio/commit/a69aab1c652b6645edf0349ecf7134f…

7 years

git:master:97589070: core: tcp - more debug messages when reading hep3 packets

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 97589070ec1568d4554b02c3de33b9d2ec519371 URL: https://github.com/kamailio/kamailio/commit/97589070ec1568d4554b02c3de33b9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T10:33:09+01:00 core: tcp - more debug messages when reading hep3 packets --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/97589070ec1568d4554b02c3de33b9d… Patch: https://github.com/kamailio/kamailio/commit/97589070ec1568d4554b02c3de33b9d… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index e001fcf98b..18868f1d7a 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1245,15 +1245,20 @@ static int tcp_read_hep3(struct tcp_connection *c, int* read_flags) r=&c->req; #ifdef USE_TLS - if (unlikely(c->type == PROTO_TLS)) + if (unlikely(c->type == PROTO_TLS)) { bytes = tls_read(c, read_flags); - else + } else { #endif bytes = tcp_read(c, read_flags); +#ifdef USE_TLS + } +#endif if (bytes <= 0) { - if (likely(r->parsed >= r->pos)) + if (likely(r->parsed >= r->pos)) { + LM_DBG("no new bytes to read, but still unparsed content\n"); return 0; + } } size = r->pos - r->parsed; @@ -1261,13 +1266,17 @@ static int tcp_read_hep3(struct tcp_connection *c, int* read_flags) p = r->parsed; /* Process first six bytes (HEP3 + 2 bytes the size)*/ - if (size < 6) + if (size < 6) { + LM_DBG("not enough bytes to parse (%u)\n", size); goto skip; + } if(p[0]!='H' || p[1]!='E' || p[2]!='P' || p[3]=='3') { /* not hep3 */ + LM_DBG("not HEP3 packet header\n"); goto skip; } + r->flags |= F_TCP_REQ_HEP3; len = ((uint32_t)(p[4] & 0xff) << 8) + (p[5] & 0xff); @@ -1278,12 +1287,14 @@ static int tcp_read_hep3(struct tcp_connection *c, int* read_flags) goto skip; } /* check the whole message has been received */ - if (size < len) + if (size < len) { + LM_DBG("incomplete HEP3 packet (%u / %u)\n", len, size); goto skip; + } r->flags |= F_TCP_REQ_COMPLETE; - r->flags |= F_TCP_REQ_HEP3; r->parsed = &p[len]; + LM_DBG("reading of HEP3 packet is complete (%u / %u)\n", len, size); skip: return bytes;

7 years

git:master:8400eb35: sipcapture: documentation for event routes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8400eb35826e1beadb9022ae8d7c153c78c2beda URL: https://github.com/kamailio/kamailio/commit/8400eb35826e1beadb9022ae8d7c153… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T10:23:23+01:00 sipcapture: documentation for event routes --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8400eb35826e1beadb9022ae8d7c153… Patch: https://github.com/kamailio/kamailio/commit/8400eb35826e1beadb9022ae8d7c153… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 55ba34b4ec..ef89683153 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -621,6 +621,46 @@ $var(res) = float2int("10.5", "1"); </section> <section> + <title>Event Routes</title> + <section id="sipcapture.ev.request"> + <title>event_route[sipcapture:request]</title> + <para> + Event route block to be executed when HEP packet is received. It + requires module parameter 'nonsip_hook' to be set to 1. + </para> + <example> + <title>event_route[sipcapture:request] usage</title> + <programlisting format="linespecific"> +... +# new event sipcapture socket +modparam("sipcapture", "nonsip_hook", 1) +... + +event_route[sipcapture:request] { + + xlog("HEP Request!\n"); + xlog("received sipcapture request from $si:$sp\n"); + xlog("HEP VERSION $hep(version) request from $si:$sp\n"); + xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\n"); + + # is it SIP ? + if($hep(0x00b) == 1) { + + # do parsing internal + return 1; + } else { + # if report lets proceed here with payload + xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\n"); + return 0; + } +} +... +</programlisting> + </example> + </section> + </section> + + <section> <title>RPC Commands</title> <section id="sipcapture.r.sipcapture.status"> <title>

7 years

git:master:765a4d90: msrp: documentation for event_callback parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 765a4d9016d6b545c5d6dbb49a298acfb93e8041 URL: https://github.com/kamailio/kamailio/commit/765a4d9016d6b545c5d6dbb49a298ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T10:10:44+01:00 msrp: documentation for event_callback parameter --- Modified: src/modules/msrp/doc/msrp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/765a4d9016d6b545c5d6dbb49a298ac… Patch: https://github.com/kamailio/kamailio/commit/765a4d9016d6b545c5d6dbb49a298ac… --- diff --git a/src/modules/msrp/doc/msrp_admin.xml b/src/modules/msrp/doc/msrp_admin.xml index 9bab02d6f0..ca1720d893 100644 --- a/src/modules/msrp/doc/msrp_admin.xml +++ b/src/modules/msrp/doc/msrp_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section id="msrp.overview"> <title>Overview</title> <para> @@ -37,8 +37,8 @@ </para> <para> One of the main benefits of this module is the ability to reuse - all the other extensions that exist in the SIP server, including - accounting, authentication, authorization to database connectors, + all the other extensions that exist in the SIP server, including + accounting, authentication, authorization to database connectors, security and DoS attack protections. </para> <para> @@ -213,6 +213,37 @@ modparam("msrp", "use_path_addr", "msrp.kamailio.org:5061") </programlisting> </example> </section> + <section id="msrp.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: 'msrp:frame-in'. + </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("htable", "event_callback", "ksr_msrp_event") +... +-- event callback function implemented in Lua +function ksr_msrp_event(evname) + KSR.info("===== msrp module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section> <section> @@ -222,7 +253,7 @@ modparam("msrp", "use_path_addr", "msrp.kamailio.org:5061") <function moreinfo="none">msrp_relay()</function> </title> <para> - Relay MSRP frame according to the To-Path. This function has to be + Relay MSRP frame according to the To-Path. This function has to be executed for each MSRP request or reply that has to be forwarded. Note that due to nature of the MSRP transport layer, which is reliable (TCP/TLS), there is no retransmission of MSRP frames.

7 years

git:master:f13d709e: msrp: execute event callback via kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f13d709e044148d7b5ac53df9bbce22c9c71b9fd URL: https://github.com/kamailio/kamailio/commit/f13d709e044148d7b5ac53df9bbce22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T10:04:15+01:00 msrp: execute event callback via kemi framework - parameter event_callback has to be set to the name of kemi function --- Modified: src/modules/msrp/msrp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f13d709e044148d7b5ac53df9bbce22… Patch: https://github.com/kamailio/kamailio/commit/f13d709e044148d7b5ac53df9bbce22… --- diff --git a/src/modules/msrp/msrp_mod.c b/src/modules/msrp/msrp_mod.c index 21a2beabf5..286ebd6f09 100644 --- a/src/modules/msrp/msrp_mod.c +++ b/src/modules/msrp/msrp_mod.c @@ -69,6 +69,7 @@ int msrp_auth_max_expires = 3600; int msrp_timer_interval = 60; str msrp_use_path_addr = { 0 }; int msrp_tls_module_loaded = 0; +str msrp_event_callback = STR_NULL; static int msrp_frame_received(sr_event_param_t *evp); sip_msg_t *msrp_fake_sipmsg(msrp_frame_t *mf); @@ -118,6 +119,7 @@ static param_export_t params[]={ {"auth_max_expires", PARAM_INT, &msrp_auth_max_expires}, {"timer_interval", PARAM_INT, &msrp_timer_interval}, {"use_path_addr", PARAM_STR, &msrp_use_path_addr}, + {"event_callback", PARAM_STR, &msrp_event_callback}, {0, 0, 0} }; @@ -504,6 +506,8 @@ static int msrp_frame_received(sr_event_param_t *evp) sip_msg_t *fmsg; struct run_act_ctx ctx; int rtb, rt; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("msrp:frame-in"); tev = (tcp_event_info_t*)evp->data; @@ -524,24 +528,40 @@ static int msrp_frame_received(sr_event_param_t *evp) } msrp_reset_env(); msrp_set_current_frame(&mf); - rt = route_get(&event_rt, "msrp:frame-in"); - if(rt>=0 && event_rt.rlist[rt]!=NULL) { + fmsg = msrp_fake_sipmsg(&mf); + if(fmsg != NULL) + fmsg->rcv = *tev->rcv; + rtb = get_route_type(); + set_route_type(EVENT_ROUTE); + if(msrp_event_callback.s == NULL || msrp_event_callback.len <= 0) { + /* native cfg script execution */ + rt = route_get(&event_rt, evname.s); LM_DBG("executing event_route[msrp:frame-in] (%d)\n", rt); - fmsg = msrp_fake_sipmsg(&mf); - if(fmsg!=NULL) - fmsg->rcv = *tev->rcv; - rtb = get_route_type(); - set_route_type(REQUEST_ROUTE); - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, &ctx); - if(ctx.run_flags&DROP_R_F) - { - LM_DBG("exit due to 'drop' in event route\n"); + if(rt >= 0 && event_rt.rlist[rt] != NULL) { + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, &ctx); + if(ctx.run_flags & DROP_R_F) { + LM_DBG("exit due to 'drop' in event route\n"); + } + } else { + LM_ERR("empty event route block for msrp handling\n"); + } + } else { + /* kemi script execution */ + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_ERR("event callback (%s) set, but no cfg engine\n", + msrp_event_callback.s); + } else { + if(keng->froute(fmsg, EVENT_ROUTE, + &msrp_event_callback, &evname)<0) { + LM_ERR("error running event route kemi callback\n"); + } } - set_route_type(rtb); - if(fmsg!=NULL) - free_sip_msg(fmsg); } + set_route_type(rtb); + if(fmsg != NULL) + free_sip_msg(fmsg); msrp_reset_env(); msrp_destroy_frame(&mf); return 0;

7 years

git:master:96bb1aeb: modules: readme files regenerated - db_mongodb ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 96bb1aeb8f4392f97fa0cfe229841c7d640e62e2 URL: https://github.com/kamailio/kamailio/commit/96bb1aeb8f4392f97fa0cfe229841c7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-05T09:16:22+01:00 modules: readme files regenerated - db_mongodb ... [skip ci] --- Modified: src/modules/db_mongodb/README Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/96bb1aeb8f4392f97fa0cfe229841c7… Patch: https://github.com/kamailio/kamailio/commit/96bb1aeb8f4392f97fa0cfe229841c7…

7 years

git:master:2fce31ce: sipcapture: fixed missing end of section tags for float2int() docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2fce31ce4ed59fc99f826ea1ecbc7b022321e6c1 URL: https://github.com/kamailio/kamailio/commit/2fce31ce4ed59fc99f826ea1ecbc7b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T09:02:17+01:00 sipcapture: fixed missing end of section tags for float2int() docs --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2fce31ce4ed59fc99f826ea1ecbc7b0… Patch: https://github.com/kamailio/kamailio/commit/2fce31ce4ed59fc99f826ea1ecbc7b0… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index deb88a59d6..55ba34b4ec 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -618,6 +618,7 @@ $var(res) = float2int("10.5", "1"); </programlisting> </example> </section> + </section> <section> <title>RPC Commands</title>

7 years

git:master:2d74f985: db_mongodb: added Remarks section to collect details about specific requirements

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d74f9854239442b7bf63b701f40bbc2013c2ba7 URL: https://github.com/kamailio/kamailio/commit/2d74f9854239442b7bf63b701f40bbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-05T09:00:08+01:00 db_mongodb: added Remarks section to collect details about specific requirements --- Modified: src/modules/db_mongodb/doc/db_mongodb_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2d74f9854239442b7bf63b701f40bbc… Patch: https://github.com/kamailio/kamailio/commit/2d74f9854239442b7bf63b701f40bbc… --- diff --git a/src/modules/db_mongodb/doc/db_mongodb_admin.xml b/src/modules/db_mongodb/doc/db_mongodb_admin.xml index 4aec4c3dda..dcb4f09cea 100644 --- a/src/modules/db_mongodb/doc/db_mongodb_admin.xml +++ b/src/modules/db_mongodb/doc/db_mongodb_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -30,7 +30,7 @@ </para> </section> - <section> + <section id="db_mongodb.s.limitations"> <title>Limitations</title> <para> This module has implemented the equivalent operations for INSERT, @@ -42,6 +42,17 @@ </para> </section> + <section id="db_mongodb.s.remarks"> + <title>Remarks</title> + <para> + Using this module as a database dirver may require additional settings + for various modules. For example, you have to set module parameter + 'db_insert_null' to 1 for 'usrloc' module. If the module you are using + with 'db_mongodb' fails, check its README for notes about using it + with no-SQL databases. + </para> + </section> + <section> <title>Dependencies</title> <section>

7 years

git:master:ef40fe7d: modules: readme files regenerated - sipcapture ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: ef40fe7d15161585ea552f75bbe588bd7bd66799 URL: https://github.com/kamailio/kamailio/commit/ef40fe7d15161585ea552f75bbe588b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-05T08:46:38+01:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/ef40fe7d15161585ea552f75bbe588b… Patch: https://github.com/kamailio/kamailio/commit/ef40fe7d15161585ea552f75bbe588b…

7 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017