sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: app_python: expand log facilities
by Ovidiu Sas 03 Dec '12

03 Dec '12

Module: sip-router Branch: master Commit: acbeda46ac94e6c5c215a03bd803e10b2c7540db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acbeda4… Author: Konstantin M <evilzluk(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Dec 3 18:26:36 2012 -0500 app_python: expand log facilities --- modules/app_python/Loggers.py | 65 ++++++++++ modules/app_python/README.TestCase-Loggers | 16 +++ modules/app_python/… [View More]python_iface.c | 181 +++++++++++++++++++++++++++- modules/app_python/python_iface.h | 1 + modules/app_python/python_mod.c | 16 +-- 5 files changed, 264 insertions(+), 15 deletions(-) diff --git a/modules/app_python/Loggers.py b/modules/app_python/Loggers.py new file mode 100644 index 0000000..9f8b706 --- /dev/null +++ b/modules/app_python/Loggers.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- + +""" + Script for logging test. + 2012.12.03: Created by: Konstantin M. <evilzluk(a)gmail.com> +""" + +import Router + +""" + Module Properties: + Log Levels: + L_ALERT + L_BUG + L_CRIT2 + L_CRIT + L_ERR + L_WARN + L_NOTICE + L_INFO + L_DBG + + Log Facilities: + DEFAULT_FACILITY + + Module Methods: + LM_GEN1(self, int log_level, str msg) + LM_GEN2(self, int log_facility, int log_level, str msg) + LM_ALERT(self, str msg) + LM_CRIT(self, str msg) + LM_ERR(self, str msg) + LM_WARN(self, str msg) + LM_NOTICE(self, str msg) + LM_INFO(self, str msg) + LM_DBG(self, str msg) + + +""" + +class Loggers: + + def __init__(self): + pass + + def __del__(self): + pass + + def child_init(self, y): + return 0 + + def TestLoggers(self, msg, args): + Router.LM_GEN1(Router.L_INFO, "Loggers.py: LM_GEN1: msg: %s" % str(args)) + Router.LM_GEN2(Router.L_INFO, Router.DEFAULT_FACILITY, "Loggers.py: LM_GEN2: msg: %s" % str(args)) + Router.LM_ALERT( "Loggers.py: LM_ALERT: msg: %s" % str(args)) + Router.LM_CRIT( "Loggers.py: LM_CRIT: msg: %s" % str(args)) + Router.LM_ERR( "Loggers.py: LM_ERR: msg: %s" % str(args)) + Router.LM_WARN( "Loggers.py: LM_WARN: msg: %s" % str(args)) + Router.LM_NOTICE( "Loggers.py: LM_NOTICE: msg: %s" % str(args)) + Router.LM_INFO( "Loggers.py: LM_INFO: msg: %s" % str(args)) + Router.LM_DBG( "Loggers.py: LM_DBG: msg: %s" % str(args)) + return 1 + +def mod_init(): + return Loggers() + diff --git a/modules/app_python/README.TestCase-Loggers b/modules/app_python/README.TestCase-Loggers new file mode 100644 index 0000000..8eea4b2 --- /dev/null +++ b/modules/app_python/README.TestCase-Loggers @@ -0,0 +1,16 @@ + +Example of using loggers in Python: + +loadmodule "app_python.so" +modparam("app_python", "script_name", "/path/to/Loggers.py") +modparam("app_python", "mod_init_function", "mod_init") +modparam("app_python", "child_init_method", "child_init") + +... + +route +{ + python_exec("TestLoggers", "Test Message\n"); + ... +} + diff --git a/modules/app_python/python_iface.c b/modules/app_python/python_iface.c index 7e571d8..36c7c23 100644 --- a/modules/app_python/python_iface.c +++ b/modules/app_python/python_iface.c @@ -27,9 +27,111 @@ #include "../../route_struct.h" #include "python_exec.h" -/* Return the number of arguments of the application command line */ -static PyObject* -router_LM_ERR(PyObject *self, PyObject *args) + +/* + * Python method: LM_GEN1(self, int log_level, str msg) + */ +static PyObject *router_LM_GEN1(PyObject *self, PyObject *args) +{ + int log_level; + char *msg; + + if (!PyArg_ParseTuple(args, "is:LM_GEN1", &log_level, &msg)) + return NULL; + + LM_GEN1(log_level, "%s", msg); + + Py_INCREF(Py_None); + return Py_None; +} + +/* + * Python method: LM_GEN2(self, int log_facility, int log_level, str msg) + */ +static PyObject *router_LM_GEN2(PyObject *self, PyObject *args) +{ + int log_facility; + int log_level; + char *msg; + + if(!PyArg_ParseTuple(args, "iis:LM_GEN2", &log_facility, &log_level, &msg)) + return NULL; + + LM_GEN2(log_facility, log_level, "%s", msg); + + Py_INCREF(Py_None); + return Py_None; +} + +/* + * Python method: LM_ALERT(self, str msg) + */ +static PyObject *router_LM_ALERT(PyObject *self, PyObject *args) +{ + char *msg; + + if(!PyArg_ParseTuple(args, "s:LM_ALERT", &msg)) + return NULL; + + LM_ALERT("%s", msg); + + Py_INCREF(Py_None); + return Py_None; +} + + +/* + * Python method: LM_CRIT(self, str msg) + */ +static PyObject *router_LM_CRIT(PyObject *self, PyObject *args) +{ + char *msg; + + if(!PyArg_ParseTuple(args, "s:LM_CRIT", &msg)) + return NULL; + + LM_CRIT("%s", msg); + + Py_INCREF(Py_None); + return Py_None; +} + +/* + * Python method: LM_WARN(self, str msg) + */ +static PyObject *router_LM_WARN(PyObject *self, PyObject *args) +{ + char *msg; + + if(!PyArg_ParseTuple(args, "s:LM_WARN", &msg)) + return NULL; + + LM_WARN("%s", msg); + + Py_INCREF(Py_None); + return Py_None; +} + +/* + * Python method: LM_NOTICE(self, str msg) + */ +static PyObject *router_LM_NOTICE(PyObject *self, PyObject *args) +{ + char *msg; + + if(!PyArg_ParseTuple(args, "s:LM_NOTICE", &msg)) + return NULL; + + LM_NOTICE("%s", msg); + + Py_INCREF(Py_None); + return Py_None; +} + +/* + * Python method: LM_ERR(self, str msg) + */ +static PyObject *router_LM_ERR(PyObject *self, PyObject *args) { char *msg; @@ -42,8 +144,75 @@ router_LM_ERR(PyObject *self, PyObject *args) return Py_None; } +/* + * Python method: LM_INFO(self, str msg) + */ +static PyObject *router_LM_INFO(PyObject *self, PyObject *args) +{ + char *msg; + + if(!PyArg_ParseTuple(args, "s:LM_INFO", &msg)) + return NULL; + + LM_INFO("%s", msg); + + Py_INCREF(Py_None); + return Py_None; +} + +/* + * Python method: LM_DBG(self, str msg) + */ +static PyObject *router_LM_DBG(PyObject *self, PyObject *args) +{ + char *msg; + + if(!PyArg_ParseTuple(args, "s:LM_DBG", &msg)) + return NULL; + + LM_DBG("%s", msg); + + Py_INCREF(Py_None); + return Py_None; +} + + PyMethodDef RouterMethods[] = { - {"LM_ERR", router_LM_ERR, METH_VARARGS, - "Pring error message."}, - {NULL, NULL, 0, NULL} + {"LM_GEN1", router_LM_GEN1, METH_VARARGS, "Print GEN1 message."}, + {"LM_GEN2", router_LM_GEN2, METH_VARARGS, "Print GEN2 message."}, + {"LM_ALERT", router_LM_ALERT, METH_VARARGS, "Print alert message."}, + {"LM_CRIT", router_LM_CRIT, METH_VARARGS, "Print critical message."}, + {"LM_ERR", router_LM_ERR, METH_VARARGS, "Print error message."}, + {"LM_WARN", router_LM_WARN, METH_VARARGS, "Print warning message."}, + {"LM_NOTICE", router_LM_NOTICE, METH_VARARGS, "Print notice message."}, + {"LM_INFO", router_LM_INFO, METH_VARARGS, "Print info message."}, + {"LM_DBG", router_LM_DBG, METH_VARARGS, "Print debug message."}, + {NULL, NULL, 0, NULL} }; + +/* + * Default module properties + */ +void RouterAddProperties(PyObject *m) +{ + /* + * Log levels + * Reference: dprint.h + */ + PyModule_AddObject(m, "L_ALERT", PyInt_FromLong((long)L_ALERT)); + PyModule_AddObject(m, "L_BUG", PyInt_FromLong((long)L_BUG)); + PyModule_AddObject(m, "L_CRIT2", PyInt_FromLong((long)L_CRIT2)); /* like L_CRIT, but adds prefix */ + PyModule_AddObject(m, "L_CRIT", PyInt_FromLong((long)L_CRIT)); /* no prefix added */ + PyModule_AddObject(m, "L_ERR", PyInt_FromLong((long)L_ERR)); + PyModule_AddObject(m, "L_WARN", PyInt_FromLong((long)L_WARN)); + PyModule_AddObject(m, "L_NOTICE", PyInt_FromLong((long)L_NOTICE)); + PyModule_AddObject(m, "L_INFO", PyInt_FromLong((long)L_INFO)); + PyModule_AddObject(m, "L_DBG", PyInt_FromLong((long)L_DBG)); + + /* + * Facility + * Reference: dprint.h + */ + PyModule_AddObject(m, "DEFAULT_FACILITY", PyInt_FromLong((long)DEFAULT_FACILITY)); +} + diff --git a/modules/app_python/python_iface.h b/modules/app_python/python_iface.h index 8491ff4..965f97d 100644 --- a/modules/app_python/python_iface.h +++ b/modules/app_python/python_iface.h @@ -26,5 +26,6 @@ #include <Python.h> extern PyMethodDef RouterMethods[]; +void RouterAddProperties(PyObject *); #endif diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index 185bf99..963aec7 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -82,12 +82,11 @@ struct module_exports exports = { child_init /* per-child init function */ }; -static int -mod_init(void) +static int mod_init(void) { char *dname, *bname, *dname_src, *bname_src; int i; - PyObject *sys_path, *pDir, *pModule, *pFunc, *pArgs; + PyObject *sys_path, *pDir, *pModule, *pFunc, *pArgs, *m; PyThreadState *mainThreadState; if (script_name.len == 0) { @@ -127,7 +126,7 @@ mod_init(void) PyEval_InitThreads(); mainThreadState = PyThreadState_Get(); - Py_InitModule("Router", RouterMethods); + m = Py_InitModule("Router", RouterMethods); if (python_msgobj_init() != 0) { LM_ERR("python_msgobj_init() has failed\n"); @@ -135,6 +134,8 @@ mod_init(void) return -1; } + RouterAddProperties(m); + sys_path = PySys_GetObject("path"); /* PySys_GetObject doesn't pass reference! No need to DEREF */ if (sys_path == NULL) { @@ -227,8 +228,7 @@ mod_init(void) return 0; } -static int -child_init(int rank) +static int child_init(int rank) { PyObject *pFunc, *pArgs, *pValue, *pResult; int rval; @@ -294,9 +294,7 @@ child_init(int rank) return rval; } -static void -mod_destroy(void) +static void mod_destroy(void) { - return; } [View Less]

1 0

git:master: sca: remove public IP from example cfg
by Andrew Mortensen 03 Dec '12

03 Dec '12

Module: sip-router Branch: master Commit: 5b63e94e49feb0a35b093a5eb3a86c9e5c1a0ba7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b63e94… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Dec 3 17:15:47 2012 -0500 sca: remove public IP from example cfg --- modules/sca/examples/kamailio.cfg | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/modules/sca/… [View More]

1 0

kamailio vs.ser
by Ovidiu Sas 03 Dec '12

03 Dec '12

Hello all, By inspecting the source code, the only difference that I could see between kamailio and ser flavours is that kamailio has support for the "tm:local-request". Are there any constrains in having the tm:local-request present for ser flavour? Does it make sense to continue to build two flavours? My suggestion would be to focus one one single flavour and go forward with it for the next release. Comments? Regards, Ovidiu Sas -- VoIP Embedded, Inc. http://www.voipembedded.com

2 1

Cross-compilation
by Olle E. Johansson 03 Dec '12

03 Dec '12

Hi Ovidiu! Just curious. I see a lot of commits for cross-compilation. What are you trying to compile Kamailio for? /O

2 2

git:master: carrierroute: fix cross-compilation
by Ovidiu Sas 03 Dec '12

03 Dec '12

Module: sip-router Branch: master Commit: f9c0980c4f85d8b728eb36e6b5768173750c6964 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9c0980… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Dec 3 12:55:25 2012 -0500 carrierroute: fix cross-compilation --- modules/carrierroute/Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/carrierroute/Makefile … [View More]

1 0

git:master: db_postgres: fix cross-compilation
by Ovidiu Sas 03 Dec '12

03 Dec '12

Module: sip-router Branch: master Commit: 175934a802cf863f26f84f9e11a2eec4606ecfd1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=175934a… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Dec 3 08:43:01 2012 -0500 db_postgres: fix cross-compilation --- modules/db_postgres/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/db_postgres/Makefile b/… [View More]

1 0

Kamailio World - Conference & Exhibition - April 16-17, 2013, Berlin, Germany
by Daniel-Constantin Mierla 03 Dec '12

03 Dec '12

Kamailio project is announcing its first dedicated event - Kamailio World - to take place in Berlin, Germany, during April 16-17, 2013. The event is organized by Asipto (http://www.asipto.com) in collaboration with Fraunhofer Fokus Institute (http://www.fokus.fraunhofer.de). The conference is targeting to present commercial products and services build around Kamailio and related projects, as well as technical workshops of how to use Kamailio for various purposes. Along with the … [View More]

1 0

git:master: mqueue: README update
by Olle E. Johansson 03 Dec '12

03 Dec '12

Module: sip-router Branch: master Commit: e09b92893fd35baf672541143951337b103bb65b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e09b928… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Mon Dec 3 08:10:34 2012 +0100 mqueue: README update --- modules/mqueue/README | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/mqueue/README b/modules/… [View More]mqueue/README index 4206a19..8d41f8a 100644 --- a/modules/mqueue/README +++ b/modules/mqueue/README @@ -72,12 +72,13 @@ Chapter 1. Admin Guide 1. Overview - This module offers generic message queue system in shared memory for - inter-process communication via config file. One example of usage is to - send time consuming operations to a timer process that consumes items - in the queue, without affecting SIP message handling. + The mqueue module offers a generic message queue system in shared + memory for inter-process communication using the config file. One + example of usage is to send time consuming operations to one or several + timer processes that consumes items in the queue, without affecting SIP + message handling in the socket-listening process. - There can be defined many queues, access to values being done via + There can be many defined queues. Access to queued values is done via pseudo variables. 2. Dependencies @@ -102,7 +103,7 @@ Chapter 1. Admin Guide 3.1. mqueue (string) - Definition of memory queue + Definition of a memory queue Default value is "none". @@ -111,7 +112,7 @@ Chapter 1. Admin Guide specifies the maximum number of items in queue, if it is execeeded the oldest one is removed. - The parameter can be set many time, each holding the definition of one + The parameter can be set many times, each holding the definition of one queue. Example 1.1. Set mqueue parameter @@ -127,7 +128,7 @@ modparam("mqueue", "mqueue", "name=qaz") 4.3. mq_pv_free(queue) 4.4. mq_size(queue) -4.1. mq_add(queue, key, value) +4.1. mq_add(queue, key, value) Add a new item (key, value) in the queue. If max size of queue is exceeded, the oldest one is removed. @@ -137,7 +138,7 @@ modparam("mqueue", "mqueue", "name=qaz") mq_add("myq", "$rU", "call from $fU"); ... -4.2. mq_fetch(queue) +4.2. mq_fetch(queue) Take oldest item from queue and fill $mqk(queue) and $mqv(queue) pseudo variables. @@ -153,17 +154,17 @@ while(mq_fetch("myq")) } ... -4.3. mq_pv_free(queue) +4.3. mq_pv_free(queue) Free the item fetched in pseudo-variables. It is optional, a new fetch - frees the old values. + frees the previous values. Example 1.4. mq_pv_free usage ... mq_pv_free("myq"); ... -4.4. mq_size(queue) +4.4. mq_size(queue) Returns the current number of elements in the mqueue. [View Less]

1 0

git:master: corex: minor documentation edits
by Olle E. Johansson 03 Dec '12

03 Dec '12

Module: sip-router Branch: master Commit: 287c02de1491019fbf085742b82fc7040ea72886 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=287c02d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Mon Dec 3 08:01:06 2012 +0100 corex: minor documentation edits --- modules/corex/README | 26 +++++++++++++------------- modules/corex/doc/corex_admin.xml | 14 +++++++------- 2 files changed, 20 … [View More]insertions(+), 20 deletions(-) diff --git a/modules/corex/README b/modules/corex/README index 402089a..ecceeaf 100644 --- a/modules/corex/README +++ b/modules/corex/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2012 asipto.com + Copyright � 2012 asipto.com __________________________________________________________________ Table of Contents @@ -71,16 +71,16 @@ Chapter 1. Admin Guide 1. Overview - This module provides reimplementation of very old functions that were - in core and supported only static string or integer parameters. The new - versions bring support for dynamic parameters (allowing variables - inside the parameters). + This module provides reimplementation of a few very old functions that + used to be in the core and supported only static string or integer + parameters. The new versions bring support for dynamic parameters + (allowing variables inside the parameters). There are also brand new features, related to core internals, but controlled from configuration file or via control interfaces. - Contributions to this module must be done under BSD license, to follow - the requirements of the core contributions. + Contributions to this module must be done under the BSD license, to + follow the requirements of the core contributions. 2. Dependencies @@ -104,12 +104,12 @@ Chapter 1. Admin Guide 3.1. alias_subdomains (string) - Register a domain and all its sub-domains to match the myself + Register a domain and all its sub-domains to match the "myself" condition. It can be set many times. Its full format is: 'proto:domain:port', allowing to set restrictions on protocol and port as well. Protocol and port are optional. - Default value is “NULL”. + Default value is "NULL". Example 1.1. Set alias_subdomains parameter ... @@ -125,11 +125,11 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") 4.1. append_branch([ uri, [ q ] ]) - Append a new branch to the destination set, useful to build the - addresses for parallel forking or redirect replies. + Append a new branch to the destination set, useful to build the set of + destination addresses for parallel forking or redirect replies. Both parameters are optional, If no uri parameter is provided, then the - address from request URI (r-uri) is taken to build the new branch. + address from request URI (r-uri) is used to build the new branch. Meaning of the parameters is as follows: * uri - SIP address of the branch to be used as R-URI in the outgoing @@ -186,7 +186,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") 5.2. corex.list_aliases - Print the list of hostname aliases used to match myself condition. + Print the list of hostname aliases used to match the myself condition. Example: sercmd corex.list_aliases diff --git a/modules/corex/doc/corex_admin.xml b/modules/corex/doc/corex_admin.xml index 5dd72e7..3291cfd 100644 --- a/modules/corex/doc/corex_admin.xml +++ b/modules/corex/doc/corex_admin.xml @@ -16,8 +16,8 @@ <section> <title>Overview</title> <para> - This module provides reimplementation of very old functions that - were in core and supported only static string or integer parameters. + This module provides reimplementation of a few very old functions that + used to be in the core and supported only static string or integer parameters. The new versions bring support for dynamic parameters (allowing variables inside the parameters). </para> @@ -26,7 +26,7 @@ controlled from configuration file or via control interfaces. </para> <para> - Contributions to this module must be done under BSD license, to + Contributions to this module must be done under the BSD license, to follow the requirements of the core contributions. </para> </section> @@ -67,7 +67,7 @@ <section> <title><varname>alias_subdomains</varname> (string)</title> <para> - Register a domain and all its sub-domains to match the myself + Register a domain and all its sub-domains to match the <quote>myself</quote> condition. It can be set many times. Its full format is: 'proto:domain:port', allowing to set restrictions on protocol and port as well. Protocol and port are optional. @@ -97,11 +97,11 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") </title> <para> Append a new branch to the destination set, useful to build the - addresses for parallel forking or redirect replies. + set of destination addresses for parallel forking or redirect replies. </para> <para> Both parameters are optional, If no uri parameter is provided, - then the address from request URI (r-uri) is taken to build the + then the address from request URI (r-uri) is used to build the new branch. </para> <para>Meaning of the parameters is as follows:</para> @@ -201,7 +201,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") <function moreinfo="none">corex.list_aliases</function> </title> <para> - Print the list of hostname aliases used to match myself + Print the list of hostname aliases used to match the myself condition. </para> <para> [View Less]

1 0

git:master: mqueue: minor edits to README
by Olle E. Johansson 03 Dec '12

03 Dec '12

Module: sip-router Branch: master Commit: c29773967e83c4b3977b76a43805dd622bc018a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c297739… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Mon Dec 3 08:06:27 2012 +0100 mqueue: minor edits to README --- modules/mqueue/doc/mqueue_admin.xml | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/mqueue/doc/… [View More]

1 0

← Newer
1
...
37
38
39
40
41
42
43
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012