sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:tmp/k3.0_sr_backports: registrar(k): preserve old bflags upon lookup

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c3299d26c0f035b9fd4755a6854b9fe97fb4454e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3299d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jan 18 15:43:32 2010 +0100 registrar(k): preserve old bflags upon lookup - lookup was resetting bflags value with what was retrieved from location table - preserve now bflags set in config before - reported by Ricardo Martinez (cherry picked from commit e6eceeb8ccce8b37d09f5f69cafb97e007467d78) --- modules_k/registrar/lookup.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 2db8ee7..67accc7 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -65,6 +65,8 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) int res; int ret; str path_dst; + flag_t old_bflags; + if (_m->new_uri.s) uri = _m->new_uri; else uri = _m->first_line.u.request.uri; @@ -131,7 +133,9 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) set_ruri_q(ptr->q); - setbflagsval( 0, ptr->cflags); + old_bflags = 0; + getbflagsval(0, &old_bflags); + setbflagsval(0, old_bflags|ptr->cflags); if (ptr->sock) set_force_socket(_m, ptr->sock);

15 years

git:tmp/k3.0_sr_backports: pv: fixed author name

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c768636452d7aec7dca47fb6442fe718a51f9e30 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c768636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jan 18 12:35:46 2010 +0100 pv: fixed author name - forgotten when creating readme files starting from another module docbook files (cherry picked from commit 45f76f44abca5d049c3d289a1f9d09c6821c92d9) --- modules_k/pv/README | 2 +- modules_k/pv/doc/pv.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/README b/modules_k/pv/README index 6b9b892..3740c2f 100644 --- a/modules_k/pv/README +++ b/modules_k/pv/README @@ -1,6 +1,6 @@ Pseudo-Variables Module -Daniel-Constantin Modroiu +Daniel-Constantin Mierla asipto.com <daniel(a)asipto.com> diff --git a/modules_k/pv/doc/pv.xml b/modules_k/pv/doc/pv.xml index 33590ab..c082b99 100644 --- a/modules_k/pv/doc/pv.xml +++ b/modules_k/pv/doc/pv.xml @@ -15,7 +15,7 @@ <authorgroup> <author> <firstname>Daniel-Constantin</firstname> - <surname>Modroiu</surname> + <surname>Mierla</surname> <affiliation><orgname>asipto.com</orgname></affiliation> <email>daniel(a)asipto.com</email> <address>

15 years

git:tmp/k3.0_sr_backports: tm: set request and reply for TMCB_RESPONSE_SENT

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c9860c307016ffbff971ab9eb483c04f8de03dd9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9860c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jan 18 11:59:19 2010 +0100 tm: set request and reply for TMCB_RESPONSE_SENT - for some reason they were NULL - affected was sip_trace - credits to Nguyen Quang Tri fore report and troubleshooting (cherry picked from commit 03ab185bca42e5788eeef5f5c13e02e547c524a1) --- modules/tm/t_reply.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 5b09f33..02b03e5 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -602,7 +602,8 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, trans->uas.request, FAKED_REPLY, code); #ifdef TMCB_ONSEND if (unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_SENT))){ - INIT_TMCB_ONSEND_PARAMS(onsend_params, 0, 0, rb, &rb->dst, + INIT_TMCB_ONSEND_PARAMS(onsend_params, trans->uas.request, + FAKED_REPLY, rb, &rb->dst, buf, len, TMCB_LOCAL_F, rb->branch, code); run_onsend_callbacks2(TMCB_RESPONSE_SENT, trans, &onsend_params);

15 years

git:tmp/k3.0_sr_backports: sanity: moved module from modules_s to modules

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: d7443727239f5ea2fc8007625808260caa6d1f6b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d744372… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 28 23:07:45 2009 +0100 sanity: moved module from modules_s to modules - modules_k/sanity removed (it was an adapted version for k 1.5) (cherry picked from commit 011cc3ffacfbc6faf65a879d3558cd789f101237) --- {modules_s => modules}/sanity/Makefile | 0 {modules_s => modules}/sanity/README | 0 {modules_s => modules}/sanity/doc/Makefile | 0 {modules_s => modules}/sanity/doc/functions.xml | 0 {modules_s => modules}/sanity/doc/params.xml | 0 {modules_s => modules}/sanity/doc/sanity.xml | 0 {modules_s => modules}/sanity/mod_sanity.c | 0 {modules_s => modules}/sanity/mod_sanity.h | 0 {modules_s => modules}/sanity/sanity.c | 0 {modules_s => modules}/sanity/sanity.h | 0 modules_k/sanity/Makefile | 16 - modules_k/sanity/README | 196 ------ modules_k/sanity/doc/Makefile | 4 - modules_k/sanity/doc/sanity.xml | 41 -- modules_k/sanity/doc/sanity_admin.xml | 271 -------- modules_k/sanity/mod_sanity.c | 221 ------- modules_k/sanity/mod_sanity.h | 85 --- modules_k/sanity/sanity.c | 749 ----------------------- modules_k/sanity/sanity.h | 79 --- 19 files changed, 0 insertions(+), 1662 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d74…

15 years

git:tmp/k3.0_sr_backports: sanity: fix include file due to previous re-location

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 1c65a90d9a1c9edd9cdf0cd9027361ca20769094 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c65a90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 28 23:38:07 2009 +0100 sanity: fix include file due to previous re-location (cherry picked from commit f771b05fe8f24bebe18962c4169176e47e099ef8) --- modules/sanity/mod_sanity.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sanity/mod_sanity.h b/modules/sanity/mod_sanity.h index 51a80d4..0b76b75 100644 --- a/modules/sanity/mod_sanity.h +++ b/modules/sanity/mod_sanity.h @@ -32,7 +32,7 @@ #define MOD_SANITY_CHK_H #include "../../str.h" -#include "../sl/sl.h" +#include "../../modules_s/sl/sl.h" #include "../../parser/msg_parser.h" #define SANITY_RURI_SIP_VERSION (1<<0)

15 years

xlog enhancements

by Elena-Ramona Modroiu

Hi, I added two new functions to xlog (modules_k): - xlogl(level, message) - xdbgl(message) They are similar to the existing functions, in addition they print the config line at the beginning of the message. The printed value is: "cfglineno:message" In this way you can spot easily in the logs where the function was used to print a particular message. http://sip-router.org/docbook/sip-router/branch/master/modules_k/xlog/xlog.… Regards, Ramona

15 years

git:kamailio_3.0: tm: fix setting the pre-T callbacks

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 32d3e9c98943ad298f09d26db83ecf4ce5c2cc0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32d3e9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 1 11:27:20 2010 +0100 tm: fix setting the pre-T callbacks - introduced in the fix for uac module (affecting only uac) - credits to Andrei Pelinescu-Onciul --- modules/tm/t_hooks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index e632757..8dc77b1 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -81,7 +81,7 @@ struct tmcb_head_list* get_early_tmcb_list(struct sip_msg *msg) void set_early_tmcb_list(struct sip_msg *msg, struct cell *t) { - if (msg->id!=tmcb_early_hl.msgid) { + if (msg->id==tmcb_early_hl.msgid) { t->tmcb_hl = tmcb_early_hl.cb_list; memset(&tmcb_early_hl.cb_list, 0, sizeof(struct tmcb_head_list)); tmcb_early_hl.msgid = 0;

15 years

Fwd: DTLS with kamailio

by mustafa samara

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

15 years

git:master: app_lua: do basic Lua probing before fork

by Daniel-Constantin Mierla

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},

15 years

git:master: core: use dlflags to load modules

by Daniel-Constantin Mierla

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());

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev