sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

Fwd: DTLS with kamailio
by mustafa samara 31 Jan '10

31 Jan '10

Hello I want to try DTLS with kamailio, I am working on minisip it support DTLS, but what a bout the kamailio side? is there any thing to do? also i would ask about IPSec support is there any thing to do on kamailio side, or it just on the kernel level? any help please? thanks

2 1

git:master: core: use dlflags to load modules
by Daniel-Constantin Mierla 30 Jan '10

30 Jan '10

Module: sip-router Branch: master Commit: f4d2f91c9e3522ab92694ac37c4ee58ee7572c96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4d2f91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 30 17:02:37 2010 +0100 core: use dlflags to load modules - dlflags var used for dlopen function --- sr_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index a022082..b0c6c20 100644 --- a/sr_module.c +++ b/sr_module.c @@ -390,7 +390,7 @@ int load_module(char* mod_path) retries=2; dlflags=RTLD_NOW; reload: - handle=dlopen(path, RTLD_NOW); /* resolve all symbols now */ + handle=dlopen(path, dlflags); /* resolve all symbols now */ if (handle==0){ LOG(L_ERR, "ERROR: load_module: could not open module <%s>: %s\n", path, dlerror());

1 0

git:master: app_lua: do basic Lua probing before fork
by Daniel-Constantin Mierla 30 Jan '10

30 Jan '10

Module: sip-router Branch: master Commit: d098c129dcd1f8a7d28ae998e8a0094faac4bf58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d098c12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 30 17:05:12 2010 +0100 app_lua: do basic Lua probing before fork - check if Lua files given to load parameter exist --- modules/app_lua/Makefile | 3 +- modules/app_lua/app_lua_api.c | 85 ++++++++++++++++++++++++++++++----------- modules/app_lua/app_lua_api.h | 1 + modules/app_lua/app_lua_mod.c | 11 ++++- modules/app_lua/app_lua_sr.c | 10 +++++ 5 files changed, 85 insertions(+), 25 deletions(-) diff --git a/modules/app_lua/Makefile b/modules/app_lua/Makefile index 605eb34..a466ab9 100644 --- a/modules/app_lua/Makefile +++ b/modules/app_lua/Makefile @@ -10,7 +10,8 @@ auto_gen= NAME=app_lua.so LIBS= -llua5.1 -DEFS+=-DOPENSER_MOD_INTERFACE -I/usr/include/lua5.1/ +DEFS+=-I/usr/include/lua5.1 +DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore diff --git a/modules/app_lua/app_lua_api.c b/modules/app_lua/app_lua_api.c index 88ee832..5e35436 100644 --- a/modules/app_lua/app_lua_api.c +++ b/modules/app_lua/app_lua_api.c @@ -123,12 +123,62 @@ int lua_sr_init_mod(void) /** * */ +int lua_sr_init_probe(void) +{ + lua_State *L; + char *txt; + sr_lua_load_t *li; + struct stat sbuf; + + L = lua_open(); + if(L==NULL) + { + LM_ERR("cannot open lua\n"); + return -1; + } + luaL_openlibs(L); + lua_sr_openlibs(L); + + /* force loading lua lib now */ + if(luaL_dostring(L, "sr.probe()")!=0) + { + txt = (char*)lua_tostring(L, -1); + LM_ERR("error initializing Lua: %s\n", (txt)?txt:"unknown"); + lua_pop(L, 1); + lua_close(L); + return -1; + } + + /* test if files to be loaded exist */ + if(_sr_lua_load_list != NULL) + { + li = _sr_lua_load_list; + while(li) + { + if(stat(li->script, &sbuf)!=0) + { + /* file does not exist */ + LM_ERR("cannot find script: %s (wrong path?)\n", + li->script); + lua_close(L); + return -1; + } + li = li->next; + } + } + lua_close(L); + LM_DBG("Lua probe was ok!\n"); + return 0; +} + +/** + * + */ int lua_sr_init_child(void) { sr_lua_load_t *li; int ret; char *txt; - struct stat sbuf; memset(&_sr_L_env, 0, sizeof(sr_lua_env_t)); _sr_L_env.L = lua_open(); @@ -147,7 +197,7 @@ int lua_sr_init_child(void) if(_sr_lua_load_list != NULL) { - _sr_L_env.LL = lua_open(); + _sr_L_env.LL = luaL_newstate(); if(_sr_L_env.LL==NULL) { LM_ERR("cannot open lua loading state\n"); @@ -161,18 +211,20 @@ int lua_sr_init_child(void) lua_pushstring(_sr_L_env.LL, SRVERSION); lua_settable(_sr_L_env.LL, LUA_GLOBALSINDEX); + /* force loading lua lib now */ + if(luaL_dostring(_sr_L_env.LL, "sr.probe()")!=0) + { + txt = (char*)lua_tostring(_sr_L_env.LL, -1); + LM_ERR("error initializing Lua: %s\n", (txt)?txt:"unknown"); + lua_pop(_sr_L_env.LL, 1); + lua_sr_destroy(); + return -1; + } + li = _sr_lua_load_list; while(li) { - if(stat(li->script, &sbuf)!=0) - { - /* file does not exist */ - LM_ERR("cannot find script: %s (wrong path?)\n", - li->script); - lua_sr_destroy(); - return -1; - } - ret = luaL_loadfile(_sr_L_env.LL, (const char*)li->script); + ret = luaL_dofile(_sr_L_env.LL, (const char*)li->script); if(ret!=0) { LM_ERR("failed to load Lua script: %s (err: %d)\n", @@ -183,17 +235,6 @@ int lua_sr_init_child(void) lua_sr_destroy(); return -1; } - ret = lua_pcall(_sr_L_env.LL, 0, 0, 0); - if(ret!=0) - { - LM_ERR("failed to init Lua script: %s (err: %d)\n", - li->script, ret); - txt = (char*)lua_tostring(_sr_L_env.LL, -1); - LM_ERR("error from Lua: %s\n", (txt)?txt:"unknown"); - lua_pop(_sr_L_env.LL, 1); - lua_sr_destroy(); - return -1; - } li = li->next; } } diff --git a/modules/app_lua/app_lua_api.h b/modules/app_lua/app_lua_api.h index fbf12d5..51ebc15 100644 --- a/modules/app_lua/app_lua_api.h +++ b/modules/app_lua/app_lua_api.h @@ -44,6 +44,7 @@ int lua_sr_initialized(void); int lua_sr_init_mod(void); int lua_sr_init_child(void); void lua_sr_destroy(void); +int lua_sr_init_probe(void); int sr_lua_load_script(char *script); int sr_lua_register_module(char *mname); diff --git a/modules/app_lua/app_lua_mod.c b/modules/app_lua/app_lua_mod.c index bc7fc2c..f9e1a69 100644 --- a/modules/app_lua/app_lua_mod.c +++ b/modules/app_lua/app_lua_mod.c @@ -86,7 +86,7 @@ static cmd_export_t cmds[]={ struct module_exports exports = { "app_lua", - DEFAULT_DLFLAGS, /* dlopen flags */ + RTLD_NOW | RTLD_GLOBAL, /* dlopen flags */ cmds, params, 0, @@ -114,9 +114,16 @@ static int mod_init(void) /* each child get a new connection to the database */ static int child_init(int rank) { - if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if(rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ + if (rank==PROC_INIT) + { + /* do a probe before forking */ + if(lua_sr_init_probe()!=0) + return -1; + return 0; + } return lua_sr_init_child(); } diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index aa98d74..0cf935d 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -40,6 +40,15 @@ /** * */ +static int lua_sr_probe (lua_State *L) +{ + LM_DBG("someone probing from lua\n"); + return 0; +} + +/** + * + */ static int lua_sr_dbg (lua_State *L) { char *txt; @@ -92,6 +101,7 @@ static int lua_sr_log (lua_State *L) * */ static const luaL_reg _sr_core_Map [] = { + {"probe", lua_sr_probe}, {"dbg", lua_sr_dbg}, {"err", lua_sr_err}, {"log", lua_sr_log},

1 0

git:master: app_lua: function params can be dynamic strings
by Daniel-Constantin Mierla 29 Jan '10

29 Jan '10

Module: sip-router Branch: master Commit: 71e12561770882911b240fc05f39a2175d2bdfc3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71e1256… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 29 22:52:45 2010 +0100 app_lua: function params can be dynamic strings - all functions accept parameters with PVs that are evaluated at runtime - new function lua_runstring() to run lua script in the context of loaded lua files at startup - helper functions to return boolean to lua and print lua stack in c side --- modules/app_lua/README | 40 ++++++-- modules/app_lua/app_lua_api.c | 57 ++++++++++ modules/app_lua/app_lua_api.h | 3 + modules/app_lua/app_lua_mod.c | 181 +++++++++++++++++++++++++++++++-- modules/app_lua/doc/app_lua_admin.xml | 44 ++++++-- 5 files changed, 296 insertions(+), 29 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=71e…

1 0

Kamailio 1.5.3 bug
by Zunnun Rahman 29 Jan '10

29 Jan '10

Hi We are running Kamailio 1.5.3 TLS version & found a problem with it. We are running two Kamailio servers behind a load balancer & a firewall & we found that (frequently) the tcp receiver processes go crazy & use 100% CPU (in both servers). You can also check this site - they are discussing about the same problem... http://old.nabble.com/tcp_blocking_connect-related-errors-and-Kamailio-usin… We have fixed the problem & we are running those servers for the last 2 days & have not seen that problem yet. We would like to contribute our fix to Kamailio. How this can be done? Regards -Zunnun Global Relay Communications Inc. Over Ten Years of Email Archiving & Compliance Excellence T: 866.484.6630<livecall:866.484.6630> (toll free) F: 604.608.2941<livecall:866.484.6630> W: www.globalrelay.com<http://www.globalrelay.com/> Important - Confidential Information & Disclaimer. All email sent to or from this address will be retained by Global Relay's email archiving system. This message is intended only for the use of the individual or entity to which it is addressed, and may contain information that is privileged, confidential, and exempt from disclosure under applicable law. Any other distribution, copying, or disclosure is strictly prohibited. If you have received this message in error, please notify us immediately and delete the message without copying or forwarding it to anyone. Global Relay will not be liable for any compliance and technical information or guidance provided herein. The information contained in this communication is not intended to be a legal opinion and should not be relied upon as legal advice. It is important to seek independent legal and/or compliance advice for all inquiries regarding compliance, legal or regulatory obligations in connection with Global Relay's Services.

2 1

git:master: app_lua: added helper function to return bool
by Daniel-Constantin Mierla 29 Jan '10

29 Jan '10

Module: sip-router Branch: master Commit: fa4ac6a32b746805434d51e4f8618aa9e771e5f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa4ac6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 29 18:42:10 2010 +0100 app_lua: added helper function to return bool --- modules/app_lua/app_lua_api.c | 12 ++++++++++++ modules/app_lua/app_lua_api.h | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/app_lua_api.c b/modules/app_lua/app_lua_api.c index 9ebb5a4..37724b1 100644 --- a/modules/app_lua/app_lua_api.c +++ b/modules/app_lua/app_lua_api.c @@ -233,6 +233,18 @@ int lua_sr_initialized(void) /** * */ +int app_lua_return_boolean(lua_State *L, int b) +{ + if(b==0) + lua_pushboolean(L, 0); + else + lua_pushboolean(L, 1); + return 1; +} + +/** + * + */ int app_lua_dostring(struct sip_msg *msg, char *script) { int ret; diff --git a/modules/app_lua/app_lua_api.h b/modules/app_lua/app_lua_api.h index 6375ece..ff6d0d2 100644 --- a/modules/app_lua/app_lua_api.h +++ b/modules/app_lua/app_lua_api.h @@ -53,5 +53,7 @@ int app_lua_dofile(struct sip_msg *msg, char *script); int app_lua_run(struct sip_msg *msg, char *func, char *p1, char *p2, char *p3); +int app_lua_return_boolean(lua_State *L, int b); + #endif

1 0

git:master: app_lua: exported sl get_reply_totag() to Lua
by Daniel-Constantin Mierla 29 Jan '10

29 Jan '10

Module: sip-router Branch: master Commit: f844b74911d87b7a19d80fe1648582b399f228f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f844b74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 29 18:36:59 2010 +0100 app_lua: exported sl get_reply_totag() to Lua --- modules/app_lua/app_lua_exp.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index e879500..c7aaa48 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -86,8 +86,35 @@ static int lua_sr_sl_send_reply (lua_State *L) /** * */ +static int lua_sr_sl_get_reply_totag (lua_State *L) +{ + str txt; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL)) + { + LM_WARN("weird: sl function executed but module not registered\n"); + return 0; + } + ret = _lua_slb.get_reply_totag(env_L->msg, &txt); + if(ret<0) + { + LM_WARN("sl get_reply_totag returned false\n"); + return 0; + } + lua_pushlstring(L, txt.s, txt.len); + return 1; +} + +/** + * + */ static const luaL_reg _sr_sl_Map [] = { - {"send_reply", lua_sr_sl_send_reply}, + {"send_reply", lua_sr_sl_send_reply}, + {"get_reply_totag", lua_sr_sl_get_reply_totag}, {NULL, NULL} };

1 0

git:master: xlog(k): two new functions xlogl and xdbgl
by Elena-Ramona Modroiu 29 Jan '10

29 Jan '10

Module: sip-router Branch: master Commit: 7ae36a90704a413166f3281bdf12976f4c3d5fe3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ae36a9… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Fri Jan 29 17:55:45 2010 +0100 xlog(k): two new functions xlogl and xdbgl - xlogl is similar to xlog, in adition prints the config line number at the beninning of message - xdbgl is similar to xdbg, in adition prints the config line number at the beninning of message - (c) updated to reflect current content - handy for troubleshooting as same messages might be used across config, making easier to follow the execution path --- modules_k/xlog/README | 30 +++-- modules_k/xlog/doc/xlog.xml | 6 +- modules_k/xlog/doc/xlog_admin.xml | 22 +++- modules_k/xlog/xl_lib.c | 1 - modules_k/xlog/xlog.c | 251 +++++++++++++++++++++++++------------ 5 files changed, 212 insertions(+), 98 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7ae…

1 0

merging back to master branch
by Daniel-Constantin Mierla 29 Jan '10

29 Jan '10

Hello, what is the recommended way to merge back into master branch the fixes done in 3.0 releases? The master is now behind of sr_3.0 and kamailio_3.0 with many fixes. kamailio_3.0 should be pretty much sync'ed with sr_3.0, but has some kamailio specific updates that need to be discussed before pushing to master. I think fixes in modules_k can get bulk in master, for the rest I will try to compile a summary. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

2 9

git:master: Makefile: app_python added to exclude_modules
by Daniel-Constantin Mierla 29 Jan '10

29 Jan '10

Module: sip-router Branch: master Commit: ae4b3946a58ddbdd78a8a04d743b9249ebbd4899 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae4b394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 29 15:00:12 2010 +0100 Makefile: app_python added to exclude_modules - depends on python devel libs --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 356641d..b6dc645 100644 --- a/Makefile +++ b/Makefile @@ -291,6 +291,8 @@ else exclude_modules+= geoip # depends on liblua5.1-dev exclude_modules+= app_lua + # depends on libpython-dev + exclude_modules+= app_python endif # always exclude the CVS dir

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2010