sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

Errored: kamailio/kamailio#2256 (4.4 - c302b9e)
by Travis CI 19 Apr '16

19 Apr '16

Build Update for kamailio/kamailio ------------------------------------- Build: #2256 Status: Errored Duration: 12 minutes and 42 seconds Commit: c302b9e (4.4) Author: Olle E. Johansson Message: dialog Update README with explanation of in-dialog request behaviour (cherry picked from commit 19ef4f6ec8c22848eb4386f5f4996d5091c65688) View the changeset: https://github.com/kamailio/kamailio/compare/19d4d3f5a1a4...c302b9e92034 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/124282527 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Dialog - in dialog options replies
by Olle E. Johansson 19 Apr '16

19 Apr '16

Hi! If I understand the source code right the dialog module will hang up a call on 408 or 481 responses to an in-dialog request and just treat anything else as a success. If this is the case - that I understand this right - then I would like to update the README of dialog with this fact. If not - how does it really work? Cheers, /O

2 2

git:4.4:c302b9e9: dialog Update README with explanation of in-dialog request behaviour
by Olle E. Johansson 19 Apr '16

19 Apr '16

Module: kamailio Branch: 4.4 Commit: c302b9e920342869721342c42f9014bd079fb456 URL: https://github.com/kamailio/kamailio/commit/c302b9e920342869721342c42f9014b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-19T21:25:13+02:00 dialog Update README with explanation of in-dialog request behaviour (cherry picked from commit 19ef4f6ec8c22848eb4386f5f4996d5091c65688) --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c302b9e920342869721342c42f9014b… Patch: https://github.com/kamailio/kamailio/commit/c302b9e920342869721342c42f9014b… --- diff --git a/modules/dialog/README b/modules/dialog/README index 83206bc..97c2602 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -1147,6 +1147,11 @@ modparam("dialog", "ka_timer", 10) dialog setup or previous keep-alive. The value represents the number of seconds. + If the requests times out (generating a 408) or if the UA responds with + 481 the lifetime is set to 10 seconds. When lifetime expires the dialog + will be terminated. Any other response (including error responses) will + reset the timers. + Default value is "0" (no keep alive). The lowest settable interval is 30 seconds. diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index b02826a..3fff0fe 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -1248,6 +1248,13 @@ modparam("dialog", "ka_timer", 10) The value represents the number of seconds. </para> <para> + If the requests times out (generating a 408) or if the + UA responds with 481 the lifetime is set to 10 seconds. + When lifetime expires the dialog will be terminated. + Any other response (including error responses) will + reset the timers. + </para> + <para> <emphasis> Default value is <quote>0</quote> (no keep alive). The lowest settable interval is 30 seconds.

1 0

git:master:19ef4f6e: dialog Update README with explanation of in-dialog request behaviour
by Olle E. Johansson 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 19ef4f6ec8c22848eb4386f5f4996d5091c65688 URL: https://github.com/kamailio/kamailio/commit/19ef4f6ec8c22848eb4386f5f4996d5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-19T21:24:31+02:00 dialog Update README with explanation of in-dialog request behaviour --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/19ef4f6ec8c22848eb4386f5f4996d5… Patch: https://github.com/kamailio/kamailio/commit/19ef4f6ec8c22848eb4386f5f4996d5… --- diff --git a/modules/dialog/README b/modules/dialog/README index 7b8bb57..2c21988 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -1149,6 +1149,11 @@ modparam("dialog", "ka_timer", 10) dialog setup or previous keep-alive. The value represents the number of seconds. + If the requests times out (generating a 408) or if the UA responds with + 481 the lifetime is set to 10 seconds. When lifetime expires the dialog + will be terminated. Any other response (including error responses) will + reset the timers. + Default value is "0" (no keep alive). The lowest settable interval is 30 seconds. diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index b8dc1b0..0b57ba4 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -1248,6 +1248,13 @@ modparam("dialog", "ka_timer", 10) The value represents the number of seconds. </para> <para> + If the requests times out (generating a 408) or if the + UA responds with 481 the lifetime is set to 10 seconds. + When lifetime expires the dialog will be terminated. + Any other response (including error responses) will + reset the timers. + </para> + <para> <emphasis> Default value is <quote>0</quote> (no keep alive). The lowest settable interval is 30 seconds.

1 0

git:master:ff8bb9df: core: kemi - implemented embedded sub-module hdr
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: ff8bb9df8e6cb6d15612dc8245c3d59a8b29c0ba URL: https://github.com/kamailio/kamailio/commit/ff8bb9df8e6cb6d15612dc8245c3d59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T21:12:16+02:00 core: kemi - implemented embedded sub-module hdr --- Modified: kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/ff8bb9df8e6cb6d15612dc8245c3d59… Patch: https://github.com/kamailio/kamailio/commit/ff8bb9df8e6cb6d15612dc8245c3d59…

1 0

git:master:c54c0cf9: app_python: exported special sub-module KSR.pv
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: c54c0cf985f064dbff048a2fde0b5db6e58f2b31 URL: https://github.com/kamailio/kamailio/commit/c54c0cf985f064dbff048a2fde0b5db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T19:44:05+02:00 app_python: exported special sub-module KSR.pv - pv.get() can return int or string, not following the pattern from kemi generic function interface --- Modified: modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/c54c0cf985f064dbff048a2fde0b5db… Patch: https://github.com/kamailio/kamailio/commit/c54c0cf985f064dbff048a2fde0b5db…

1 0

git:master:3fccc0aa: app_lua: exported special sub-module KSR.pv
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 3fccc0aa1364c92a9f23fd488580eb92da012834 URL: https://github.com/kamailio/kamailio/commit/3fccc0aa1364c92a9f23fd488580eb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T19:41:29+02:00 app_lua: exported special sub-module KSR.pv - pv.get() can return int or string, not following the pattern from kemi generic function interface --- Modified: modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/3fccc0aa1364c92a9f23fd488580eb9… Patch: https://github.com/kamailio/kamailio/commit/3fccc0aa1364c92a9f23fd488580eb9… --- diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 036642d..fd9acce 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1737,7 +1737,11 @@ void lua_sr_kemi_register_core(lua_State *L) "end\n" "setmetatable(KSR, KSR)\n" ); - LM_DBG("pushin lua KSR table definition returned %d\n", ret); + + /* special modules - pv.get(...) can return int or str */ + luaL_openlib(L, "KSR.pv", _sr_pv_Map, 0); + + LM_DBG("pushing lua KSR table definition returned %d\n", ret); } /** @@ -1766,7 +1770,8 @@ void lua_sr_kemi_register_module(lua_State *L, str *mname, int midx) ); ret = luaL_dostring(L, sbuf); - LM_DBG("pushin lua KSR table definition returned %d\n", ret); + LM_DBG("pushing lua KSR.%.*s table definition returned %d\n", + mname->len, mname->s, ret); } /**

1 0

git:master:ce623436: app_python: avoid aquiring python eval lock for nested route blocks
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: ce623436af6793461984f004a9cb3d44e1243016 URL: https://github.com/kamailio/kamailio/commit/ce623436af6793461984f004a9cb3d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T15:00:33+02:00 app_python: avoid aquiring python eval lock for nested route blocks --- Modified: modules/app_python/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/ce623436af6793461984f004a9cb3d4… Patch: https://github.com/kamailio/kamailio/commit/ce623436af6793461984f004a9cb3d4… --- diff --git a/modules/app_python/python_exec.c b/modules/app_python/python_exec.c index c5bb435..74a9e05 100644 --- a/modules/app_python/python_exec.c +++ b/modules/app_python/python_exec.c @@ -45,6 +45,8 @@ sr_apy_env_t *sr_apy_env_get() return &_sr_apy_env; } +static int _sr_apy_exec_pid = 0; + /** * */ @@ -54,12 +56,19 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) PyObject *pmsg; int rval; sip_msg_t *bmsg; + int mpid; + int locked = 0; bmsg = _sr_apy_env.msg; _sr_apy_env.msg = _msg; + mpid = getpid(); - PyEval_AcquireLock(); - PyThreadState_Swap(myThreadState); + if(_sr_apy_exec_pid!=mpid) { + PyEval_AcquireLock(); + _sr_apy_exec_pid = mpid; + PyThreadState_Swap(myThreadState); + locked = 1; + } pFunc = PyObject_GetAttrString(_sr_apy_handler_obj, fname); if (pFunc == NULL || !PyCallable_Check(pFunc)) { @@ -69,8 +78,11 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) LM_DBG("%s not found or is not callable\n", fname); } Py_XDECREF(pFunc); - PyThreadState_Swap(NULL); - PyEval_ReleaseLock(); + if(locked) { + _sr_apy_exec_pid = 0; + PyThreadState_Swap(NULL); + PyEval_ReleaseLock(); + } _sr_apy_env.msg = bmsg; if(emode==1) { return -1; @@ -83,8 +95,11 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) if (pmsg == NULL) { LM_ERR("can't create MSGtype instance\n"); Py_DECREF(pFunc); - PyThreadState_Swap(NULL); - PyEval_ReleaseLock(); + if(locked) { + _sr_apy_exec_pid = 0; + PyThreadState_Swap(NULL); + PyEval_ReleaseLock(); + } _sr_apy_env.msg = bmsg; return -1; } @@ -95,8 +110,11 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) msg_invalidate(pmsg); Py_DECREF(pmsg); Py_DECREF(pFunc); - PyThreadState_Swap(NULL); - PyEval_ReleaseLock(); + if(locked) { + _sr_apy_exec_pid = 0; + PyThreadState_Swap(NULL); + PyEval_ReleaseLock(); + } _sr_apy_env.msg = bmsg; return -1; } @@ -110,8 +128,11 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) msg_invalidate(pmsg); Py_DECREF(pArgs); Py_DECREF(pFunc); - PyThreadState_Swap(NULL); - PyEval_ReleaseLock(); + if(locked) { + _sr_apy_exec_pid = 0; + PyThreadState_Swap(NULL); + PyEval_ReleaseLock(); + } _sr_apy_env.msg = bmsg; return -1; } @@ -126,24 +147,33 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) if (PyErr_Occurred()) { Py_XDECREF(pResult); python_handle_exception("python_exec2"); - PyThreadState_Swap(NULL); - PyEval_ReleaseLock(); + if(locked) { + _sr_apy_exec_pid = 0; + PyThreadState_Swap(NULL); + PyEval_ReleaseLock(); + } _sr_apy_env.msg = bmsg; return -1; } if (pResult == NULL) { LM_ERR("PyObject_CallObject() returned NULL\n"); - PyThreadState_Swap(NULL); - PyEval_ReleaseLock(); + if(locked) { + _sr_apy_exec_pid = 0; + PyThreadState_Swap(NULL); + PyEval_ReleaseLock(); + } _sr_apy_env.msg = bmsg; return -1; } rval = PyInt_AsLong(pResult); Py_DECREF(pResult); - PyThreadState_Swap(NULL); - PyEval_ReleaseLock(); + if(locked) { + _sr_apy_exec_pid = 0; + PyThreadState_Swap(NULL); + PyEval_ReleaseLock(); + } _sr_apy_env.msg = bmsg; return rval; }

1 0

git:master:2dee9926: app_python: proper implementation of reading the parameters
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 2dee9926be9a4e955134fef1ae11514fed6c2565 URL: https://github.com/kamailio/kamailio/commit/2dee9926be9a4e955134fef1ae11514… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T15:00:33+02:00 app_python: proper implementation of reading the parameters - parameters passed from python can be only read all at once --- Modified: modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/2dee9926be9a4e955134fef1ae11514… Patch: https://github.com/kamailio/kamailio/commit/2dee9926be9a4e955134fef1ae11514… --- diff --git a/modules/app_python/apy_kemi.c b/modules/app_python/apy_kemi.c index d2815d8..ece73f4 100644 --- a/modules/app_python/apy_kemi.c +++ b/modules/app_python/apy_kemi.c @@ -160,28 +160,68 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) } memset(vps, 0, SR_KEMI_PARAMS_MAX*sizeof(sr_kemi_val_t)); - for(i=0; i<SR_KEMI_PARAMS_MAX; i++) { - if(ket->ptypes[i]==SR_KEMIP_NONE) { - break; - } else if(ket->ptypes[i]==SR_KEMIP_STR) { - if(!PyArg_ParseTuple(args, "s:kemi-param", &vps[i].s.s)) { - LM_ERR("unable to retrieve str param %d\n", i); + if(ket->ptypes[1]==SR_KEMIP_NONE) { + i = 1; + if(ket->ptypes[0]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "i:kemi-param-n", &vps[0].n)) { + LM_ERR("unable to retrieve int param %d\n", 0); return sr_apy_kemi_return_false(); } - vps[i].s.len = strlen(vps[i].s.s); + LM_DBG("param[%d] for: %.*s is int: %d\n", i, + fname.len, fname.s, vps[0].n); + } else { + if(!PyArg_ParseTuple(args, "s:kemi-param-s", &vps[0].s.s)) { + LM_ERR("unable to retrieve str param %d\n", 0); + return sr_apy_kemi_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); LM_DBG("param[%d] for: %.*s is str: %.*s\n", i, - fname.len, fname.s, vps[i].s.len, vps[i].s.s); - } else if(ket->ptypes[i]==SR_KEMIP_INT) { - if(!PyArg_ParseTuple(args, "i:kemi-param", &vps[i].n)) { - LM_ERR("unable to retrieve int param %d\n", i); + fname.len, fname.s, vps[0].s.len, vps[0].s.s); + } + } else if(ket->ptypes[2]==SR_KEMIP_NONE) { + i = 2; + if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "ii:kemi-param-n", &vps[0].n, &vps[1].n)) { + LM_ERR("unable to retrieve int-int params %d\n", i); return sr_apy_kemi_return_false(); } - LM_DBG("param[%d] for: %.*s is int: %d\n", i, - fname.len, fname.s, vps[i].n); + LM_DBG("params[%d] for: %.*s are int-int: [%d] [%d]\n", i, + fname.len, fname.s, vps[0].n, vps[1].n); + } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "is:kemi-param-n", &vps[0].n, &vps[1].s.s)) { + LM_ERR("unable to retrieve int-str params %d\n", i); + return sr_apy_kemi_return_false(); + } + vps[1].s.len = strlen(vps[1].s.s); + LM_DBG("params[%d] for: %.*s are int-str: [%d] [%.*s]\n", i, + fname.len, fname.s, vps[0].n, vps[1].s.len, vps[1].s.s); + } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "si:kemi-param-n", &vps[0].s.s, &vps[1].n)) { + LM_ERR("unable to retrieve str-int params %d\n", i); + return sr_apy_kemi_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + LM_DBG("params[%d] for: %.*s are str-int: [%.*s] [%d]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].n); } else { - LM_ERR("unknown parameter type %d (%d)\n", ket->ptypes[i], i); - return sr_apy_kemi_return_false(); + if(!PyArg_ParseTuple(args, "ss:kemi-param-ss", &vps[0].s.s, &vps[1].s.s)) { + LM_ERR("unable to retrieve str-str param %d\n", i); + return sr_apy_kemi_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[1].s.len = strlen(vps[1].s.s); + LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, + vps[1].s.len, vps[1].s.s); } + + } else if(ket->ptypes[3]==SR_KEMIP_NONE) { + i = 3; + LM_ERR("not implemented yet\n"); + return sr_apy_kemi_return_false(); + } else { + LM_ERR("not implemented yet\n"); + return sr_apy_kemi_return_false(); } switch(i) {

1 0

git:master:8675fd28: python: use rewrite_uri() instead of core action for updating r-uri
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 8675fd282bb5cad4e349dbb85f9ca7fc31e44167 URL: https://github.com/kamailio/kamailio/commit/8675fd282bb5cad4e349dbb85f9ca7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T15:00:33+02:00 python: use rewrite_uri() instead of core action for updating r-uri --- Modified: modules/app_python/python_msgobj.c --- Diff: https://github.com/kamailio/kamailio/commit/8675fd282bb5cad4e349dbb85f9ca7f… Patch: https://github.com/kamailio/kamailio/commit/8675fd282bb5cad4e349dbb85f9ca7f… --- diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index 020a17e..f27f7c3 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -72,9 +72,7 @@ static PyObject *msg_copy(msgobject *self) static PyObject *msg_rewrite_ruri(msgobject *self, PyObject *args) { - char *ruri; - struct action act; - struct run_act_ctx ra_ctx; + str nuri; if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); @@ -88,19 +86,13 @@ static PyObject *msg_rewrite_ruri(msgobject *self, PyObject *args) return Py_None; } - if(!PyArg_ParseTuple(args, "s:rewrite_ruri", &ruri)) + if(!PyArg_ParseTuple(args, "s:rewrite_ruri", &nuri.s)) return NULL; - memset(&act, '\0', sizeof(act)); - - act.type = SET_URI_T; - act.val[0].type = STRING_ST; - act.val[0].u.str.s = ruri; - act.val[0].u.str.len = strlen(ruri); + nuri.len = strlen(nuri.s); - init_run_actions_ctx(&ra_ctx); - if (do_action(&ra_ctx, &act, self->msg) < 0) { - LM_ERR("Error in do_action\n"); + if(rewrite_uri(self->msg, &nuri)<0) { + LM_ERR("failed to update r-uri with [%.*s]\n", nuri.len, nuri.s); } Py_INCREF(Py_None);

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016