sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:master:a9ef7fe0: ndb_redis: exported redis_cmd() and redis_free() to kemi framework
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: a9ef7fe010492710e0a81a4505337accb5e1fea6 URL: https://github.com/kamailio/kamailio/commit/a9ef7fe010492710e0a81a4505337ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T18:55:07+01:00 ndb_redis: exported redis_cmd() and redis_free() to kemi framework --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9ef7fe010492710e0a81a4505337ac… Patch: https://github.com/kamailio/kamailio/commit/a9ef7fe010492710e0a81a4505337ac… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index d5462bb1c8..64f2b46897 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -35,6 +35,7 @@ #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/trim.h" +#include "../../core/kemi.h" #include "redis_client.h" #include "api.h" @@ -922,3 +923,88 @@ int bind_ndb_redis(ndb_redis_api_t *api) return 0; } +/** + * + */ +static int ki_redis_cmd(sip_msg_t *msg, str *srv, str *rcmd, str *sres) +{ + return redisc_exec(srv, sres, rcmd); +} + +/** + * + */ +static int ki_redis_cmd_p1(sip_msg_t *msg, str *srv, str *rcmd, str *p1, + str *sres) +{ + return redisc_exec(srv, sres, rcmd, p1->s); +} + +/** + * + */ +static int ki_redis_cmd_p2(sip_msg_t *msg, str *srv, str *rcmd, str *p1, + str *p2, str *sres) +{ + return redisc_exec(srv, sres, rcmd, p1->s, p2->s); +} + +/** + * + */ +static int ki_redis_cmd_p3(sip_msg_t *msg, str *srv, str *rcmd, str *p1, + str *p2, str *p3, str *sres) +{ + return redisc_exec(srv, sres, rcmd, p1->s, p2->s, p3->s); +} + +/** + * + */ +static int ki_redis_free_reply(sip_msg_t *msg, str *name) +{ + if(redisc_free_reply(name)<0) + return -1; + + return 1; +} +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_ndb_redis_exports[] = { + { str_init("ndb_redis"), str_init("redis_cmd"), + SR_KEMIP_INT, ki_redis_cmd, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ndb_redis"), str_init("redis_cmd_p1"), + SR_KEMIP_INT, ki_redis_cmd_p1, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ndb_redis"), str_init("redis_cmd_p2"), + SR_KEMIP_INT, ki_redis_cmd_p2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_redis"), str_init("redis_cmd_p3"), + SR_KEMIP_INT, ki_redis_cmd_p3, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR } + }, + { str_init("ndb_redis"), str_init("redis_free"), + SR_KEMIP_INT, ki_redis_free_reply, + { SR_KEMIP_STR, 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 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_ndb_redis_exports); + return 0; +} \ No newline at end of file

1 0

git:master:ccbd1176: http_client: print url in log messages if query return code is not ok
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: ccbd1176242632fae2af39a168e4692dcf7ebcf9 URL: https://github.com/kamailio/kamailio/commit/ccbd1176242632fae2af39a168e4692… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T15:58:03+01:00 http_client: print url in log messages if query return code is not ok - safety check for search of end-of-line in a one line result type --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/ccbd1176242632fae2af39a168e4692… Patch: https://github.com/kamailio/kamailio/commit/ccbd1176242632fae2af39a168e4692… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index ca26998606..d19910f90f 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -276,37 +276,39 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, if (res != CURLE_OK) { /* http://curl.haxx.se/libcurl/c/libcurl-errors.html */ if (res == CURLE_COULDNT_CONNECT) { - LM_WARN("failed to connect() to host\n"); + LM_WARN("failed to connect() to host (url: %s)\n", _url); } else if ( res == CURLE_COULDNT_RESOLVE_HOST ) { - LM_WARN("Couldn't resolve host\n"); + LM_WARN("Couldn't resolve host (url: %s)\n", _url); } else if ( res == CURLE_COULDNT_RESOLVE_PROXY ) { - LM_WARN("Couldn't resolve http_proxy host\n"); + LM_WARN("Couldn't resolve http proxy host (url: %s - proxy: %s)\n", + _url, (params && params->http_proxy)?params->http_proxy:""); } else if ( res == CURLE_UNSUPPORTED_PROTOCOL ) { - LM_WARN("URL Schema not supported by curl\n"); + LM_WARN("URL Schema not supported by curl (url: %s)\n", _url); } else if ( res == CURLE_URL_MALFORMAT ) { - LM_WARN("Malformed URL used in http_client\n"); + LM_WARN("Malformed URL used in http client (url: %s)\n", _url); } else if ( res == CURLE_OUT_OF_MEMORY ) { - LM_WARN("Curl library out of memory\n"); + LM_WARN("Curl library out of memory (url: %s)\n", _url); } else if ( res == CURLE_OPERATION_TIMEDOUT ) { - LM_WARN("Curl library timed out on request\n"); + LM_WARN("Curl library timed out on request (url: %s)\n", _url); } else if ( res == CURLE_SSL_CONNECT_ERROR ) { - LM_WARN("TLS error in curl connection\n"); + LM_WARN("TLS error in curl connection (url: %s)\n", _url); } else if ( res == CURLE_SSL_CERTPROBLEM ) { - LM_WARN("TLS local certificate error\n"); + LM_WARN("TLS local certificate error (url: %s)\n", _url); } else if ( res == CURLE_SSL_CIPHER ) { - LM_WARN("TLS cipher error\n"); + LM_WARN("TLS cipher error (url: %s)\n", _url); } else if ( res == CURLE_SSL_CACERT ) { - LM_WARN("TLS server certificate validation error (No valid CA cert)\n"); + LM_WARN("TLS server certificate validation error" + " (No valid CA cert) (url: %s)\n", _url); } else if ( res == CURLE_SSL_CACERT_BADFILE ) { - LM_WARN("TLS CA certificate read error \n"); + LM_WARN("TLS CA certificate read error (url: %s)\n", _url); } else if ( res == CURLE_SSL_ISSUER_ERROR ) { - LM_WARN("TLS issuer certificate check error \n"); + LM_WARN("TLS issuer certificate check error (url: %s)\n", _url); } else if ( res == CURLE_PEER_FAILED_VERIFICATION ) { - LM_WARN("TLS verification error\n"); + LM_WARN("TLS verification error (url: %s)\n", _url); } else if ( res == CURLE_TOO_MANY_REDIRECTS ) { - LM_WARN("Too many redirects\n"); + LM_WARN("Too many redirects (url: %s)\n", _url); } else { - LM_ERR("failed to perform curl (%d)\n", res); + LM_ERR("failed to perform curl (%d) (url: %s)\n", res, _url); } if (params->pconn) { @@ -371,9 +373,13 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, if (params->oneline) { /* search for line feed */ at = memchr(stream.buf, (char)10, download_size); - datasize = (double) (at - stream.buf); - LM_DBG(" -- curl download size cut to first line: %d \n", - (int) datasize); + if(at!=NULL) { + datasize = (double) (at - stream.buf); + LM_DBG(" -- curl download size cut to first line: %d\n", + (int) datasize); + } else { + LM_DBG("no end of line found for one line result type\n"); + } } if (at == NULL) { if (params->maxdatasize

1 0

[kamailio/kamailio] rtpengine: fixed segfault when using read_sdp_pv (#1329)
by Phil Lavin 23 Nov '17

23 Nov '17

Backport of #1326 to 4.4 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1329 -- Commit Summary -- * rtpengine: fixed segfault when using read_sdp_pv -- File Changes -- M modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1329.patch https://github.com/kamailio/kamailio/pull/1329.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/1329

2 1

git:4.4:3037665c: rtpengine: fixed segfault when using read_sdp_pv
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: 4.4 Commit: 3037665c0794c5e00f074a7e389793a29ba9b960 URL: https://github.com/kamailio/kamailio/commit/3037665c0794c5e00f074a7e389793a… Author: Phil Lavin <phil.lavin(a)cloudcall.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T14:23:15+01:00 rtpengine: fixed segfault when using read_sdp_pv - Obtain body pointer fresh from the SIP message as when using read_sdp_pv the body pointer is overwritten --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3037665c0794c5e00f074a7e389793a… Patch: https://github.com/kamailio/kamailio/commit/3037665c0794c5e00f074a7e389793a… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 01f1606bf2..b63fb33497 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -3185,6 +3185,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -3214,7 +3215,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

git:5.0:bae64449: rtpengine: fixed segfault when using read_sdp_pv
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: 5.0 Commit: bae644494e3ad1a1384def016a9343c073cfe1a6 URL: https://github.com/kamailio/kamailio/commit/bae644494e3ad1a1384def016a9343c… Author: Phil Lavin <phil.lavin(a)cloudcall.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T12:55:00+01:00 rtpengine: fixed segfault when using read_sdp_pv - Obtain body pointer fresh from the SIP message as when using read_sdp_pv the body pointer is overwritten --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/bae644494e3ad1a1384def016a9343c… Patch: https://github.com/kamailio/kamailio/commit/bae644494e3ad1a1384def016a9343c… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 82717f8e59..ee3b5f1671 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2853,6 +2853,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -2882,7 +2883,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

[kamailio/kamailio] rtpengine: fixed segfault when using read_sdp_pv (#1327)
by Phil Lavin 23 Nov '17

23 Nov '17

Backport of #1326 to 5.0 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1327 -- Commit Summary -- * rtpengine: fixed segfault when using read_sdp_pv -- File Changes -- M src/modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1327.patch https://github.com/kamailio/kamailio/pull/1327.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/1327

2 1

[kamailio/kamailio] rtpengine: fixed segfault when using read_sdp_pv (#1328)
by Phil Lavin 23 Nov '17

23 Nov '17

Backport of #1326 to 5.1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1328 -- Commit Summary -- * rtpengine: fixed segfault when using read_sdp_pv -- File Changes -- M src/modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1328.patch https://github.com/kamailio/kamailio/pull/1328.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/1328

2 1

git:5.1:096de8d0: rtpengine: fixed segfault when using read_sdp_pv
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: 5.1 Commit: 096de8d0979a71005e3f52146252365b53ab6197 URL: https://github.com/kamailio/kamailio/commit/096de8d0979a71005e3f52146252365… Author: Phil Lavin <phil.lavin(a)cloudcall.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T12:54:42+01:00 rtpengine: fixed segfault when using read_sdp_pv - Obtain body pointer fresh from the SIP message as when using read_sdp_pv the body pointer is overwritten --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/096de8d0979a71005e3f52146252365… Patch: https://github.com/kamailio/kamailio/commit/096de8d0979a71005e3f52146252365… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index e3468d04a8..9704693eee 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3328,6 +3328,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -3357,7 +3358,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

git:master:873ffcad: modules: readme files regenerated - app_python ... [skip ci]
by Kamailio Dev 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 873ffcad3a609d1372eed8e8b4e6a3ff033bc524 URL: https://github.com/kamailio/kamailio/commit/873ffcad3a609d1372eed8e8b4e6a3f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-23T12:46:55+01:00 modules: readme files regenerated - app_python ... [skip ci] --- Modified: src/modules/app_python/README --- Diff: https://github.com/kamailio/kamailio/commit/873ffcad3a609d1372eed8e8b4e6a3f… Patch: https://github.com/kamailio/kamailio/commit/873ffcad3a609d1372eed8e8b4e6a3f… --- diff --git a/src/modules/app_python/README b/src/modules/app_python/README index 2f05fc1d91..8fcad886e9 100644 --- a/src/modules/app_python/README +++ b/src/modules/app_python/README @@ -30,6 +30,11 @@ Maxim Sobolev 4.1. python_exec(method [, args]) + 5. RPC Commands + + 5.1. app_python.reload + 5.2. app_python.api_list + List of Examples 1.1. Set load parameter @@ -58,6 +63,11 @@ Chapter 1. Admin Guide 4.1. python_exec(method [, args]) + 5. RPC Commands + + 5.1. app_python.reload + 5.2. app_python.api_list + 1. Overview This module allows executing Python scripts from config file, exporting @@ -149,3 +159,37 @@ python_exec("my_python_function"); python_exec("my_python_function", "my_params"); python_exec("my_python_function", "$rU"); ... + +5. RPC Commands + + 5.1. app_python.reload + 5.2. app_python.api_list + +5.1. app_python.reload + + IMPORTANT: not implemented yet. + + Marks the need to reload the js script. The actual reload is done by + every working process when the next call to KEMI config is executed. + + Name: app_python.reload + + Parameters: none + + Example: +... +kamcmd app_python.reload +... + +5.2. app_python.api_list + + List the functions available via Kemi framework. + + Name: app_python.api_list + + Parameters: none + + Example: +... +kamcmd app_python.api_list +...

1 0

git:master:cbaceaf8: app_python: documented rpc commands
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: cbaceaf891e16e9b0a1ef4883b8fec5e33698a86 URL: https://github.com/kamailio/kamailio/commit/cbaceaf891e16e9b0a1ef4883b8fec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T12:45:25+01:00 app_python: documented rpc commands --- Modified: src/modules/app_python/doc/app_python_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cbaceaf891e16e9b0a1ef4883b8fec5… Patch: https://github.com/kamailio/kamailio/commit/cbaceaf891e16e9b0a1ef4883b8fec5… --- diff --git a/src/modules/app_python/doc/app_python_admin.xml b/src/modules/app_python/doc/app_python_admin.xml index 8a2fba4fb3..9afeffb03f 100644 --- a/src/modules/app_python/doc/app_python_admin.xml +++ b/src/modules/app_python/doc/app_python_admin.xml @@ -158,6 +158,54 @@ python_exec("my_python_function", "$rU"); </section> </section> + <section> + <title>RPC Commands</title> + <section id="app_python.r.reload"> + <title> + <function moreinfo="none">app_python.reload</function> + </title> + <para> + IMPORTANT: not implemented yet. + </para> + <para> + Marks the need to reload the js script. + The actual reload is done by every working process when the next + call to KEMI config is executed. + </para> + <para> + Name: <emphasis>app_python.reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> +... +&kamcmd; app_python.reload +... + </programlisting> + </section> + <section id="app_python.r.api_list"> + <title> + <function moreinfo="none">app_python.api_list</function> + </title> + <para> + List the functions available via Kemi framework. + </para> + <para> + Name: <emphasis>app_python.api_list</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> +... +&kamcmd; app_python.api_list +... + </programlisting> + </section> + </section> </chapter>

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
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