sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:891202ec: app_ruby: print type of result in case of execution failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 891202ec3cb477a802309eee9f18563ff8bf91d4 URL: https://github.com/kamailio/kamailio/commit/891202ec3cb477a802309eee9f18563… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T11:14:27+02:00 app_ruby: print type of result in case of execution failure --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/891202ec3cb477a802309eee9f18563… Patch: https://github.com/kamailio/kamailio/commit/891202ec3cb477a802309eee9f18563… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 06d8cf2ce7..88fbee00f3 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -164,12 +164,12 @@ int app_ruby_kemi_reload_script(void) } /** - * + * */ int ruby_sr_init_child(void) { int state = 0; - VALUE result; + VALUE rbres; /* construct the VM */ ruby_init(); @@ -177,12 +177,12 @@ int ruby_sr_init_child(void) ruby_script(_sr_ruby_load_file.s); /* Ruby goes here */ - result = rb_eval_string_protect("puts 'Hello " NAME "!'", &state); + rbres = rb_eval_string_protect("puts 'Hello " NAME "!'", &state); if (state) { /* handle exception */ app_ruby_print_last_exception(); - LM_ERR("test execution with error\n"); + LM_ERR("test execution with error (res type: %d)\n", TYPE(rbres)); return -1; } else { LM_DBG("test execution without error\n"); @@ -1032,7 +1032,7 @@ VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, } /** - * + * */ int app_ruby_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, char *p3, int emode) @@ -1075,7 +1075,8 @@ int app_ruby_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, if (rberr) { app_ruby_print_last_exception(); - LM_ERR("ruby exception (%d) on callback for: %s\n", rberr, func); + LM_ERR("ruby exception (%d) on callback for: %s (res type: %d)\n", + rberr, func, TYPE(rbres)); return -1; } @@ -1083,7 +1084,7 @@ int app_ruby_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, } /** - * + * */ int app_ruby_run(sip_msg_t *msg, char *func, char *p1, char *p2, char *p3)

5 years, 9 months

git:master:3311bc10: Makefile.defs: version set to 5.2.0-dev7

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3311bc10c69cbb8f1a8ea6834bec4cbfd76da7cd URL: https://github.com/kamailio/kamailio/commit/3311bc10c69cbb8f1a8ea6834bec4cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-17T10:37:53+02:00 Makefile.defs: version set to 5.2.0-dev7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/3311bc10c69cbb8f1a8ea6834bec4cb… Patch: https://github.com/kamailio/kamailio/commit/3311bc10c69cbb8f1a8ea6834bec4cb… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a114c8ae0f..c29ae8bf9d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -dev7 # memory manager switcher # 0 - f_malloc (fast malloc)

5 years, 9 months

[kamailio/kamailio] Feature request: http_async_query response route to resume execution from memory (#1642)

by alexsosic

>From the official kamailio documentation of the function `http_async_query(url, route_name)` ``` Sends HTTP(S) request asynchronously to the URL given in “url” parameter, which is a string that may contain pseudo variables. Parameter “route_name” defines the route to be executed upon reception of HTTP reply, on error or on timeout. If a transaction exists before calling http_async_query(), it will be paused and resumed in this route, while the routing script execution will be stopped. If executed in a transactionless context, or if $http_req(suspend) is used not to suspend the transaction, the routing script execution will continue and the query result will be available in “route_name”. ``` Because the routing script execution `will be stopped` it's quite difficult for some advanced usages to restore the previous variables and logic and to continue with the execution. The problem of resuming the work is delegated to the user and not Kamailio itself. I think Kamailio should freeze the execution and store all needed data in memory to resume execution after the http response like for a normal http sync query. So the `stopping` will become `pausing/resuming`. -- 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/1642

5 years, 9 months

[kamailio/kamailio] Restrict app_python to Python2 enabling builds on systems where Python3 is the default (#1645)

by Anthony Messina

The following change enables app_python (which only works with Python2 anyway) to build on systems where Python3 is the default (Fedora 29). ``` diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index d1854c12e..c9ad254c3 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,7 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python +PYTHON?=python2 PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"} ``` -- 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/1645

5 years, 9 months

git:5.0:4a88ee66: app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 4a88ee66cc4735b655ac4a2b710217a5b6f1ecd8 URL: https://github.com/kamailio/kamailio/commit/4a88ee66cc4735b655ac4a2b710217a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T15:00:14+02:00 app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available (cherry picked from commit a52e7cb1eec84a20432cb959a29a24ee1a8993dd) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4a88ee66cc4735b655ac4a2b710217a… Patch: https://github.com/kamailio/kamailio/commit/4a88ee66cc4735b655ac4a2b710217a… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index c9ad254c3b..9898ebc3f5 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,12 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python2 +PYTHON=$(shell which python2) + +# workaround for some OS (like MacOS) that don't have a python2 link +ifeq ($(PYTHON),) +PYTHON=python +endif PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

5 years, 9 months

git:5.1:b6e849c9: app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: b6e849c9f4463657534d823f5c8cfb1d85f6bdaa URL: https://github.com/kamailio/kamailio/commit/b6e849c9f4463657534d823f5c8cfb1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T15:00:20+02:00 app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available (cherry picked from commit a52e7cb1eec84a20432cb959a29a24ee1a8993dd) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b6e849c9f4463657534d823f5c8cfb1… Patch: https://github.com/kamailio/kamailio/commit/b6e849c9f4463657534d823f5c8cfb1… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index c9ad254c3b..9898ebc3f5 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,12 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python2 +PYTHON=$(shell which python2) + +# workaround for some OS (like MacOS) that don't have a python2 link +ifeq ($(PYTHON),) +PYTHON=python +endif PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

5 years, 9 months

git:master:1e04e9c6: htable: exported KSR.htable.sht_setxs(htname, itname, sval, exval)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e04e9c65906e51d2747a3c9e9ca44d911a3365f URL: https://github.com/kamailio/kamailio/commit/1e04e9c65906e51d2747a3c9e9ca44d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-16T11:36:07+02:00 htable: exported KSR.htable.sht_setxs(htname, itname, sval, exval) - renamed KSR.htable.sht_setiex() to KSR.htable.sht_setxi() --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/1e04e9c65906e51d2747a3c9e9ca44d… Patch: https://github.com/kamailio/kamailio/commit/1e04e9c65906e51d2747a3c9e9ca44d… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 270db053d8..8305947641 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -935,7 +935,7 @@ static int ki_ht_sets(sip_msg_t *msg, str *htname, str *itname, str *itval) } if(ht_set_cell(ht, itname, AVP_VAL_STR, &isvalue, 1)!=0) { - LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + LM_ERR("cannot set sht: %.*s key: %.*s\n", htname->len, htname->s, itname->len, itname->s); return -1; } @@ -968,8 +968,6 @@ static int ki_ht_seti(sip_msg_t *msg, str *htname, str *itname, int itval) if(ht_set_cell(ht, itname, 0, &isvalue, 1)!=0) { LM_ERR("cannot set sht: %.*s key: %.*s\n", htname->len, htname->s, itname->len, itname->s); - LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, - itname->len, itname->s); return -1; } @@ -1006,13 +1004,56 @@ static int ki_ht_setex(sip_msg_t *msg, str *htname, str *itname, int itval) return -1; } - return 0; + return 1; } /** * */ -static int ki_ht_setiex(sip_msg_t *msg, str *htname, str *itname, int itval, +static int ki_ht_setxs(sip_msg_t *msg, str *htname, str *itname, str *itval, + int exval) +{ + int_str isval; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + LM_DBG("set value and expire for sht: %.*s key: %.*s val: %.*s exp: %d\n", + htname->len, htname->s, itname->len, itname->s, + (itval->len>100)?100:itval->len, itval->s, exval); + + if (ht->dmqreplicate>0) { + isval.s = *itval; + if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, AVP_VAL_STR, &isval, 1)!=0) { + LM_ERR("dmq set value replication failed\n"); + } else { + isval.n = exval; + if(ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, + itname, 0, &isval, 0)!=0) { + LM_ERR("dmq set expire relication failed\n"); + } + } + } + isval.s = *itval; + if(ht_set_cell(ht, itname, AVP_VAL_STR, &isval, 1)!=0) { + LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + return -1; + } + + return 1; +} + +/** + * + */ +static int ki_ht_setxi(sip_msg_t *msg, str *htname, str *itname, int itval, int exval) { int_str isval; @@ -1037,7 +1078,7 @@ static int ki_ht_setiex(sip_msg_t *msg, str *htname, str *itname, int itval, isval.n = exval; if(ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, itname, 0, &isval, 0)!=0) { - LM_ERR("dmq set expire relication failed\n"); + LM_ERR("dmq set expire replication failed\n"); } } } @@ -1639,8 +1680,13 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("htable"), str_init("sht_setiex"), - SR_KEMIP_INT, ki_ht_setiex, + { str_init("htable"), str_init("sht_setxi"), + SR_KEMIP_INT, ki_ht_setxi, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_setxs"), + SR_KEMIP_INT, ki_ht_setxs, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } },

5 years, 9 months

git:master:9d3a126c: htable: exported KSR.htable.sht_setiex(htname, itname, ival, exval)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9d3a126cecbb051393dd79f7ae4d6c7ac6b9880b URL: https://github.com/kamailio/kamailio/commit/9d3a126cecbb051393dd79f7ae4d6c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-16T11:36:07+02:00 htable: exported KSR.htable.sht_setiex(htname, itname, ival, exval) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9d3a126cecbb051393dd79f7ae4d6c7… Patch: https://github.com/kamailio/kamailio/commit/9d3a126cecbb051393dd79f7ae4d6c7… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 64a8bb6511..270db053d8 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -991,11 +991,10 @@ static int ki_ht_setex(sip_msg_t *msg, str *htname, str *itname, int itval) return -1; } - isval.n = itval; - - LM_DBG("set expire value for sht: %.*s key: %.*s exp: %d\n", htname->len, + LM_DBG("set expire value for sht: %.*s key: %.*s exp: %d\n", htname->len, htname->s, itname->len, itname->s, itval); + isval.n = itval; if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, itname, 0, &isval, 0)!=0) { @@ -1010,6 +1009,49 @@ static int ki_ht_setex(sip_msg_t *msg, str *htname, str *itname, int itval) return 0; } +/** + * + */ +static int ki_ht_setiex(sip_msg_t *msg, str *htname, str *itname, int itval, + int exval) +{ + int_str isval; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + LM_DBG("set value and expire for sht: %.*s key: %.*s val: %d exp: %d\n", + htname->len, htname->s, itname->len, itname->s, itval, exval); + + if (ht->dmqreplicate>0) { + isval.n = itval; + if(ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, 0, &isval, 1)!=0) { + LM_ERR("dmq set value relication failed\n"); + } else { + isval.n = exval; + if(ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, + itname, 0, &isval, 0)!=0) { + LM_ERR("dmq set expire relication failed\n"); + } + } + } + isval.n = itval; + + if(ht_set_cell_ex(ht, itname, 0, &isval, 1, exval)!=0) { + LM_ERR("cannot set value and expire for sht: %.*s key: %.*s\n", + htname->len, htname->s, itname->len, itname->s); + return -1; + } + + return 0; +} + #define RPC_DATE_BUF_LEN 21 static const char* htable_dump_doc[2] = { @@ -1597,6 +1639,11 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_setiex"), + SR_KEMIP_INT, ki_ht_setiex, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

5 years, 9 months

git:master:a52e7cb1: app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available

by Henning Westerholt

Module: kamailio Branch: master Commit: a52e7cb1eec84a20432cb959a29a24ee1a8993dd URL: https://github.com/kamailio/kamailio/commit/a52e7cb1eec84a20432cb959a29a24e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T11:09:12+02:00 app_python: workaround in Makefile for MacOS, fall-back to python if python2 not available --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a52e7cb1eec84a20432cb959a29a24e… Patch: https://github.com/kamailio/kamailio/commit/a52e7cb1eec84a20432cb959a29a24e… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index c9ad254c3b..9898ebc3f5 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,12 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python2 +PYTHON=$(shell which python2) + +# workaround for some OS (like MacOS) that don't have a python2 link +ifeq ($(PYTHON),) +PYTHON=python +endif PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

5 years, 9 months

git:5.1:efb843e1: app_python: fix python call in Makefile (python -> python2), reported by GH #1645

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: efb843e1de19b01b36363d4f0a5b345520cf166c URL: https://github.com/kamailio/kamailio/commit/efb843e1de19b01b36363d4f0a5b345… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-16T10:33:32+02:00 app_python: fix python call in Makefile (python -> python2), reported by GH #1645 (cherry picked from commit 31498ca574c931f1a7e12619e725c8b151a3e7bd) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/efb843e1de19b01b36363d4f0a5b345… Patch: https://github.com/kamailio/kamailio/commit/efb843e1de19b01b36363d4f0a5b345… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index d1854c12e4..c9ad254c3b 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -9,7 +9,7 @@ NAME=app_python.so # the following to point to the correct instance. Module has been tested # to work with 2.6 and 2.5. Python 2.4 has been only confirmed to compile, # but no testing has been done with that. -PYTHON?=python +PYTHON?=python2 PYTHON_VERSION=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('VERSION')"} PYTHON_LIBDIR=${shell ${PYTHON} -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR')"}

5 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018