sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
275 discussions

git:master:239c5484: rtjson: error log level set to notice for importing uac api
by Daniel-Constantin Mierla 23 Jun '15

23 Jun '15

Module: kamailio Branch: master Commit: 239c54843897ec143c03693e44c994ee9cdde684 URL: https://github.com/kamailio/kamailio/commit/239c54843897ec143c03693e44c994e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T13:12:08+02:00 rtjson: error log level set to notice for importing uac api - printed at module init, it is not preventing to start the server --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/239c54843897ec143c03693e44c994e… Patch: https://github.com/kamailio/kamailio/commit/239c54843897ec143c03693e44c994e… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index 71ac2e6..7e088c9 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -58,7 +58,7 @@ int rtjson_init(void) memset(&tmb, 0, sizeof(struct tm_binds)); } if (load_uac_api(&uacb) < 0) { - LM_ERR("cannot bind to UAC API - some features are diabled\n"); + LM_NOTICE("cannot bind to UAC API - some features are diabled\n"); memset(&uacb, 0, sizeof(uac_api_t)); } return 0;

1 0

git:master:cccd1a4b: evapi: evapi_close() doesn't use any parameter
by Daniel-Constantin Mierla 23 Jun '15

23 Jun '15

Module: kamailio Branch: master Commit: cccd1a4b20c750246b491ff41090c5749561948d URL: https://github.com/kamailio/kamailio/commit/cccd1a4b20c750246b491ff41090c57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T11:45:22+02:00 evapi: evapi_close() doesn't use any parameter --- Modified: modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cccd1a4b20c750246b491ff41090c57… Patch: https://github.com/kamailio/kamailio/commit/cccd1a4b20c750246b491ff41090c57… --- diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c index 2a3a824..eeafc21 100644 --- a/modules/evapi/evapi_mod.c +++ b/modules/evapi/evapi_mod.c @@ -66,6 +66,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"evapi_async_relay", (cmd_function)w_evapi_async_relay, 1, fixup_evapi_relay, 0, REQUEST_ROUTE}, + {"evapi_close", (cmd_function)w_evapi_close, 0, NULL, + 0, ANY_ROUTE}, {"evapi_close", (cmd_function)w_evapi_close, 1, NULL, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}

1 0

git:master:f87a6311: kazoo : federation tweaks
by Luis Azedo 23 Jun '15

23 Jun '15

Module: kamailio Branch: master Commit: f87a631146c50a3c6e0ef843c5f85120957cb101 URL: https://github.com/kamailio/kamailio/commit/f87a631146c50a3c6e0ef843c5f8512… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-23T09:47:14+01:00 kazoo : federation tweaks --- Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/f87a631146c50a3c6e0ef843c5f8512… Patch: https://github.com/kamailio/kamailio/commit/f87a631146c50a3c6e0ef843c5f8512… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index 4d3b8e9..6366d3b 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -59,7 +59,7 @@ int dbk_reconn_retries = 8; int dbk_presentity_phtable_size = 4096; int dbk_use_federated_exchange = 1; -str dbk_federated_exchange = str_init("federate"); +str dbk_federated_exchange = str_init("federation"); str dbk_primary_zone_name = str_init("local"); //int dbk_dialog_expires = 30; diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 3894cc8..4b3d6fb 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -1480,14 +1480,16 @@ int kz_amqp_bind_consumer(kz_amqp_conn_ptr kz_conn, kz_amqp_bind_ptr bind, int i amqp_bytes_t federated_routing_key = {0, 0}; char _federated[100]; - amqp_exchange_declare(kz_conn->conn, chan[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); - if (kz_amqp_error("Declaring exchange", amqp_get_rpc_reply(kz_conn->conn))) - { - ret = -RET_AMQP_ERROR; - goto error; - } + if(bind->federate == 0 || dbk_use_federated_exchange == 0) { + amqp_exchange_declare(kz_conn->conn, chan[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); + if (kz_amqp_error("Declaring exchange", amqp_get_rpc_reply(kz_conn->conn))) + { + ret = -RET_AMQP_ERROR; + goto error; + } + } - if(bind->federate == 1 && dbk_use_federated_exchange == 1) { + if(bind->federate == 1 && dbk_use_federated_exchange == 1) { federated_exchange = kz_local_amqp_bytes_dup_from_string(dbk_federated_exchange.s); amqp_exchange_declare(kz_conn->conn, chan[idx].channel, federated_exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); if (kz_amqp_error("Declaring federated exchange", amqp_get_rpc_reply(kz_conn->conn))) @@ -1504,13 +1506,15 @@ int kz_amqp_bind_consumer(kz_amqp_conn_ptr kz_conn, kz_amqp_bind_ptr bind, int i goto error; } - LM_DBG("QUEUE BIND\n"); - if (amqp_queue_bind(kz_conn->conn, chan[idx].channel, bind->queue, bind->exchange, bind->routing_key, kz_amqp_empty_table) < 0 - || kz_amqp_error("Binding queue", amqp_get_rpc_reply(kz_conn->conn))) - { - ret = -RET_AMQP_ERROR; - goto error; - } + if(bind->federate == 0 || dbk_use_federated_exchange == 0) { + LM_DBG("QUEUE BIND\n"); + if (amqp_queue_bind(kz_conn->conn, chan[idx].channel, bind->queue, bind->exchange, bind->routing_key, kz_amqp_empty_table) < 0 + || kz_amqp_error("Binding queue", amqp_get_rpc_reply(kz_conn->conn))) + { + ret = -RET_AMQP_ERROR; + goto error; + } + } if(bind->federate == 1 && dbk_use_federated_exchange == 1) { sprintf(_federated, "%.*s%s%.*s", (int)bind->exchange.len, (char*)bind->exchange.bytes,

1 0

git:master:1dbd53a0: kazoo : allow multiple simultaneous servers
by Luis Azedo 23 Jun '15

23 Jun '15

Module: kamailio Branch: master Commit: 1dbd53a0c6d0b9c82c46f67602ac9e9eebd3cf90 URL: https://github.com/kamailio/kamailio/commit/1dbd53a0c6d0b9c82c46f67602ac9e9… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-23T04:57:07+01:00 kazoo : allow multiple simultaneous servers --- Modified: modules/kazoo/Makefile Modified: modules/kazoo/const.h Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/1dbd53a0c6d0b9c82c46f67602ac9e9… Patch: https://github.com/kamailio/kamailio/commit/1dbd53a0c6d0b9c82c46f67602ac9e9…

1 0

git:master:dead28aa: modules/debugger: move json related from debugger_api.c to debugger_json.c|h
by Victor Seva 20 Jun '15

20 Jun '15

Module: kamailio Branch: master Commit: dead28aa11df089e1110a531297d67a4dd583972 URL: https://github.com/kamailio/kamailio/commit/dead28aa11df089e1110a531297d67a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-20T13:38:05+02:00 modules/debugger: move json related from debugger_api.c to debugger_json.c|h --- Added: modules/debugger/debugger_json.c Added: modules/debugger/debugger_json.h Modified: modules/debugger/debugger_api.c Modified: modules/debugger/debugger_api.h Modified: modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dead28aa11df089e1110a531297d67a… Patch: https://github.com/kamailio/kamailio/commit/dead28aa11df089e1110a531297d67a…

1 0

git:master:5d157208: modules/db_text: clean gcc warning
by Victor Seva 20 Jun '15

20 Jun '15

Module: kamailio Branch: master Commit: 5d157208d6b145959b78fef76e6cc025c28e73cd URL: https://github.com/kamailio/kamailio/commit/5d157208d6b145959b78fef76e6cc02… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-20T09:00:44+02:00 modules/db_text: clean gcc warning dbt_raw_util.c: In function 'dbt_build_where': dbt_raw_util.c:172:6: warning: unused variable 'n' [-Wunused-variable] int n, l; --- Modified: modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/5d157208d6b145959b78fef76e6cc02… Patch: https://github.com/kamailio/kamailio/commit/5d157208d6b145959b78fef76e6cc02… --- diff --git a/modules/db_text/dbt_raw_util.c b/modules/db_text/dbt_raw_util.c index 97012cc..ffbfa3b 100644 --- a/modules/db_text/dbt_raw_util.c +++ b/modules/db_text/dbt_raw_util.c @@ -169,7 +169,7 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) char** _o1 = NULL; db_val_t* _v1 = NULL; regmatch_t* matches = NULL; - int n, l; + int l; int len; regex_t preg; int offset = 0; @@ -239,11 +239,11 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) _v1[idx].val.str_val.s = pkg_malloc(l+1); strncpy(_v1[idx].val.str_val.s, buffer+matches[5].rm_so, l); } - -// for(n=0; n < MAX_MATCH; n++) { -// LM_ERR("MATCH RESULT %d - %d,%d\n", n, matches[n].rm_so, matches[n].rm_eo); -// } - +/* + for(int n=0; n < MAX_MATCH; n++) { + LM_ERR("MATCH RESULT %d - %d,%d\n", n, matches[n].rm_so, matches[n].rm_eo); + } +*/ if(matches[0].rm_eo != -1) offset += matches[0].rm_eo;

1 0

git:master:90e0bec6: permissions: added doc for priorities
by Emmanuel Schmidbauer 19 Jun '15

19 Jun '15

Module: kamailio Branch: master Commit: 90e0bec635abaed2bed38bd9b98e16d9895618f4 URL: https://github.com/kamailio/kamailio/commit/90e0bec635abaed2bed38bd9b98e16d… Author: Emmanuel Schmidbauer <eschmidbauer(a)voipxswitch.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)voipxswitch.com> Date: 2015-06-19T09:25:46-04:00 permissions: added doc for priorities --- Modified: modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/90e0bec635abaed2bed38bd9b98e16d… Patch: https://github.com/kamailio/kamailio/commit/90e0bec635abaed2bed38bd9b98e16d… --- diff --git a/modules/permissions/doc/permissions_admin.xml b/modules/permissions/doc/permissions_admin.xml index ce93321..a38e304 100644 --- a/modules/permissions/doc/permissions_admin.xml +++ b/modules/permissions/doc/permissions_admin.xml @@ -707,10 +707,12 @@ modparam("permissions", "tag_col", "peer_tag") </example> </section> <section id ="permissions.p.priority_col"> - <title><varname>priority_col</varname> (integer)</title> + <title><varname>priority_col</varname> (string)</title> <para> The column name used to store the priority of the corresponding rule from the database - row. + row. Priority values should be integer. When db_mode is set to 1 (caching), priorities + are ordered from highest to lowest. In non-caching mode, priority order (ASC vs DESC) + is determined by database. </para> <para> <emphasis>

1 0

git:master:49befc18: Merge pull request #217 from eschmidbauer/master
by Daniel-Constantin Mierla 19 Jun '15

19 Jun '15

Module: kamailio Branch: master Commit: 49befc1814690020c87403ab01c9c477cd0aa86c URL: https://github.com/kamailio/kamailio/commit/49befc1814690020c87403ab01c9c47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-19T15:29:19+02:00 Merge pull request #217 from eschmidbauer/master added doc for proirites inside permission's module --- Modified: modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/49befc1814690020c87403ab01c9c47… Patch: https://github.com/kamailio/kamailio/commit/49befc1814690020c87403ab01c9c47… --- diff --git a/modules/permissions/doc/permissions_admin.xml b/modules/permissions/doc/permissions_admin.xml index ce93321..a38e304 100644 --- a/modules/permissions/doc/permissions_admin.xml +++ b/modules/permissions/doc/permissions_admin.xml @@ -707,10 +707,12 @@ modparam("permissions", "tag_col", "peer_tag") </example> </section> <section id ="permissions.p.priority_col"> - <title><varname>priority_col</varname> (integer)</title> + <title><varname>priority_col</varname> (string)</title> <para> The column name used to store the priority of the corresponding rule from the database - row. + row. Priority values should be integer. When db_mode is set to 1 (caching), priorities + are ordered from highest to lowest. In non-caching mode, priority order (ASC vs DESC) + is determined by database. </para> <para> <emphasis>

1 0

[kamailio] added doc for proirites inside permission's module (#217)
by Emmanuel Schmidbauer 19 Jun '15

19 Jun '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/217 -- Commit Summary -- * added doc for proirites inside permission's module -- File Changes -- M modules/permissions/doc/permissions_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/217.patch https://github.com/kamailio/kamailio/pull/217.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/217

2 3

[kamailio] Exit status for kamcmd (#211)
by Alessio Casco 19 Jun '15

19 Jun '15

Hello I'm running Kamailio version: 4.2.5 (x86_64/linux). kamcmd is always exiting with exit status "0" even if the command failed. root@lb:~# kamcmd willfail error: 500 - command willfail not found root@lb:~# echo $? 0 [live] root@lb32:~# kamcmd permissions.trustedReload Reload OK root@lb:~# echo $? 0 --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/211

2 4

← Newer
1
...
5
6
7
8
9
10
11
...
28
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015