sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

git:master:89726e2b: app_python: implementation of kemi interpreter for python
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 89726e2bc7092d674f12867a5693a09765d150f2 URL: https://github.com/kamailio/kamailio/commit/89726e2bc7092d674f12867a5693a09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T15:00:32+02:00 app_python: implementation of kemi interpreter for python --- Modified: modules/app_python/apy_kemi.c Modified: modules/app_python/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/89726e2bc7092d674f12867a5693a09… Patch: https://github.com/kamailio/kamailio/commit/89726e2bc7092d674f12867a5693a09…

1 0

git:4.4:19d4d3f5: dialog Document shortest ka_interval
by Olle E. Johansson 19 Apr '16

19 Apr '16

Module: kamailio Branch: 4.4 Commit: 19d4d3f5a1a49335377c9befd238b729b957f42b URL: https://github.com/kamailio/kamailio/commit/19d4d3f5a1a49335377c9befd238b72… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-19T14:12:44+02:00 dialog Document shortest ka_interval (cherry picked from commit 9710f1c92baee8ec379d64b75531bed5cf7695fb) --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/19d4d3f5a1a49335377c9befd238b72… Patch: https://github.com/kamailio/kamailio/commit/19d4d3f5a1a49335377c9befd238b72… --- diff --git a/modules/dialog/README b/modules/dialog/README index 1774a7f..83206bc 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -1147,7 +1147,8 @@ modparam("dialog", "ka_timer", 10) dialog setup or previous keep-alive. The value represents the number of seconds. - Default value is "0" (no keep alive). + Default value is "0" (no keep alive). The lowest settable interval is + 30 seconds. Example 1.49. Set ka_interval parameter ... diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 50dffa7..b02826a 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -1249,7 +1249,8 @@ modparam("dialog", "ka_timer", 10) </para> <para> <emphasis> - Default value is <quote>0</quote> (no keep alive). + Default value is <quote>0</quote> (no keep alive). The lowest + settable interval is 30 seconds. </emphasis> </para> <example>

1 0

git:master:9710f1c9: dialog Document shortest ka_interval
by Olle E. Johansson 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 9710f1c92baee8ec379d64b75531bed5cf7695fb URL: https://github.com/kamailio/kamailio/commit/9710f1c92baee8ec379d64b75531bed… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-19T14:11:33+02:00 dialog Document shortest ka_interval --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9710f1c92baee8ec379d64b75531bed… Patch: https://github.com/kamailio/kamailio/commit/9710f1c92baee8ec379d64b75531bed… --- diff --git a/modules/dialog/README b/modules/dialog/README index 26ffdb1..7b8bb57 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -12,8 +12,12 @@ Edited by Bogdan-Andrei Iancu +Edited by + Carsten Bock +Edited by + Alex Balashov <abalashov(a)evaristesys.com> @@ -1145,7 +1149,8 @@ modparam("dialog", "ka_timer", 10) dialog setup or previous keep-alive. The value represents the number of seconds. - Default value is "0" (no keep alive). + Default value is "0" (no keep alive). The lowest settable interval is + 30 seconds. Example 1.49. Set ka_interval parameter ... diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index a24e2e2..b8dc1b0 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -1249,7 +1249,8 @@ modparam("dialog", "ka_timer", 10) </para> <para> <emphasis> - Default value is <quote>0</quote> (no keep alive). + Default value is <quote>0</quote> (no keep alive). The lowest + settable interval is 30 seconds. </emphasis> </para> <example>

1 0

git:master:6adb2fac: htable: refreshed the readme file
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 6adb2fac4a59a35fb1238b4eca5fd8e93c3659c9 URL: https://github.com/kamailio/kamailio/commit/6adb2fac4a59a35fb1238b4eca5fd8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T10:41:02+02:00 htable: refreshed the readme file --- Modified: modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/6adb2fac4a59a35fb1238b4eca5fd8e… Patch: https://github.com/kamailio/kamailio/commit/6adb2fac4a59a35fb1238b4eca5fd8e… --- diff --git a/modules/htable/README b/modules/htable/README index b9e2a02..e832b37 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -11,14 +11,10 @@ Elena-Ramona Modroiu <ramona(a)rosdev.ro> -Edited by - Alex Balashov <abalashov(a)evaristesys.com> -Edited by - Ovidiu Sas <osas(a)voipembedded.com> @@ -782,7 +778,8 @@ sht_iterator_end("i1"); * $shtcn(htable=>key) * $shtcv(htable=>key) * $shtinc(htable=>key) - * $shtval(htable=>key) + * $shtitkey(iname) + * $shtitval(iname) * $shtrecord(attribute) Exported pseudo-variables are documented at

1 0

git:master:79ad0e2d: htable: coherent indentation and whitespacing
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 79ad0e2d8a926e867b1f9e69a065e9b1727671ea URL: https://github.com/kamailio/kamailio/commit/79ad0e2d8a926e867b1f9e69a065e9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T10:40:20+02:00 htable: coherent indentation and whitespacing --- Modified: modules/htable/api.c Modified: modules/htable/ht_api.c Modified: modules/htable/ht_db.c Modified: modules/htable/ht_dmq.c Modified: modules/htable/ht_var.c Modified: modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/79ad0e2d8a926e867b1f9e69a065e9b… Patch: https://github.com/kamailio/kamailio/commit/79ad0e2d8a926e867b1f9e69a065e9b…

1 0

git:master:866270a7: htable: updated the list of exported variables
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 866270a7cc45205deab5b067be68e5c6a66704e8 URL: https://github.com/kamailio/kamailio/commit/866270a7cc45205deab5b067be68e5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T10:39:55+02:00 htable: updated the list of exported variables --- Modified: modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/866270a7cc45205deab5b067be68e5c… Patch: https://github.com/kamailio/kamailio/commit/866270a7cc45205deab5b067be68e5c… --- diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index 0546c67..034733c 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -913,7 +913,10 @@ sht_iterator_end("i1"); <emphasis>$shtinc(htable=>key)</emphasis> </para></listitem> <listitem><para> - <emphasis>$shtval(htable=>key)</emphasis> + <emphasis>$shtitkey(iname)</emphasis> + </para></listitem> + <listitem><para> + <emphasis>$shtitval(iname)</emphasis> </para></listitem> <listitem><para> <emphasis>$shtrecord(attribute)</emphasis>

1 0

Errored: kamailio/kamailio#2248 (master - dbc2719)
by Travis CI 19 Apr '16

19 Apr '16

Build Update for kamailio/kamailio ------------------------------------- Build: #2248 Status: Errored Duration: 11 minutes and 51 seconds Commit: dbc2719 (master) Author: Daniel-Constantin Mierla Message: app_python: added script to generate the files for static exports table View the changeset: https://github.com/kamailio/kamailio/compare/2ed205e43705...dbc2719f09bb View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/124126436 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:dbc2719f: app_python: added script to generate the files for static exports table
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: dbc2719f09bb7794437577c57e7134fc54b9ee8c URL: https://github.com/kamailio/kamailio/commit/dbc2719f09bb7794437577c57e7134f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T09:20:03+02:00 app_python: added script to generate the files for static exports table --- Added: modules/app_python/utils/app_python_ctl --- Diff: https://github.com/kamailio/kamailio/commit/dbc2719f09bb7794437577c57e7134f… Patch: https://github.com/kamailio/kamailio/commit/dbc2719f09bb7794437577c57e7134f…

1 0

git:master:3e25688e: app_python: added the file to store the static exports table
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 3e25688eb365c382167efa3519ab983b4aab6dc6 URL: https://github.com/kamailio/kamailio/commit/3e25688eb365c382167efa3519ab983… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T09:18:31+02:00 app_python: added the file to store the static exports table - kamailio functions will be associated with entries from exports table, being looked up by index --- Added: modules/app_python/apy_kemi_export.c Added: modules/app_python/apy_kemi_export.h --- Diff: https://github.com/kamailio/kamailio/commit/3e25688eb365c382167efa3519ab983… Patch: https://github.com/kamailio/kamailio/commit/3e25688eb365c382167efa3519ab983…

1 0

git:master:24a68b3d: app_python: rework to use a static exports table
by Daniel-Constantin Mierla 19 Apr '16

19 Apr '16

Module: kamailio Branch: master Commit: 24a68b3d7c52093391dcd8124d3642c04e3798e4 URL: https://github.com/kamailio/kamailio/commit/24a68b3d7c52093391dcd8124d3642c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-19T09:17:06+02:00 app_python: rework to use a static exports table - not possible to set the object index function --- Modified: modules/app_python/apy_kemi.c Modified: modules/app_python/apy_kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/24a68b3d7c52093391dcd8124d3642c… Patch: https://github.com/kamailio/kamailio/commit/24a68b3d7c52093391dcd8124d3642c… --- diff --git a/modules/app_python/apy_kemi.c b/modules/app_python/apy_kemi.c index 0067e54..5f3c7df 100644 --- a/modules/app_python/apy_kemi.c +++ b/modules/app_python/apy_kemi.c @@ -30,6 +30,7 @@ #include "../../mem/pkg.h" #include "python_exec.h" +#include "apy_kemi_export.h" #include "apy_kemi.h" /** @@ -90,13 +91,10 @@ int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname) /** * */ -static PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args) +PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) { - str mname = str_init(""); - int midx = 0; - str fname = str_init(""); + str fname; int i; - PyTypeObject *pto; sr_kemi_t *ket = NULL; sr_kemi_val_t vps[SR_KEMI_PARAMS_MAX]; sr_apy_env_t *env_P; @@ -109,26 +107,19 @@ static PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args) return Py_None; } - if(self!=NULL) { - pto = Py_TYPE(self); - if(pto==NULL) { - Py_INCREF(Py_None); - return Py_None; - } - LM_DBG("execution of method: %s\n", pto->tp_name); - fname.s = (char*)pto->tp_name; - fname.len = strlen(fname.s); - } else { - fname.s = "[test]"; - fname.len = strlen(fname.s); - LM_DBG("execution of method: %.*s\n", fname.len, fname.s); - } - - ket = sr_kemi_lookup(&mname, midx, &fname); + ket = sr_apy_kemi_export_get(idx); if(ket==NULL) { Py_INCREF(Py_None); return Py_None; } + if(ket->mname.len>0) { + LM_DBG("execution of method: %.*s\n", ket->fname.len, ket->fname.s); + } else { + LM_DBG("execution of method: %.*s.%.*s\n", + ket->mname.len, ket->mname.s, + ket->fname.len, ket->fname.s); + } + fname = ket->fname; memset(vps, 0, SR_KEMI_PARAMS_MAX*sizeof(sr_kemi_val_t)); for(i=0; i<SR_KEMI_PARAMS_MAX; i++) { @@ -174,6 +165,30 @@ PyMethodDef *_sr_KSRMethods = NULL; /** * */ +static int sr_apy_kemi_f_dbg(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_DBG("%.*s", txt->len, txt->s); + return 0; +} + +/** + * + */ +static sr_kemi_t _sr_apy_kemi_test[] = { + { str_init("test"), str_init("dbg"), + SR_KEMIP_NONE, sr_apy_kemi_f_dbg, + { 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 } } +}; + + +/** + * + */ int sr_apy_init_ksr(void) { _sr_KSRMethods = pkg_malloc(SR_APY_KSR_METHOS_SIZE * sizeof(PyMethodDef)); @@ -183,8 +198,8 @@ int sr_apy_init_ksr(void) } memset(_sr_KSRMethods, 0, SR_APY_KSR_METHOS_SIZE * sizeof(PyMethodDef)); - _sr_KSRMethods[0].ml_name = "test"; - _sr_KSRMethods[0].ml_meth = (PyCFunction)sr_apy_kemi_exec_func; + _sr_KSRMethods[0].ml_name = _sr_apy_kemi_test[0].fname.s; + _sr_KSRMethods[0].ml_meth = sr_apy_kemi_export_associate(&_sr_apy_kemi_test[0]); _sr_KSRMethods[0].ml_flags = METH_VARARGS; _sr_KSRMethods[0].ml_doc = "Kamailio function"; diff --git a/modules/app_python/apy_kemi.h b/modules/app_python/apy_kemi.h index be74aa1..8840cd2 100644 --- a/modules/app_python/apy_kemi.h +++ b/modules/app_python/apy_kemi.h @@ -22,10 +22,13 @@ #ifndef __APY_KEMI_H__ #define __APY_KEMI_H__ +#include <Python.h> #include "../../parser/msg_parser.h" int sr_apy_init_ksr(void); void sr_apy_destroy_ksr(void); int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname); +PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx); + #endif

1 0

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