sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
539 discussions

changing behavior in db_text
by Luis Azedo 06 Jan '17

06 Jan '17

Hi All, db_text modules manages the tables data in shm_mem db_text module uses pkg_mem to store query results which leads to some problems. when we have large text files with a lot of rows (location, active_watchers, presentity), the startup procedure fetches all the records, which makes db_text copy all records from shm_mem to pkg_mem, leading to memory failures. i now have a patch that changes this behaviour. it creates temp tables in shm_mem with the results if implements fetch_result so that startup procedures that fetch all rows can safely run without memory issues. if anyone has anything against, please reply. i would like to get this merged before 5.0 Thanks

2 1

git:master:46793e55: p_usrloc: removed mi init function prototypes
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 46793e55a54088a69e3d6b96a4bcf86868edc6fc URL: https://github.com/kamailio/kamailio/commit/46793e55a54088a69e3d6b96a4bcf86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T11:12:49+01:00 p_usrloc: removed mi init function prototypes --- Modified: src/modules/p_usrloc/p_usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/46793e55a54088a69e3d6b96a4bcf86… Patch: https://github.com/kamailio/kamailio/commit/46793e55a54088a69e3d6b96a4bcf86… --- diff --git a/src/modules/p_usrloc/p_usrloc_mod.c b/src/modules/p_usrloc/p_usrloc_mod.c index ec73b5f..6ee7ce0 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.c +++ b/src/modules/p_usrloc/p_usrloc_mod.c @@ -83,8 +83,6 @@ MODULE_VERSION static int mod_init(void); /*!< Module initialization function */ static void destroy(void); /*!< Module destroy function */ static int child_init(int rank); /*!< Per-child init function */ -static int mi_child_init(void); -static int mi_child_loc_nr_init(void); extern int bind_usrloc(usrloc_api_t* api); extern int ul_locks_no; int ul_db_update_as_insert = 0;

1 0

git:master:377d4bdc: imc: removed unused variable in rpc command
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 377d4bdc9098c90b7ea917ed923a52c8b7547fa3 URL: https://github.com/kamailio/kamailio/commit/377d4bdc9098c90b7ea917ed923a52c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T11:11:12+01:00 imc: removed unused variable in rpc command --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/377d4bdc9098c90b7ea917ed923a52c… Patch: https://github.com/kamailio/kamailio/commit/377d4bdc9098c90b7ea917ed923a52c… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 218a6b1..ee3830c 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -746,7 +746,6 @@ static void imc_rpc_list_rooms(rpc_t* rpc, void* ctx) static void imc_rpc_list_members(rpc_t* rpc, void* ctx) { - int i; imc_room_p room = NULL; void *vh; void *ih;

1 0

git:master:fce9ee48: app_jsdt: fixed comiple warning
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: fce9ee48d2aa18dce141fd51fc5b7fa12112b787 URL: https://github.com/kamailio/kamailio/commit/fce9ee48d2aa18dce141fd51fc5b7fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T11:08:36+01:00 app_jsdt: fixed comiple warning --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/fce9ee48d2aa18dce141fd51fc5b7fa… Patch: https://github.com/kamailio/kamailio/commit/fce9ee48d2aa18dce141fd51fc5b7fa… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 5f0725e..ce4d36e 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -385,7 +385,7 @@ static int jsdt_sr_pv_is_null (duk_context *J) const duk_function_list_entry _sr_kemi_pv_J_Map[] = { { "get", jsdt_sr_pv_get, 1 /* 1 args */ }, { "seti", jsdt_sr_pv_seti, 2 /* 2 args */ }, - { "sets", jsdt_sr_pv_seti, 2 /* 2 args */ }, + { "sets", jsdt_sr_pv_sets, 2 /* 2 args */ }, { "unset", jsdt_sr_pv_unset, 1 /* 1 args */ }, { "is_null", jsdt_sr_pv_is_null, 1 /* 1 args */ }, { NULL, NULL, 0 } @@ -432,9 +432,6 @@ int jsdt_sr_init_mod(void) */ int jsdt_sr_init_child(void) { - int ret; - char *txt; - memset(&_sr_J_env, 0, sizeof(sr_jsdt_env_t)); _sr_J_env.J = duk_create_heap_default(); if(_sr_J_env.J==NULL) { @@ -584,7 +581,6 @@ int app_jsdt_run(sip_msg_t *msg, char *func, char *p1, char *p2, int app_jsdt_runstring(sip_msg_t *msg, char *script) { int ret; - char *txt; sip_msg_t *bmsg; if(_sr_J_env.JJ==NULL) {

1 0

git:master:c357560e: ctl: removed unused goto label
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: c357560e28fb93a1914aea272118b46b71ec64e6 URL: https://github.com/kamailio/kamailio/commit/c357560e28fb93a1914aea272118b46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T11:04:07+01:00 ctl: removed unused goto label --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/c357560e28fb93a1914aea272118b46… Patch: https://github.com/kamailio/kamailio/commit/c357560e28fb93a1914aea272118b46… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index e90e1bb..4adad72 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -1114,7 +1114,6 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) goto error; } } -end: va_end(ap); return 0; error_mem:

1 0

git:master:98320174: modules: readme files regenerated - dispatcher ...
by Kamailio Dev 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 9832017421ae7cc57b7fae4ca41eec3fee3e61f8 URL: https://github.com/kamailio/kamailio/commit/9832017421ae7cc57b7fae4ca41eec3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-06T09:01:15+01:00 modules: readme files regenerated - dispatcher ... --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/9832017421ae7cc57b7fae4ca41eec3… Patch: https://github.com/kamailio/kamailio/commit/9832017421ae7cc57b7fae4ca41eec3… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 853590b..08fdc37 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -144,7 +144,7 @@ Luis Martin 1.14. Set the “dstid_avp” parameter 1.15. Set the “attrs_avp” parameter 1.16. Set the “sock_avp” parameter - 1.17. Use $avp(i:273) for hashing: + 1.17. Use $avp(hash) for hashing: 1.18. Use combination of PVs for hashing: 1.19. Set the “setid_pvname” parameter 1.20. Set the “attrs_pvname” parameter @@ -564,9 +564,9 @@ Note Default value is “null” - disabled. - Example 1.17. Use $avp(i:273) for hashing: + Example 1.17. Use $avp(hash) for hashing: ... - modparam("dispatcher", "hash_pvar", "$avp(i:273)") + modparam("dispatcher", "hash_pvar", "$avp(hash)") ... Example 1.18. Use combination of PVs for hashing: @@ -676,8 +676,7 @@ Note whery you may define either a single code (e.g. "code=202" would accept 202 as an additional, valid response) or a class of responses, you want to accept (e.g. "class=2" would accept everything from 200 to 299 as - valid response). This parameter can be modified via ser config - framework. + valid response). This parameter can be modified via config framework. Please note that the response codes the module accepts as valid reply to the PING-Method are not only the ones generated from the remote @@ -1365,7 +1364,7 @@ sip_warning=no mpath="/usr/local/lib/kamailio/modules/" loadmodule "db_mysql.so" -loadmodule "mi_fifo.so" +loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "tm.so" loadmodule "tmx.so" @@ -1378,7 +1377,6 @@ loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" -loadmodule "mi_rpc.so" loadmodule "acc.so" loadmodule "dispatcher.so" @@ -1386,6 +1384,10 @@ loadmodule "dispatcher.so" # ----------------- setting module-specific parameters --------------- +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) + + # ----- rr params ----- # add value to ;lr param to cope with most of the UAs modparam("rr", "enable_full_lr", 1)

1 0

git:master:5a5959b1: dispatcher: removed mi modules from docs example
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 5a5959b12ada22aed7cfc6a4a05ea32815149859 URL: https://github.com/kamailio/kamailio/commit/5a5959b12ada22aed7cfc6a4a05ea32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T08:50:49+01:00 dispatcher: removed mi modules from docs example --- Modified: src/modules/dispatcher/doc/dispatcher.cfg Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a5959b12ada22aed7cfc6a4a05ea32… Patch: https://github.com/kamailio/kamailio/commit/5a5959b12ada22aed7cfc6a4a05ea32…

1 0

git:master:a05f5824: carrierroute: proper str pointer when adding fields to rpc structure
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: a05f582420f119ba2a4e64353e16aaf9056f0bb4 URL: https://github.com/kamailio/kamailio/commit/a05f582420f119ba2a4e64353e16aaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T08:42:16+01:00 carrierroute: proper str pointer when adding fields to rpc structure --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/a05f582420f119ba2a4e64353e16aaf… Patch: https://github.com/kamailio/kamailio/commit/a05f582420f119ba2a4e64353e16aaf… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index 6e0a7a2..8789c9b 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -1185,11 +1185,13 @@ void cr_rpc_dump_routes(rpc_t* rpc, void* ctx) goto error; } tmp_str = (rd->carriers[i] ? rd->carriers[i]->name : &empty_str); - if(rpc->struct_add(dh, "Sd[", "carrier", &tmp_str, + if(rpc->struct_add(dh, "Sd[", "carrier", tmp_str, "id", (rd->carriers[i] ? rd->carriers[i]->id : 0), "domains", &eh)<0) { - LM_ERR("add carrier structure failure at count %d\n", i); + LM_ERR("add carrier structure failure at count %d" + " (carrier: %d/%.*s)\n", + i, tmp_str->len, tmp_str->len, tmp_str->s); rpc->fault(ctx, 500, "Internal error - carrier structure"); goto error; } @@ -1202,7 +1204,7 @@ void cr_rpc_dump_routes(rpc_t* rpc, void* ctx) goto error; } tmp_str = (rd->carriers[i]->domains[j] ? rd->carriers[i]->domains[j]->name : &empty_str); - if(rpc->struct_add(fh, "Sd[", "domain", &tmp_str, + if(rpc->struct_add(fh, "Sd[", "domain", tmp_str, "id", rd->carriers[i]->domains[j]->id, "data", &gh)<0) {

1 0

git:master:82acaac1: ctl: handle null string value in rpc response
by Daniel-Constantin Mierla 06 Jan '17

06 Jan '17

Module: kamailio Branch: master Commit: 82acaac1baceac4b2c81ecd70591021497a725b7 URL: https://github.com/kamailio/kamailio/commit/82acaac1baceac4b2c81ecd70591021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-06T08:42:16+01:00 ctl: handle null string value in rpc response --- Modified: src/modules/ctl/binrpc.h Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/82acaac1baceac4b2c81ecd70591021… Patch: https://github.com/kamailio/kamailio/commit/82acaac1baceac4b2c81ecd70591021… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index cee48e2..2e33a39 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -359,7 +359,7 @@ inline static int binrpc_add_int_type(struct binrpc_pkt* pkt, int i, int type) */ inline static int binrpc_add_skip(struct binrpc_pkt* pkt, int bytes) { - + if ((pkt->crt+bytes)>=pkt->end) return E_BINRPC_OVERFLOW; pkt->crt+=bytes; @@ -373,7 +373,7 @@ inline static int binrpc_add_skip(struct binrpc_pkt* pkt, int bytes) * manually later (and also use binrpc_add_skip(pkt, l) or increase * pkt->crt directly if you want to continue adding to this pkt). * Usefull for optimizing str writing (e.g. writev(iovec)) - * WARNING: use with care, low level function, binrpc_addstr or + * WARNING: use with care, low level function, binrpc_addstr or * binrpc_add_str_type are probably what you want. * WARNING1: BINRPC_T_STR and BINRPC_T_AVP must be 0 term, the len passed to * this function, must include the \0 in this case. @@ -383,7 +383,7 @@ inline static int binrpc_add_str_mark(struct binrpc_pkt* pkt, int type, { int size; unsigned char* p; - + if (pkt->crt>=pkt->end) goto error_len; if (l<8){ size=l; @@ -410,7 +410,7 @@ inline static int binrpc_add_str_type(struct binrpc_pkt* pkt, char* s, int len, int l; int zero_term; /* whether or not to add an extra 0 at the end */ unsigned char* p; - + zero_term=((type==BINRPC_T_STR)||(type==BINRPC_T_AVP)); l=len+zero_term; if (l<8){ @@ -439,7 +439,7 @@ inline static int binrpc_addavp(struct binrpc_pkt* pkt, struct binrpc_val* avp) { int ret; unsigned char* bak; - + bak=pkt->crt; ret=binrpc_add_str_type(pkt, avp->name.s, avp->name.len, BINRPC_T_AVP); if (ret<0) return ret; @@ -449,7 +449,7 @@ inline static int binrpc_addavp(struct binrpc_pkt* pkt, struct binrpc_val* avp) break; case BINRPC_T_STR: case BINRPC_T_BYTES: - ret=binrpc_add_str_type(pkt, avp->u.strval.s, + ret=binrpc_add_str_type(pkt, avp->u.strval.s, avp->u.strval.len, avp->type); break; @@ -457,7 +457,7 @@ inline static int binrpc_addavp(struct binrpc_pkt* pkt, struct binrpc_val* avp) case BINRPC_T_ARRAY: ret=binrpc_add_tag(pkt, avp->type, 0); break; - case BINRPC_T_DOUBLE: + case BINRPC_T_DOUBLE: ret=binrpc_add_double_type(pkt, avp->u.fval, avp->type); break; default: diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 76893eb..e90e1bb 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -1070,8 +1070,9 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) case 's': /* asciiz */ avp.type=BINRPC_T_STR; avp.u.strval.s=va_arg(ap, char*); - if (avp.u.strval.s) - avp.u.strval.len=strlen(avp.u.strval.s); + if (avp.u.strval.s==0) /* fix null strings */ + avp.u.strval.s="<null string>"; + avp.u.strval.len=strlen(avp.u.strval.s); break; case 'S': /* str */ avp.type=BINRPC_T_STR; @@ -1098,13 +1099,13 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) } clist_append(&s->substructs, rs, next, prev); *(va_arg(ap, void**))=rs; - goto end; + break; case 'f': avp.type=BINRPC_T_DOUBLE; avp.u.fval=va_arg(ap, double); break; default: - LM_ERR("formatting char \'%c\'" " not supported\n", *fmt); + LM_ERR("formatting char \'%c\' not supported\n", *fmt); goto error; } err=binrpc_addavp(&s->pkt, &avp);

1 0

git:master:3b921504: modules: readme files regenerated - malloc_test ...
by Kamailio Dev 05 Jan '17

05 Jan '17

Module: kamailio Branch: master Commit: 3b92150495c3a97008eba1dd3587e85f02ba1ef6 URL: https://github.com/kamailio/kamailio/commit/3b92150495c3a97008eba1dd3587e85… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-05T22:01:16+01:00 modules: readme files regenerated - malloc_test ... --- Modified: src/modules/malloc_test/README Modified: src/modules/outbound/README --- Diff: https://github.com/kamailio/kamailio/commit/3b92150495c3a97008eba1dd3587e85… Patch: https://github.com/kamailio/kamailio/commit/3b92150495c3a97008eba1dd3587e85… --- diff --git a/src/modules/malloc_test/README b/src/modules/malloc_test/README index 305bcae..c49b9af 100644 --- a/src/modules/malloc_test/README +++ b/src/modules/malloc_test/README @@ -38,7 +38,7 @@ Andrei Pelinescu-Onciul List of Examples 1.1. Set check_content in the config file - 1.2. Set check_content at runtime via sercmd + 1.2. Set check_content at runtime via kamcmd 1.3. men_alloc usage 1.4. mem_free usage 1.5. mt.mem_alloc usage @@ -106,7 +106,7 @@ Warning Example 1.1. Set check_content in the config file modparam("malloc_test", "check_content", 1) - Example 1.2. Set check_content at runtime via sercmd + Example 1.2. Set check_content at runtime via kamcmd $ kamcmd cfg.set_now_int malloc_test check_content 1 3. Functions diff --git a/src/modules/outbound/README b/src/modules/outbound/README index faeaf1b..163e5e2 100644 --- a/src/modules/outbound/README +++ b/src/modules/outbound/README @@ -60,8 +60,8 @@ Chapter 1. Admin Guide This module provides C-API functions to enable Kamailio to be used as an outbound Edge Proxy (see RFC5626 section 5). - The path and rr will bind to this module if it is loaded before they - are. + The path and rr modules will bind to this module if it is loaded before + they are. 1.1. Edge Proxy Keep-Alives (STUN) @@ -124,17 +124,12 @@ loadmodule "maxfwd.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" -loadmodule "mi_rpc.so" -loadmodule "mi_fifo.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "stun.so" # ----------------- setting module-specific parameters --------------- -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") - # ----- tm params ----- modparam("tm", "failure_reply_mode", 3) @@ -292,8 +287,6 @@ loadmodule "maxfwd.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" -loadmodule "mi_rpc.so" -loadmodule "mi_fifo.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "usrloc.so" @@ -301,9 +294,6 @@ loadmodule "registrar.so" # ----------------- setting module-specific parameters --------------- -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") - # ----- tm params ----- modparam("tm", "failure_reply_mode", 3)

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017