sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:0a9030a7: ctl : add rpc buffer_size param

by Luis Azedo

Module: kamailio Branch: master Commit: 0a9030a7a5a3a288c1080feada1b4b5af41e9518 URL: https://github.com/kamailio/kamailio/commit/0a9030a7a5a3a288c1080feada1b4b5… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-04-08T12:17:01+01:00 ctl : add rpc buffer_size param --- Modified: src/modules/ctl/ctl.c Modified: src/modules/ctl/doc/ctl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/0a9030a7a5a3a288c1080feada1b4b5… Patch: https://github.com/kamailio/kamailio/commit/0a9030a7a5a3a288c1080feada1b4b5… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index f15c721..f626a82 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -60,6 +60,7 @@ static int usock_gid=-1; extern int autoconvert; extern int binrpc_max_body_size; extern int binrpc_struct_max_body_size; +extern int binrpc_buffer_size; static int add_binrpc_socket(modparam_t type, void * val); #ifdef USE_FIFO @@ -96,7 +97,8 @@ static param_export_t params[]={ {"autoconversion", PARAM_INT, &autoconvert }, {"binrpc_max_body_size", PARAM_INT, &binrpc_max_body_size }, {"binrpc_struct_max_body_size", PARAM_INT, &binrpc_struct_max_body_size }, - {0,0,0} + {"binrpc_buffer_size", PARAM_INT, &binrpc_buffer_size }, + {0,0,0} }; /* no params */ struct module_exports exports= { diff --git a/src/modules/ctl/doc/ctl_params.xml b/src/modules/ctl/doc/ctl_params.xml index 901e56f..733636a 100644 --- a/src/modules/ctl/doc/ctl_params.xml +++ b/src/modules/ctl/doc/ctl_params.xml @@ -89,6 +89,25 @@ modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012 </example> </section> + <section id="binrpc_buffer_size"> + <title><varname>binrpc_buffer_size</varname> (integer or string)</title> + <para> + the size of the internal buffer. + </para> + <para> + Default: 1024. + </para> + <example> + <title>Set <varname>binrpc_buffer_size</varname> parameter</title> + <programlisting> + ... + modparam("ctl", "binrpc_buffer_size", 4096) + ... + </programlisting> + </example> + </section> + + <section id="mode"> <title><varname>mode</varname> (integer)</title> <para>

7 years, 8 months

[kamailio/kamailio] ctl : add rpc buffer_size param (#1064)

by lazedo

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1064 -- Commit Summary -- * ctl : add rpc buffer_size param -- File Changes -- M src/modules/ctl/ctl.c (4) M src/modules/ctl/doc/ctl_params.xml (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1064.patch https://github.com/kamailio/kamailio/pull/1064.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1064

7 years, 8 months

git:master:22e33ba6: kazoo: fix connection to root vhost

by lazedo

Module: kamailio Branch: master Commit: 22e33ba64c3aad3b50e9ba649c5fa736462a30b4 URL: https://github.com/kamailio/kamailio/commit/22e33ba64c3aad3b50e9ba649c5fa73… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-09T06:39:44+01:00 kazoo: fix connection to root vhost --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/22e33ba64c3aad3b50e9ba649c5fa73… Patch: https://github.com/kamailio/kamailio/commit/22e33ba64c3aad3b50e9ba649c5fa73… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index c3faa05..f3a7c2c 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -735,8 +735,10 @@ int kz_amqp_add_connection(modparam_t type, void* val) if(newConn->info.vhost == NULL) { newConn->info.vhost = KZ_URL_ROOT; +#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 6 } else if(newConn->info.vhost[0] == '/' && strlen(newConn->info.vhost) == 1) { // bug in amqp_parse_url ? newConn->info.vhost++; +#endif } kz_amqp_server_ptr server_ptr = (kz_amqp_server_ptr)shm_malloc(sizeof(kz_amqp_server));

7 years, 8 months

git:master:2ceb44f5: kazoo: parse json with amqp specified bytes

by lazedo

Module: kamailio Branch: master Commit: 2ceb44f5b57f465b97f45a67183e9caf52610364 URL: https://github.com/kamailio/kamailio/commit/2ceb44f5b57f465b97f45a67183e9ca… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-09T03:10:49+01:00 kazoo: parse json with amqp specified bytes --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/2ceb44f5b57f465b97f45a67183e9ca… Patch: https://github.com/kamailio/kamailio/commit/2ceb44f5b57f465b97f45a67183e9ca… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 394dee2..c3faa05 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2868,8 +2868,16 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e int idx = envelope->channel-1; int worker = 0; int _kz_server_id = server_ptr->id; - - json_obj_ptr json_obj = kz_json_parse((char*)envelope->message.body.bytes); + int msg_size = envelope->message.body.len; + char *json_data = pkg_malloc(msg_size + 1); + if(!json_data) { + LM_ERR("no more package memory available. needed %d\n", msg_size + 1); + return; + } + memset(json_data, 0, msg_size + 1); + memcpy(json_data, (char*)envelope->message.body.bytes, msg_size); + json_obj_ptr json_obj = kz_json_parse(json_data); + pkg_free(json_data); if (json_obj == NULL) { LM_ERR("error parsing json body\n"); return;

7 years, 8 months

git:master:cb92c2b1: kazoo: create empty routing if not provided

by lazedo

Module: kamailio Branch: master Commit: cb92c2b176dc55fb03cab172c63b115267d1bac9 URL: https://github.com/kamailio/kamailio/commit/cb92c2b176dc55fb03cab172c63b115… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-08T23:28:44+01:00 kazoo: create empty routing if not provided --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/cb92c2b176dc55fb03cab172c63b115… Patch: https://github.com/kamailio/kamailio/commit/cb92c2b176dc55fb03cab172c63b115… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 46064ae..394dee2 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1834,8 +1834,8 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) } if(routing == NULL) { - LM_ERR("invalid routing\n"); - goto error; + LM_INFO("creating empty routing key : %s\n", payload_s.s); + routing = kz_amqp_routing_new(""); } exchange = kz_amqp_exchange_from_json(&exchange_s, json_obj);

7 years, 8 months

git:master:525c6446: db_text: fix table length allocation in raw query

by lazedo

Module: kamailio Branch: master Commit: 525c64463970841e7f1b8ef9778306007d4ca99d URL: https://github.com/kamailio/kamailio/commit/525c64463970841e7f1b8ef97783060… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-08T23:27:49+01:00 db_text: fix table length allocation in raw query --- Modified: src/modules/db_text/dbt_raw_query.c --- Diff: https://github.com/kamailio/kamailio/commit/525c64463970841e7f1b8ef97783060… Patch: https://github.com/kamailio/kamailio/commit/525c64463970841e7f1b8ef97783060… --- diff --git a/src/modules/db_text/dbt_raw_query.c b/src/modules/db_text/dbt_raw_query.c index 0601a6c..41e15aa 100644 --- a/src/modules/db_text/dbt_raw_query.c +++ b/src/modules/db_text/dbt_raw_query.c @@ -63,10 +63,10 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) return res; len = fields_end_ptr - (_s->s + 6) + 1; - fields_ptr = pkg_malloc(len); + fields_ptr = pkg_malloc(len+1); + memset(fields_ptr, 0, len+1); strncpy(fields_ptr, _s->s + 6, len); - fields_ptr[len] = '\0'; - fields_ptr = dbt_trim(fields_ptr); + dbt_trim(fields_ptr); order_start_ptr = strcasestr(_s->s, " order by "); if(order_start_ptr != NULL) { @@ -83,9 +83,9 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) nc = dbt_build_where(where_ptr + 7, &_k, &_op, &_v); } - table_ptr = pkg_malloc(len); + table_ptr = pkg_malloc(len+1); + memset(table_ptr, 0, len+1); strncpy(table_ptr, fields_end_ptr + 6, len); - table_ptr[len] = '\0'; dbt_trim(table_ptr); table.s = table_ptr; @@ -232,9 +232,9 @@ int dbt_raw_query_update(db1_con_t* _h, str* _s, db1_res_t** _r) return res; len = fields_start_ptr - table_start_ptr; - table_ptr = pkg_malloc(len); + table_ptr = pkg_malloc(len+1); + memset(table_ptr, 0, len+1); strncpy(table_ptr, table_start_ptr, len); - table_ptr[len] = '\0'; dbt_trim(table_ptr); table.s = table_ptr; table.len = strlen(table_ptr); @@ -247,10 +247,10 @@ int dbt_raw_query_update(db1_con_t* _h, str* _s, db1_res_t** _r) fields_end_ptr = where_ptr; len = fields_end_ptr - ( fields_start_ptr + 4) + 1; - fields_ptr = pkg_malloc(len); + fields_ptr = pkg_malloc(len+1); + memset(fields_ptr, 0, len+1); strncpy(fields_ptr, fields_start_ptr + 4, len); - fields_ptr[len] = '\0'; - fields_ptr = dbt_trim(fields_ptr); + dbt_trim(fields_ptr); ncols = dbt_build_where(fields_ptr, &_c, &_op2, &_cv); if(ncols <0) { @@ -330,9 +330,9 @@ int dbt_raw_query_delete(db1_con_t* _h, str* _s, db1_res_t** _r) nkeys = dbt_build_where(where_ptr + 7, &_k, &_op1, &_kv); } - table_ptr = pkg_malloc(len); + table_ptr = pkg_malloc(len+1); + memset(table_ptr, 0, len+1); strncpy(table_ptr, fields_end_ptr + 6, len); - table_ptr[len] = '\0'; dbt_trim(table_ptr); table.s = table_ptr; @@ -415,9 +415,9 @@ int dbt_raw_query_replace(db1_con_t* _h, str* _s, db1_res_t** _r) return res; len = fields_start_ptr - table_start_ptr; - table_ptr = pkg_malloc(len); + table_ptr = pkg_malloc(len+1); + memset(table_ptr, 0, len+1); strncpy(table_ptr, table_start_ptr, len); - table_ptr[len] = '\0'; dbt_trim(table_ptr); table.s = table_ptr; table.len = strlen(table_ptr); @@ -430,10 +430,10 @@ int dbt_raw_query_replace(db1_con_t* _h, str* _s, db1_res_t** _r) fields_end_ptr = where_ptr; len = fields_end_ptr - ( fields_start_ptr + 4) + 1; - fields_ptr = pkg_malloc(len); + fields_ptr = pkg_malloc(len+1); + memset(fields_ptr, 0, len+1); strncpy(fields_ptr, fields_start_ptr + 4, len); - fields_ptr[len] = '\0'; - fields_ptr = dbt_trim(fields_ptr); + dbt_trim(fields_ptr); ncols = dbt_build_where(fields_ptr, &_c, &_op2, &_cv); if(ncols <0) { @@ -465,6 +465,8 @@ int dbt_raw_query_replace(db1_con_t* _h, str* _s, db1_res_t** _r) cols = nkeys + ncols; _f = pkg_malloc(sizeof(db_key_t) * cols); _v = pkg_malloc(sizeof(db_val_t) * cols); + memset(_f, 0, sizeof(db_key_t) * cols); + memset(_v, 0, sizeof(db_key_t) * cols); for(n=0; n < nkeys; n++) { _f[n] = _k[n]; _v[n] = _kv[n];

7 years, 8 months

git:master:e36f607d: modules/registrar: removed extra empty line

by Juha Heinanen

Module: kamailio Branch: master Commit: e36f607d44a53969c4dc469f7c940ed861419ca1 URL: https://github.com/kamailio/kamailio/commit/e36f607d44a53969c4dc469f7c940ed… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-04-08T15:25:07+03:00 modules/registrar: removed extra empty line --- Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/e36f607d44a53969c4dc469f7c940ed… Patch: https://github.com/kamailio/kamailio/commit/e36f607d44a53969c4dc469f7c940ed… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 27d040b..cd261b1 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -47,7 +47,6 @@ static int has_to_tag(struct sip_msg* msg) { - if (parse_to_header(msg) < 0) return 0; return (get_to(msg)->tag_value.len > 0) ? 1 : 0; }

7 years, 8 months

git:master:ac2572b8: modules/registrar: apply method_filtering only on initial requests w/o to-tag

by Juha Heinanen

Module: kamailio Branch: master Commit: ac2572b880c5373864a55ebe1b9e538dd9337e63 URL: https://github.com/kamailio/kamailio/commit/ac2572b880c5373864a55ebe1b9e538… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-04-08T15:22:54+03:00 modules/registrar: apply method_filtering only on initial requests w/o to-tag --- Modified: src/modules/registrar/README Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/ac2572b880c5373864a55ebe1b9e538… Patch: https://github.com/kamailio/kamailio/commit/ac2572b880c5373864a55ebe1b9e538… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 220e2a8..0b80869 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -568,9 +568,10 @@ modparam("registrar", "sock_hdr_name", "Sock-Info") 3.17. method_filtering (integer) Tells if the contact filtering based on supported methods should be - performed during lookup. It's enabled only if it has a non zero value. - Supported methods are listed in the “Allow:” header in the REGISTER - message and stored in the location database. + performed during lookup on initial requests without to-tag. It's + enabled only if it has a non zero value. Supported methods are listed + in the “Allow:” header in the REGISTER message and stored in the + location database. Default value is 0 (disabled). @@ -882,9 +883,9 @@ save("location", "0x00", "sip:test@kamailio.org"); value and optionally the rest will be appended to the message (depending on append_branches parameter value). - If the method_filtering option is enabled, the lookup function will - return only the contacts that support the method of the processed - request. + If the method_filtering option is enabled and request is initial + request without to-tag, the lookup function will return only the + contacts that support the method of the processed request. Meaning of the parameters is as follows: * domain - Name of table that should be used for the lookup. diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 0a81b8b..7e98b05 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -515,7 +515,8 @@ modparam("registrar", "sock_hdr_name", "Sock-Info") <title><varname>method_filtering</varname> (integer)</title> <para> Tells if the contact filtering based on supported methods should be - performed during lookup. It's enabled only if it has a non zero + performed during lookup on initial requests without to-tag. + It's enabled only if it has a non zero value. Supported methods are listed in the <quote>Allow:</quote> header in the REGISTER message and stored in the location database. </para> @@ -1077,8 +1078,9 @@ save("location", "0x00", "sip:test@kamailio.org"); the message (depending on append_branches parameter value). </para> <para> - If the <varname>method_filtering</varname> option is enabled, - the <function>lookup</function> function + If the <varname>method_filtering</varname> option is enabled and + request is initial request without to-tag, the + <function>lookup</function> function will return only the contacts that support the method of the processed request. </para> diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index c9853a6..27d040b 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -45,9 +45,16 @@ #include "lookup.h" #include "config.h" -#define allowed_method(_msg, _c) \ - ( !method_filtering || ((_msg)->REQ_METHOD)&((_c)->methods) ) +static int has_to_tag(struct sip_msg* msg) +{ + if (parse_to_header(msg) < 0) return 0; + return (get_to(msg)->tag_value.len > 0) ? 1 : 0; +} + +#define allowed_method(_msg, _c) \ + ( !method_filtering || ((_msg)->REQ_METHOD)&((_c)->methods) || \ + has_to_tag(_msg) ) /** * compare two instances, by skipping '<' & '>'

7 years, 8 months

git:master:49fd4460: db_text: fix indentation

by Luis Azedo

Module: kamailio Branch: master Commit: 49fd44603d9706be1b2e3862f09d10a52581d312 URL: https://github.com/kamailio/kamailio/commit/49fd44603d9706be1b2e3862f09d10a… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-04-08T13:16:48+01:00 db_text: fix indentation --- Modified: src/modules/db_text/dbt_raw_query.c --- Diff: https://github.com/kamailio/kamailio/commit/49fd44603d9706be1b2e3862f09d10a… Patch: https://github.com/kamailio/kamailio/commit/49fd44603d9706be1b2e3862f09d10a… --- diff --git a/src/modules/db_text/dbt_raw_query.c b/src/modules/db_text/dbt_raw_query.c index 71e7d3f..0601a6c 100644 --- a/src/modules/db_text/dbt_raw_query.c +++ b/src/modules/db_text/dbt_raw_query.c @@ -336,7 +336,7 @@ int dbt_raw_query_delete(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_trim(table_ptr); table.s = table_ptr; - table.len = strlen(table_ptr); + table.len = strlen(table_ptr); LM_DBG("using table '%.*s'\n", table.len, table.s); if(dbt_use_table(_h, &table) != 0) {

7 years, 8 months

git:master:3433e386: db_text: fix table length in raw delete

by Luis Azedo

Module: kamailio Branch: master Commit: 3433e386a8ed1e9feef7b05a454d8989a45c1782 URL: https://github.com/kamailio/kamailio/commit/3433e386a8ed1e9feef7b05a454d898… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-04-08T13:08:38+01:00 db_text: fix table length in raw delete --- Modified: src/modules/db_text/dbt_raw_query.c --- Diff: https://github.com/kamailio/kamailio/commit/3433e386a8ed1e9feef7b05a454d898… Patch: https://github.com/kamailio/kamailio/commit/3433e386a8ed1e9feef7b05a454d898… --- diff --git a/src/modules/db_text/dbt_raw_query.c b/src/modules/db_text/dbt_raw_query.c index 5ed3ce6..71e7d3f 100644 --- a/src/modules/db_text/dbt_raw_query.c +++ b/src/modules/db_text/dbt_raw_query.c @@ -336,7 +336,7 @@ int dbt_raw_query_delete(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_trim(table_ptr); table.s = table_ptr; - table.len = len; + table.len = strlen(table_ptr); LM_DBG("using table '%.*s'\n", table.len, table.s); if(dbt_use_table(_h, &table) != 0) {

7 years, 8 months

← Newer
1
...
29
30
31
32
33
34
35
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017