sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:master: app_lua: moved local array for reload as global variable

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f9a7a9476f3d925fbfbde706ff7690423e96e7c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9a7a94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 29 12:05:17 2013 +0100 app_lua: moved local array for reload as global variable - avoid runtime allocation/free for each execution when reload is enabled - renamed sr_reload to _app_lua_sr_reload for better namespacing conflict resolution --- modules/app_lua/app_lua_api.c | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/modules/app_lua/app_lua_api.c b/modules/app_lua/app_lua_api.c index 384b29b..0ec9123 100644 --- a/modules/app_lua/app_lua_api.c +++ b/modules/app_lua/app_lua_api.c @@ -46,13 +46,18 @@ * reload enabled param * default: 0 (off) */ -static unsigned int sr_reload = 0; +static unsigned int _app_lua_sr_reload = 0; /** * */ static sr_lua_env_t _sr_L_env; /** + * + */ +static int *_app_lua_sv = NULL; + +/** * @return the static Lua env */ sr_lua_env_t *sr_lua_env_get(void) @@ -166,7 +171,7 @@ int sr_lua_reload_module(unsigned int reload) { LM_DBG("reload:%d\n", reload); if(reload!=0) { - sr_reload = 1; + _app_lua_sr_reload = 1; LM_DBG("reload param activated!\n"); } return 0; @@ -377,7 +382,7 @@ int lua_sr_reload_script(int pos) LM_CRIT("shm for version not allocated\n"); return -1; } - if (sr_reload==0) + if (_app_lua_sr_reload==0) { LM_ERR("reload is not activated\n"); return -3; @@ -422,9 +427,7 @@ int sr_lua_reload_script(void) sr_lua_load_t *li = _sr_lua_load_list; int ret, i; char *txt; - int sv_len = sr_lua_script_ver->len; - int *sv = (int *) pkg_malloc(sizeof(int)*sv_len); if(li==NULL) { @@ -432,16 +435,25 @@ int sr_lua_reload_script(void) return 0; } + if(_app_lua_sv==NULL) { + _app_lua_sv = (int *) pkg_malloc(sizeof(int)*sv_len); + if(_app_lua_sv==NULL) + { + LM_ERR("no more pkg memory\n"); + return -1; + } + } + for(i=0;i<sv_len;i++) { lock_set_get(sr_lua_locks, i); - sv[i] = sr_lua_script_ver->version[i]; + _app_lua_sv[i] = sr_lua_script_ver->version[i]; lock_set_release(sr_lua_locks, i); - if(li->version!=sv[i]) + if(li->version!=_app_lua_sv[i]) { LM_DBG("loaded version:%d needed: %d Let's reload <%s>\n", - li->version, sv[i], li->script); + li->version, _app_lua_sv[i], li->script); ret = luaL_dofile(_sr_L_env.LL, (const char*)li->script); if(ret!=0) { @@ -450,18 +462,15 @@ int sr_lua_reload_script(void) 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(); - pkg_free(sv); return -1; } - li->version = sv[i]; + li->version = _app_lua_sv[i]; LM_DBG("<%s> set to version %d\n", li->script, li->version); } else LM_DBG("No need to reload [%s] is version %d\n", li->script, li->version); li = li->next; } - pkg_free(sv); return 1; } @@ -611,7 +620,7 @@ int app_lua_run(struct sip_msg *msg, char *func, char *p1, char *p2, LM_ERR("lua loading state not initialized (call: %s)\n", func); return -1; } - if(sr_reload!=0) + if(_app_lua_sr_reload!=0) { /* check the script version loaded */ if(!sr_lua_reload_script())

11 years, 8 months

git:master: modules/app_lua: Fix not C standard initialization

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c9082cb51b204d5001b0bb819d72669fdcdf3d98 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9082cb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 29 10:21:42 2013 +0100 modules/app_lua: Fix not C standard initialization --- modules/app_lua/app_lua_api.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/app_lua/app_lua_api.c b/modules/app_lua/app_lua_api.c index 7a11b1b..384b29b 100644 --- a/modules/app_lua/app_lua_api.c +++ b/modules/app_lua/app_lua_api.c @@ -424,14 +424,7 @@ int sr_lua_reload_script(void) char *txt; int sv_len = sr_lua_script_ver->len; - int sv[sv_len]; - - for(i=0;i<sv_len;i++) - { - lock_set_get(sr_lua_locks, i); - sv[i] = sr_lua_script_ver->version[i]; - lock_set_release(sr_lua_locks, i); - } + int *sv = (int *) pkg_malloc(sizeof(int)*sv_len); if(li==NULL) { @@ -439,8 +432,12 @@ int sr_lua_reload_script(void) return 0; } - for (i=0;i<sv_len;i++) + for(i=0;i<sv_len;i++) { + lock_set_get(sr_lua_locks, i); + sv[i] = sr_lua_script_ver->version[i]; + lock_set_release(sr_lua_locks, i); + if(li->version!=sv[i]) { LM_DBG("loaded version:%d needed: %d Let's reload <%s>\n", @@ -454,6 +451,7 @@ int sr_lua_reload_script(void) LM_ERR("error from Lua: %s\n", (txt)?txt:"unknown"); lua_pop(_sr_L_env.LL, 1); lua_sr_destroy(); + pkg_free(sv); return -1; } li->version = sv[i]; @@ -463,6 +461,7 @@ int sr_lua_reload_script(void) li->script, li->version); li = li->next; } + pkg_free(sv); return 1; }

11 years, 8 months

git:master: modules/app_lua: Added reload parameter to deactivate the reload check

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9d908f1d24df8c1644c3fbed3d99f5011106cae6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d908f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 28 10:18:10 2013 +0100 modules/app_lua: Added reload parameter to deactivate the reload check --- modules/app_lua/app_lua_api.c | 37 +++++++++++++++++++++++++++----- modules/app_lua/app_lua_api.h | 1 + modules/app_lua/app_lua_mod.c | 7 ++++++ modules/app_lua/doc/app_lua_admin.xml | 21 ++++++++++++++++++ 4 files changed, 60 insertions(+), 6 deletions(-) diff --git a/modules/app_lua/app_lua_api.c b/modules/app_lua/app_lua_api.c index f2047a6..7a11b1b 100644 --- a/modules/app_lua/app_lua_api.c +++ b/modules/app_lua/app_lua_api.c @@ -42,7 +42,11 @@ #define SRVERSION "1.0" - +/** + * reload enabled param + * default: 0 (off) + */ +static unsigned int sr_reload = 0; /** * */ @@ -158,6 +162,19 @@ int sr_lua_register_module(char *mname) /** * */ +int sr_lua_reload_module(unsigned int reload) +{ + LM_DBG("reload:%d\n", reload); + if(reload!=0) { + sr_reload = 1; + LM_DBG("reload param activated!\n"); + } + return 0; +} + +/** + * + */ void lua_sr_openlibs(lua_State *L) { lua_sr_core_openlibs(L); @@ -360,6 +377,11 @@ int lua_sr_reload_script(int pos) LM_CRIT("shm for version not allocated\n"); return -1; } + if (sr_reload==0) + { + LM_ERR("reload is not activated\n"); + return -3; + } if (pos<0) { // let's mark all the scripts to be reloaded @@ -590,13 +612,16 @@ int app_lua_run(struct sip_msg *msg, char *func, char *p1, char *p2, LM_ERR("lua loading state not initialized (call: %s)\n", func); return -1; } - /* check the script version loaded */ - if(!sr_lua_reload_script()) + if(sr_reload!=0) { - LM_ERR("lua reload failed\n"); - return -1; + /* check the script version loaded */ + if(!sr_lua_reload_script()) + { + LM_ERR("lua reload failed\n"); + return -1; + } } - + else LM_DBG("reload deactivated\n"); LM_DBG("executing Lua function: [[%s]]\n", func); LM_DBG("lua top index is: %d\n", lua_gettop(_sr_L_env.LL)); lua_getglobal(_sr_L_env.LL, func); diff --git a/modules/app_lua/app_lua_api.h b/modules/app_lua/app_lua_api.h index c347917..9ba8794 100644 --- a/modules/app_lua/app_lua_api.h +++ b/modules/app_lua/app_lua_api.h @@ -69,6 +69,7 @@ int lua_sr_list_script(sr_lua_load_t **list); int sr_lua_load_script(char *script); int sr_lua_reload_script(void); int sr_lua_register_module(char *mname); +int sr_lua_reload_module(unsigned int reload); int app_lua_dostring(struct sip_msg *msg, char *script); int app_lua_dofile(struct sip_msg *msg, char *script); diff --git a/modules/app_lua/app_lua_mod.c b/modules/app_lua/app_lua_mod.c index d8b9ec0..3d18f44 100644 --- a/modules/app_lua/app_lua_mod.c +++ b/modules/app_lua/app_lua_mod.c @@ -63,10 +63,12 @@ static int fixup_lua_run(void** param, int param_no); int app_lua_load_param(modparam_t type, void *val); int app_lua_register_param(modparam_t type, void *val); +int app_lua_reload_param(modparam_t type, void *val); static param_export_t params[]={ {"load", STR_PARAM|USE_FUNC_PARAM, (void*)app_lua_load_param}, {"register", STR_PARAM|USE_FUNC_PARAM, (void*)app_lua_register_param}, + {"reload", INT_PARAM|USE_FUNC_PARAM, (void*)app_lua_reload_param}, {0, 0, 0} }; @@ -332,6 +334,11 @@ int app_lua_register_param(modparam_t type, void *val) return sr_lua_register_module((char*)val); } +int app_lua_reload_param(modparam_t type, void *val) +{ + return sr_lua_reload_module((unsigned int)(long) (int *)val); +} + static int fixup_lua_run(void** param, int param_no) { return fixup_spve_null(param, 1); diff --git a/modules/app_lua/doc/app_lua_admin.xml b/modules/app_lua/doc/app_lua_admin.xml index b98e44f..8284e20 100644 --- a/modules/app_lua/doc/app_lua_admin.xml +++ b/modules/app_lua/doc/app_lua_admin.xml @@ -249,6 +249,27 @@ modparam("app_lua", "register", "sl") </example> </section> + <section> + <title><varname>reload</varname> (boolean)</title> + <para> + If reload is 1 enables the ability to reload the + scripts using the RPC app_lua.reload command. + </para> + <para> + <emphasis> + Default value is <quote>0 (off)</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>reload</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_lua", "reload", 1) +... +</programlisting> + </example> + </section> + </section> <section>

11 years, 8 months

git:master: modules/app_lua: add app_lua.list and app_lua. reload rpc commands

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: db397f15b9d2faacda9a8175398e1df524fd1875 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db397f1… Author: Víctor <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 27 21:30:40 2013 +0100 modules/app_lua: add app_lua.list and app_lua.reload rpc commands --- modules/app_lua/app_lua_api.c | 206 +++++++++++++++++++++++++++++++-- modules/app_lua/app_lua_api.h | 21 ++++ modules/app_lua/app_lua_mod.c | 81 +++++++++++++- modules/app_lua/doc/app_lua_admin.xml | 46 +++++++- 4 files changed, 343 insertions(+), 11 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=db3…

11 years, 8 months

[tracker] Comment added: app_lua: add rpc reload command (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#270 - app_lua: add rpc reload command User who did this - Víctor Seva (linuxmaniac) ---------- Sorry about that :( Check attached ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=270#comment809 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.

11 years, 8 months

STUN core keywords

by Peter Dunkley

Hello, I've been looking into moving the STUN code into it's own module and I can't find any code that actually uses the values set by "stun_refresh_interval" and "stun_allow_fp" keywords. Setting these parameters does set the corresponding global variables but I can't find any code that actually uses the variables. Are these parameters supposed do anything or are they just something left over from the past? I was going to convert them to modparams for the new modules, but as they don't do anything at all I'll just remove them (unless someone can tell me what they should do). Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 8 months

[tracker] Comment added: usrloc module stops updating some records in db_mode 2

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Daniel-Constantin Mierla (miconda) ---------- The situation seems to be due to client behaviour, the code looks the same in 3.1 and 3.3, so is very unlikely the upgrade is not the reason. >From the code I can tell that the matching mode is used only for in-memory contact matching. All operations to db (update/delete) are done matching username (from aor), contact address, call id and domain (only when use_domain=1). I will try to figure out a solution. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=278#comment808 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.

11 years, 8 months

git:master: usrloc: use NULL domain for updating ul attributes for use_domain=0

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 50b116cf4c9c33c4f23c1d5b66fd313a7f40c572 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50b116c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 29 11:02:31 2013 +0100 usrloc: use NULL domain for updating ul attributes for use_domain=0 - use counter var for db matching keys --- modules/usrloc/ucontact.c | 117 ++++++++++++++++++++++++++------------------ 1 files changed, 69 insertions(+), 48 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 91ecddc..c265580 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -633,6 +633,7 @@ int db_update_ucontact(ucontact_t* _c) char* dom; db_key_t keys1[4]; db_val_t vals1[4]; + int n1; db_key_t keys2[14]; db_val_t vals2[14]; @@ -643,10 +644,6 @@ int db_update_ucontact(ucontact_t* _c) return 0; } - keys1[0] = &user_col; - keys1[1] = &contact_col; - keys1[2] = &callid_col; - keys1[3] = &domain_col; keys2[0] = &expires_col; keys2[1] = &q_col; keys2[2] = &cseq_col; @@ -662,17 +659,24 @@ int db_update_ucontact(ucontact_t* _c) keys2[12] = &instance_col; keys2[13] = &reg_id_col; - vals1[0].type = DB1_STR; - vals1[0].nul = 0; - vals1[0].val.str_val = *_c->aor; - - vals1[1].type = DB1_STR; - vals1[1].nul = 0; - vals1[1].val.str_val = _c->c; - - vals1[2].type = DB1_STR; - vals1[2].nul = 0; - vals1[2].val.str_val = _c->callid; + n1 = 0; + keys1[n1] = &user_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = *_c->aor; + n1++; + + keys1[n1] = &contact_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->c; + n1++; + + keys1[n1] = &callid_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->callid; + n1++; vals2[0].type = DB1_DATETIME; vals2[0].nul = 0; @@ -761,17 +765,19 @@ int db_update_ucontact(ucontact_t* _c) nr_cols2++; if (use_domain) { - vals1[3].type = DB1_STR; - vals1[3].nul = 0; + keys1[n1] = &domain_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; dom = memchr(_c->aor->s, '@', _c->aor->len); if (dom==0) { vals1[0].val.str_val.len = 0; - vals1[3].val.str_val = *_c->aor; + vals1[n1].val.str_val = *_c->aor; } else { vals1[0].val.str_val.len = dom - _c->aor->s; - vals1[3].val.str_val.s = dom + 1; - vals1[3].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; + vals1[n1].val.str_val.s = dom + 1; + vals1[n1].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; } + n1++; } if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { @@ -779,8 +785,8 @@ int db_update_ucontact(ucontact_t* _c) return -1; } - if (ul_dbf.update(ul_dbh, keys1, 0, vals1, keys2, vals2, - (use_domain) ? (4) : (3), nr_cols2) < 0) { + if (ul_dbf.update(ul_dbh, keys1, 0, vals1, keys2, vals2, n1, + nr_cols2) < 0) { LM_ERR("updating database failed\n"); return -1; } @@ -795,10 +801,17 @@ int db_update_ucontact(ucontact_t* _c) } } /* delete old db attrs and add the current list */ - uldb_delete_attrs(_c->domain, &vals1[0].val.str_val, - &vals1[3].val.str_val, &_c->ruid); - uldb_insert_attrs(_c->domain, &vals1[0].val.str_val, &vals1[3].val.str_val, - &_c->ruid, _c->xavp); + if (use_domain) { + uldb_delete_attrs(_c->domain, &vals1[0].val.str_val, + &vals1[n1-1].val.str_val, &_c->ruid); + uldb_insert_attrs(_c->domain, &vals1[0].val.str_val, + &vals1[n1-1].val.str_val, &_c->ruid, _c->xavp); + } else { + uldb_delete_attrs(_c->domain, &vals1[0].val.str_val, + NULL, &_c->ruid); + uldb_insert_attrs(_c->domain, &vals1[0].val.str_val, + NULL, &_c->ruid, _c->xavp); + } return 0; } @@ -814,51 +827,59 @@ int db_delete_ucontact(ucontact_t* _c) char* dom; db_key_t keys[4]; db_val_t vals[4]; + int n; if (_c->flags & FL_MEM) { return 0; } - keys[0] = &user_col; - keys[1] = &contact_col; - keys[2] = &callid_col; - keys[3] = &domain_col; - vals[0].type = DB1_STR; - vals[0].nul = 0; - vals[0].val.str_val = *_c->aor; + n = 0; + keys[n] = &user_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = *_c->aor; + n++; - vals[1].type = DB1_STR; - vals[1].nul = 0; - vals[1].val.str_val = _c->c; + keys[n] = &contact_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = _c->c; + n++; - vals[2].type = DB1_STR; - vals[2].nul = 0; - vals[2].val.str_val = _c->callid; + keys[n] = &callid_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = _c->callid; + n++; if (use_domain) { - vals[3].type = DB1_STR; - vals[3].nul = 0; + keys[n] = &domain_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; dom = memchr(_c->aor->s, '@', _c->aor->len); if (dom==0) { vals[0].val.str_val.len = 0; - vals[3].val.str_val = *_c->aor; + vals[n].val.str_val = *_c->aor; } else { vals[0].val.str_val.len = dom - _c->aor->s; - vals[3].val.str_val.s = dom + 1; - vals[3].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; + vals[n].val.str_val.s = dom + 1; + vals[n].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; } + uldb_delete_attrs(_c->domain, &vals[0].val.str_val, + &vals[n].val.str_val, &_c->ruid); + n++; + } else { + uldb_delete_attrs(_c->domain, &vals[0].val.str_val, + NULL, &_c->ruid); } - uldb_delete_attrs(_c->domain, &vals[0].val.str_val, - &vals[3].val.str_val, &_c->ruid); - if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1; } - if (ul_dbf.delete(ul_dbh, keys, 0, vals, (use_domain) ? (4) : (3)) < 0) { + if (ul_dbf.delete(ul_dbh, keys, 0, vals, n) < 0) { LM_ERR("deleting from database failed\n"); return -1; }

11 years, 8 months

[tracker] Comment added: app_lua: add rpc reload command

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#270 - app_lua: add rpc reload command User who did this - Daniel-Constantin Mierla (miconda) ---------- Now is missing the check to see if sv is null or not after the pkg_malloc. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=270#comment807 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.

11 years, 8 months

[tracker] Comment added: app_lua: add rpc reload command (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#270 - app_lua: add rpc reload command User who did this - Víctor Seva (linuxmaniac) ---------- Ok, fixed using dynamic memory. ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=270#comment806 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.

11 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013