sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

[tracker] Comment added: dialog mysql DB cseq fields should be varchar(20)
by sip-router 02 Mar '12

02 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#207 - dialog mysql DB cseq fields should be varchar(20) User who did this - Timo Reimann (tr) ---------- Migration instruction for 3.2 to 3.3 (yet unreleased!) created and dialog part added: http://sip-router.org/wiki/install/3.2.x-to-3.3.x ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=207#comment500 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: dialog mysql DB cseq fields should be varchar(20)
by sip-router 02 Mar '12

02 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#207 - dialog mysql DB cseq fields should be varchar(20) User who did this - Timo Reimann (tr) ---------- Updated in all DB scripts as you suggested. Wiki documentation will be updated soon. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=207#comment499 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: utils: Increase length of fields holding CSeq values in dialog tables.
by Timo Reimann 02 Mar '12

02 Mar '12

Module: sip-router Branch: master Commit: b15fbc145eb4221150da18db04c751620a2f6f32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b15fbc1… Author: Timo Reimann <sr(a)foo-lounge.de> Committer: Timo Reimann <sr(a)foo-lounge.de> Date: Fri Mar 2 23:14:05 2012 +0100 utils: Increase length of fields holding CSeq values in dialog tables. to 20 (fixes FS #207). - Reported by Andrew Pogrebennyk. --- utils/kamctl/db_sqlite/dialog-create.sql | 4 ++-- utils/kamctl/mysql/dialog-create.sql | 4 ++-- utils/kamctl/oracle/dialog-create.sql | 4 ++-- utils/kamctl/postgres/dialog-create.sql | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/kamctl/db_sqlite/dialog-create.sql b/utils/kamctl/db_sqlite/dialog-create.sql index 780ef0f..a75494e 100644 --- a/utils/kamctl/db_sqlite/dialog-create.sql +++ b/utils/kamctl/db_sqlite/dialog-create.sql @@ -8,8 +8,8 @@ CREATE TABLE dialog ( from_tag VARCHAR(64) NOT NULL, to_uri VARCHAR(128) NOT NULL, to_tag VARCHAR(64) NOT NULL, - caller_cseq VARCHAR(7) NOT NULL, - callee_cseq VARCHAR(7) NOT NULL, + caller_cseq VARCHAR(20) NOT NULL, + callee_cseq VARCHAR(20) NOT NULL, caller_route_set VARCHAR(512), callee_route_set VARCHAR(512), caller_contact VARCHAR(128) NOT NULL, diff --git a/utils/kamctl/mysql/dialog-create.sql b/utils/kamctl/mysql/dialog-create.sql index 0fbbdb6..c2efd36 100644 --- a/utils/kamctl/mysql/dialog-create.sql +++ b/utils/kamctl/mysql/dialog-create.sql @@ -8,8 +8,8 @@ CREATE TABLE dialog ( from_tag VARCHAR(64) NOT NULL, to_uri VARCHAR(128) NOT NULL, to_tag VARCHAR(64) NOT NULL, - caller_cseq VARCHAR(7) NOT NULL, - callee_cseq VARCHAR(7) NOT NULL, + caller_cseq VARCHAR(20) NOT NULL, + callee_cseq VARCHAR(20) NOT NULL, caller_route_set VARCHAR(512), callee_route_set VARCHAR(512), caller_contact VARCHAR(128) NOT NULL, diff --git a/utils/kamctl/oracle/dialog-create.sql b/utils/kamctl/oracle/dialog-create.sql index ebedcf8..46795ac 100644 --- a/utils/kamctl/oracle/dialog-create.sql +++ b/utils/kamctl/oracle/dialog-create.sql @@ -8,8 +8,8 @@ CREATE TABLE dialog ( from_tag VARCHAR2(64), to_uri VARCHAR2(128), to_tag VARCHAR2(64), - caller_cseq VARCHAR2(7), - callee_cseq VARCHAR2(7), + caller_cseq VARCHAR2(20), + callee_cseq VARCHAR2(20), caller_route_set VARCHAR2(512), callee_route_set VARCHAR2(512), caller_contact VARCHAR2(128), diff --git a/utils/kamctl/postgres/dialog-create.sql b/utils/kamctl/postgres/dialog-create.sql index 9e44305..ff91313 100644 --- a/utils/kamctl/postgres/dialog-create.sql +++ b/utils/kamctl/postgres/dialog-create.sql @@ -8,8 +8,8 @@ CREATE TABLE dialog ( from_tag VARCHAR(64) NOT NULL, to_uri VARCHAR(128) NOT NULL, to_tag VARCHAR(64) NOT NULL, - caller_cseq VARCHAR(7) NOT NULL, - callee_cseq VARCHAR(7) NOT NULL, + caller_cseq VARCHAR(20) NOT NULL, + callee_cseq VARCHAR(20) NOT NULL, caller_route_set VARCHAR(512), callee_route_set VARCHAR(512), caller_contact VARCHAR(128) NOT NULL,

1 0

git:master: modules/app_lua: Added tmx.t_suspend() and mq.add() to app_lua
by Peter Dunkley 02 Mar '12

02 Mar '12

Module: sip-router Branch: master Commit: 681c06103eff1b03d2b2648d64f302cfc4587490 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=681c061… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 1 17:59:51 2012 +0000 modules/app_lua: Added tmx.t_suspend() and mq.add() to app_lua --- modules/app_lua/app_lua_exp.c | 113 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 74d4f66..587d8c0 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -53,6 +53,8 @@ #include "../../modules_k/uac/api.h" #include "../../modules/sanity/api.h" #include "../../modules_k/cfgutils/api.h" +#include "../../modules_k/tmx/api.h" +#include "../../modules/mqueue/api.h" #include "app_lua_api.h" @@ -78,6 +80,8 @@ #define SR_LUA_EXP_MOD_UAC (1<<19) #define SR_LUA_EXP_MOD_SANITY (1<<20) #define SR_LUA_EXP_MOD_CFGUTILS (1<<21) +#define SR_LUA_EXP_MOD_TMX (1<<22) +#define SR_LUA_EXP_MOD_MQUEUE (1<<23) /** * @@ -195,6 +199,15 @@ static sanity_api_t _lua_sanityb; */ static cfgutils_api_t _lua_cfgutilsb; +/** + * tmx + */ +static tmx_api_t _lua_tmxb; + +/** + * mqueue + */ +static mq_api_t _lua_mqb; /** * @@ -2321,6 +2334,76 @@ static const luaL_reg _sr_cfgutils_Map [] = { {NULL, NULL} }; +/** + * + */ +static int lua_sr_tmx_t_suspend(lua_State *L) +{ + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TMX)) + { + LM_WARN("weird: tmx function executed but module not registered\n"); + return app_lua_return_error(L); + } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + + ret = _lua_tmxb.t_suspend(env_L->msg, NULL, NULL); + return app_lua_return_int(L, ret); +} + +/** + * + */ +static const luaL_reg _sr_tmx_Map [] = { + {"t_suspend", lua_sr_tmx_t_suspend}, + {NULL, NULL} +}; + +/** + * + */ +static int lua_sr_mq_add(lua_State *L) +{ + int ret; + str param[3]; + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_MQUEUE)) + { + LM_WARN("weird: mqueue function executed but module not registered\n"); + return app_lua_return_error(L); + } + if(lua_gettop(L)!=3) + { + LM_WARN("invalid number of parameters from Lua\n"); + return app_lua_return_error(L); + } + + param[0].s = (char *) lua_tostring(L, -3); + param[0].len = strlen(param[0].s); + param[1].s = (char *) lua_tostring(L, -2); + param[1].len = strlen(param[1].s); + param[2].s = (char *) lua_tostring(L, -1); + param[2].len = strlen(param[2].s); + + ret = _lua_mqb.add(&param[0], &param[1], &param[2]); + return app_lua_return_int(L, ret); +} + +/** + * + */ +static const luaL_reg _sr_mqueue_Map [] = { + {"add", lua_sr_mq_add}, + {NULL, NULL} +}; /** * @@ -2553,6 +2636,26 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded cfgutils api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TMX) + { + /* bind the TMX API */ + if (load_tmx_api(&_lua_tmxb) < 0) + { + LM_ERR("cannot bind to TMX API\n"); + return -1; + } + LM_DBG("loaded tmx api\n"); + } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_MQUEUE) + { + /* bind the MQUEUE API */ + if (load_mq_api(&_lua_mqb) < 0) + { + LM_ERR("cannot bind to MQUEUE API\n"); + return -1; + } + LM_DBG("loaded mqueue api\n"); + } return 0; } @@ -2632,6 +2735,12 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==8 && strcmp(mname, "cfgutils")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_CFGUTILS; return 0; + } else if(len==3 && strcmp(mname, "tmx")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_TMX; + return 0; + } else if(len==6 && strcmp(mname, "mqueue")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_MQUEUE; + return 0; } return -1; @@ -2686,5 +2795,9 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.sanity", _sr_sanity_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_CFGUTILS) luaL_openlib(L, "sr.cfgutils", _sr_cfgutils_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TMX) + luaL_openlib(L, "sr.tmx", _sr_tmx_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_MQUEUE) + luaL_openlib(L, "sr.mq", _sr_mqueue_Map, 0); }

2 2

git:master: modules_k/tmx: Added C API to enable other modules to bind to tmx
by Peter Dunkley 01 Mar '12

01 Mar '12

Module: sip-router Branch: master Commit: 242bbdd184426c7cde9f77ab74a5b8c03690687a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=242bbdd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 1 17:56:03 2012 +0000 modules_k/tmx: Added C API to enable other modules to bind to tmx - Exported t_suspend() for use in app_lua --- modules_k/tmx/api.h | 28 ++++++++++++++++++++++++++++ modules_k/tmx/tmx_mod.c | 14 ++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/api.h b/modules_k/tmx/api.h new file mode 100644 index 0000000..83c38f6 --- /dev/null +++ b/modules_k/tmx/api.h @@ -0,0 +1,28 @@ +#ifndef _TMX_API_H_ +#define _TMX_API_H_ + +typedef int (*tmx_t_suspend_f)(struct sip_msg*, char*, char*); +typedef struct tmx_api { + tmx_t_suspend_f t_suspend; +} tmx_api_t; + +typedef int (*bind_tmx_f)(tmx_api_t* api); + +static inline int load_tmx_api(tmx_api_t *api) +{ + bind_tmx_f bindtmx; + + bindtmx = (bind_tmx_f)find_export("bind_tmx", 1, 0); + if(bindtmx == 0) { + LM_ERR("cannot find bind_tmx\n"); + return -1; + } + if(bindtmx(api)<0) + { + LM_ERR("cannot bind tmx api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index ba19538..22d86b3 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -33,6 +33,7 @@ #include "t_var.h" #include "t_mi.h" +#include "api.h" MODULE_VERSION @@ -63,6 +64,8 @@ static int w_t_suspend(struct sip_msg* msg, char*, char*); static int w_t_continue(struct sip_msg* msg, char *idx, char *lbl, char *rtn); static int fixup_t_continue(void** param, int param_no); +static int bind_tmx(tmx_api_t* api); + /* statistic variables */ stat_var *tm_rcv_rpls; stat_var *tm_rld_rpls; @@ -158,6 +161,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"t_continue", (cmd_function)w_t_continue, 3, fixup_t_continue, 0, ANY_ROUTE }, + {"bind_tmx", (cmd_function)bind_tmx, 1, + 0, 0, ANY_ROUTE }, {0,0,0,0,0,0} }; @@ -559,6 +564,15 @@ static int fixup_t_continue(void** param, int param_no) return 0; } +static int bind_tmx(tmx_api_t* api) +{ + if (!api) + return -1; + + api->t_suspend = w_t_suspend; + return 0; +} + #ifdef STATISTICS /*** tm stats ***/

1 0

git:master: modules/mqueue: Added C API to enable other modules to bind to mqueue
by Peter Dunkley 01 Mar '12

01 Mar '12

Module: sip-router Branch: master Commit: 513a71df7b6fa8b5ae3ec124f02e02c3855c5803 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=513a71d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 1 17:53:16 2012 +0000 modules/mqueue: Added C API to enable other modules to bind to mqueue - Exported mq_add using this API so it can be added to app_lua --- modules/mqueue/api.h | 28 ++++++++++++++++++++++++++++ modules/mqueue/mqueue_mod.c | 12 +++++++++++- 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/modules/mqueue/api.h b/modules/mqueue/api.h new file mode 100644 index 0000000..3c67f2f --- /dev/null +++ b/modules/mqueue/api.h @@ -0,0 +1,28 @@ +#ifndef _MQUEUE_EXT_API_H_ +#define _MQUEUE_EXT_API_H_ + +typedef int (*mq_add_f)(str*, str*, str*); +typedef struct mq_api { + mq_add_f add; +} mq_api_t; + +typedef int (*bind_mq_f)(mq_api_t* api); + +static inline int load_mq_api(mq_api_t *api) +{ + bind_mq_f bindmq; + + bindmq = (bind_mq_f)find_export("bind_mq", 1, 0); + if(bindmq == 0) { + LM_ERR("cannot find bind_mq\n"); + return -1; + } + if(bindmq(api)<0) + { + LM_ERR("cannot bind mq api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/modules/mqueue/mqueue_mod.c b/modules/mqueue/mqueue_mod.c index 5a74f58..a99a361 100644 --- a/modules/mqueue/mqueue_mod.c +++ b/modules/mqueue/mqueue_mod.c @@ -36,6 +36,7 @@ #include "../../shm_init.h" #include "mqueue_api.h" +#include "api.h" MODULE_VERSION @@ -47,6 +48,7 @@ static int w_mq_add(struct sip_msg* msg, char* mq, char* key, char* val); static int w_mq_pv_free(struct sip_msg* msg, char* mq, char* str2); int mq_param(modparam_t type, void *val); static int fixup_mq_add(void** param, int param_no); +static int bind_mq(mq_api_t* api); static pv_export_t mod_pvs[] = { { {"mqk", sizeof("mqk")-1}, PVT_OTHER, pv_get_mqk, 0, @@ -64,6 +66,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"mq_pv_free", (cmd_function)w_mq_pv_free, 1, fixup_str_null, 0, ANY_ROUTE}, + {"bind_mq", (cmd_function)bind_mq, 1, 0, + 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -208,4 +212,10 @@ static int fixup_mq_add(void** param, int param_no) return fixup_str_null(param, 1); } - +static int bind_mq(mq_api_t* api) +{ + if (!api) + return -1; + api->add = mq_item_add; + return 0; +}

1 0

Use of timezone in the databases
by Hugh Waite 01 Mar '12

01 Mar '12

Hello, We are using postgres as our database and where there are DATETIME columns they have a type of "TIMESTAMP WITHOUT TIME ZONE", and when a time is put into an SQL query (lib/srdb1/db_ut.c:231) we use localtime() (not gmtime()). For many applications this will be OK as we are always comparing localtime, but it does change the unix epoch. If I want to store 0 seconds, here in the UK it comes out as "1970-01-01 01:00:00" 1 hour ahead of UTC. This has an effect on the location table which uses an expires timestamp of "0" to mean permanent. Could this have an effect on other modules comparing time from the database, or situations where geographically distributed systems (in different timezones) are accessing the same central database? Hugh -- Hugh Waite Senior Design Engineer Crocodile RCS Ltd.

2 1

[tracker] Assignee added: dialog mysql DB cseq fields should be varchar(20)
by sip-router 01 Mar '12

01 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#207 - dialog mysql DB cseq fields should be varchar(20) User who did this - Andrew Pogrebennyk (marduk) http://sip-router.org/tracker/index.php?do=details&task_id=207 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: dialog mysql DB cseq fields should be varchar(20)
by sip-router 01 Mar '12

01 Mar '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Andrew Pogrebennyk (marduk) Attached to Project - sip-router Summary - dialog mysql DB cseq fields should be varchar(20) Task Type - Bug Report Category - dialog Status - Assigned Assigned To - Timo Reimann Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - According to rfc CSeq is 32-bit unsigned integer, so varchar(7) is way too low. I suggest to change it to varchar(20) and in other DB engines accordingly. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=207 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

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 March 2012