sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:2c7f0b45: test/unit: fix bashism - echo is not portable

by Mikko Lehto

Module: kamailio Branch: master Commit: 2c7f0b45b72aba21001ff993240a36c78000d9fb URL: https://github.com/kamailio/kamailio/commit/2c7f0b45b72aba21001ff993240a36c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-05T02:50:03+02:00 test/unit: fix bashism - echo is not portable --- Modified: test/unit/1.sh Modified: test/unit/15.sh Modified: test/unit/16.sh Modified: test/unit/17.sh Modified: test/unit/18.sh Modified: test/unit/2.sh Modified: test/unit/39.sh Modified: test/unit/4.sh --- Diff: https://github.com/kamailio/kamailio/commit/2c7f0b45b72aba21001ff993240a36c… Patch: https://github.com/kamailio/kamailio/commit/2c7f0b45b72aba21001ff993240a36c…

7 years, 11 months

git:master:2f58816d: test/unit: use directory variables in test runner scripts

by Mikko Lehto

Module: kamailio Branch: master Commit: 2f58816d2949c499c37e959d2c0853946bb6be7f URL: https://github.com/kamailio/kamailio/commit/2f58816d2949c499c37e959d2c08539… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-05T02:49:44+02:00 test/unit: use directory variables in test runner scripts --- Modified: test/unit/1.sh Modified: test/unit/11.cfg Modified: test/unit/11.sh Modified: test/unit/12.cfg Modified: test/unit/12.sh Modified: test/unit/13.cfg Modified: test/unit/13.sh Modified: test/unit/14.cfg Modified: test/unit/14.sh Modified: test/unit/15.sh Modified: test/unit/16.sh Modified: test/unit/17.sh Modified: test/unit/18.sh Modified: test/unit/19.cfg Modified: test/unit/19.sh Modified: test/unit/2.cfg Modified: test/unit/2.sh Modified: test/unit/20.cfg Modified: test/unit/20.sh Modified: test/unit/21.cfg Modified: test/unit/21.sh Modified: test/unit/22.cfg Modified: test/unit/22.sh Modified: test/unit/23.sh Modified: test/unit/25.cfg Modified: test/unit/25.sh Modified: test/unit/26.cfg Modified: test/unit/26.sh Modified: test/unit/27.sh Modified: test/unit/28.cfg Modified: test/unit/28.sh Modified: test/unit/29.sh Modified: test/unit/30.cfg Modified: test/unit/30.sh Modified: test/unit/31.sh Modified: test/unit/32.sh Modified: test/unit/33.cfg Modified: test/unit/33.sh Modified: test/unit/34.cfg Modified: test/unit/34.sh Modified: test/unit/35.cfg Modified: test/unit/35.sh Modified: test/unit/36.sh Modified: test/unit/37.sh Modified: test/unit/38.sh Modified: test/unit/39.sh Modified: test/unit/4.sh Modified: test/unit/40.cfg Modified: test/unit/40.sh Modified: test/unit/41.cfg Modified: test/unit/41.sh Modified: test/unit/42.sh Modified: test/unit/43.sh Modified: test/unit/44.sh Modified: test/unit/45.cfg Modified: test/unit/45.sh Modified: test/unit/46.sh Modified: test/unit/5.cfg Modified: test/unit/5.sh Modified: test/unit/50.cfg Modified: test/unit/50.sh Modified: test/unit/6.sh Modified: test/unit/60.cfg Modified: test/unit/60.sh Modified: test/unit/61.cfg Modified: test/unit/61.sh Modified: test/unit/7.cfg Modified: test/unit/7.sh Modified: test/unit/presence.cfg --- Diff: https://github.com/kamailio/kamailio/commit/2f58816d2949c499c37e959d2c08539… Patch: https://github.com/kamailio/kamailio/commit/2f58816d2949c499c37e959d2c08539…

7 years, 11 months

git:master:fcacbf88: test/unit: adjust common variables to new tree structure

by Mikko Lehto

Module: kamailio Branch: master Commit: fcacbf88ea914e357bb001e50f4397ae6f76c395 URL: https://github.com/kamailio/kamailio/commit/fcacbf88ea914e357bb001e50f4397a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-05T02:47:47+02:00 test/unit: adjust common variables to new tree structure --- Modified: test/unit/include/common --- Diff: https://github.com/kamailio/kamailio/commit/fcacbf88ea914e357bb001e50f4397a… Patch: https://github.com/kamailio/kamailio/commit/fcacbf88ea914e357bb001e50f4397a… --- diff --git a/test/unit/include/common b/test/unit/include/common index ba8aa71..86ee0dc 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -2,8 +2,10 @@ DB_ALL_MOD="acc|alias_db|auth_db|avpops|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt|userblacklist" # root directory relative to tests RUN_DIR="." -SRC_DIR="../.." -CTL_DIR="$SRC_DIR/utils/kamctl" +TOP_DIR="../.." +SRC_DIR="${TOP_DIR}/src" +MOD_DIR="${SRC_DIR}/modules" +CTL_DIR="${TOP_DIR}/utils/kamctl" CTLRC="$CTL_DIR/kamctlrc" CTL="$CTL_DIR/kamctl" DBCTL="$CTL_DIR/kamdbctl"

7 years, 11 months

[kamailio/kamailio] unittest updates (#912)

by Mikko Lehto

Adjust new source code paths and fix some bashism. If sensible, next is mi_fifo to jsonrpcs fifo conversion. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/912 -- Commit Summary -- * test/unit: adjust common variables to new tree structure * test/unit: use directory variables in test runner scripts * test/unit: fix bashism - echo is not portable * test/unit: fix bashism - use `.` instead of `source` and use regular syntax files * test/unit: avoid killall -- File Changes -- M test/unit/1.sh (8) M test/unit/10.sh (2) M test/unit/11.cfg (3) M test/unit/11.sh (14) M test/unit/12.cfg (5) M test/unit/12.sh (10) M test/unit/13.cfg (1) M test/unit/13.sh (10) M test/unit/14.cfg (1) M test/unit/14.sh (8) M test/unit/15.sh (14) M test/unit/16.sh (14) M test/unit/17.sh (14) M test/unit/18.sh (10) M test/unit/19.cfg (1) M test/unit/19.sh (10) M test/unit/2.cfg (13) M test/unit/2.sh (16) M test/unit/20.cfg (1) M test/unit/20.sh (10) M test/unit/21.cfg (3) M test/unit/21.sh (10) M test/unit/22.cfg (1) M test/unit/22.sh (12) M test/unit/23.sh (14) M test/unit/24.sh (4) M test/unit/25.cfg (1) M test/unit/25.sh (12) M test/unit/26.cfg (1) M test/unit/26.sh (14) M test/unit/27.sh (10) M test/unit/28.cfg (1) M test/unit/28.sh (10) M test/unit/29.sh (10) M test/unit/3.sh (4) M test/unit/30.cfg (5) M test/unit/30.sh (10) M test/unit/31.sh (10) M test/unit/32.sh (6) M test/unit/33.cfg (1) M test/unit/33.sh (4) M test/unit/34.cfg (1) M test/unit/34.sh (8) M test/unit/35.cfg (1) M test/unit/35.sh (4) M test/unit/36.sh (8) M test/unit/37.sh (6) M test/unit/38.sh (4) M test/unit/39.sh (14) M test/unit/4.sh (16) M test/unit/40.cfg (3) M test/unit/40.sh (6) M test/unit/41.cfg (1) M test/unit/41.sh (4) M test/unit/42.sh (14) M test/unit/43.sh (15) M test/unit/44.sh (16) M test/unit/45.cfg (5) M test/unit/45.sh (10) M test/unit/46.sh (18) M test/unit/5.cfg (5) M test/unit/5.sh (10) M test/unit/50.cfg (3) M test/unit/50.sh (12) M test/unit/6.sh (6) M test/unit/60.cfg (2) M test/unit/60.sh (2) M test/unit/61.cfg (2) M test/unit/61.sh (2) M test/unit/7.cfg (1) M test/unit/7.sh (8) M test/unit/8.sh (2) M test/unit/9.sh (2) M test/unit/include/common (11) A test/unit/include/database.sh (72) M test/unit/include/require.sh (5) M test/unit/presence.cfg (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/912.patch https://github.com/kamailio/kamailio/pull/912.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/912

7 years, 11 months

git:master:0857fdd4: carrierroute: more log messages for error cases in rpc dump command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0857fdd4314ef98ff0f83258e310f344d790e644 URL: https://github.com/kamailio/kamailio/commit/0857fdd4314ef98ff0f83258e310f34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-04T23:29:38+01:00 carrierroute: more log messages for error cases in rpc dump command --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/0857fdd4314ef98ff0f83258e310f34… Patch: https://github.com/kamailio/kamailio/commit/0857fdd4314ef98ff0f83258e310f34… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index 20733ce..6e0a7a2 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -1180,6 +1180,7 @@ void cr_rpc_dump_routes(rpc_t* rpc, void* ctx) for (i = 0; i < rd->carrier_num; i++) { if (rd->carriers[i]) { if (rpc->array_add(ih, "{", &dh)<0) { + LM_ERR("add carrier data failure at count %d\n", i); rpc->fault(ctx, 500, "Response failure - carrier data"); goto error; } @@ -1188,6 +1189,7 @@ void cr_rpc_dump_routes(rpc_t* rpc, void* ctx) "id", (rd->carriers[i] ? rd->carriers[i]->id : 0), "domains", &eh)<0) { + LM_ERR("add carrier structure failure at count %d\n", i); rpc->fault(ctx, 500, "Internal error - carrier structure"); goto error; } @@ -1195,6 +1197,7 @@ void cr_rpc_dump_routes(rpc_t* rpc, void* ctx) for (j=0; j<rd->carriers[i]->domain_num; j++) { if (rd->carriers[i]->domains[j] && rd->carriers[i]->domains[j]->tree) { if (rpc->array_add(eh, "{", &fh)<0) { + LM_ERR("add domain data failure at count %d/%d\n", i, j); rpc->fault(ctx, 500, "Response failure - domain data"); goto error; } @@ -1203,12 +1206,15 @@ void cr_rpc_dump_routes(rpc_t* rpc, void* ctx) "id", rd->carriers[i]->domains[j]->id, "data", &gh)<0) { + LM_ERR("add domain structure failure at count %d/%d\n", i, j); rpc->fault(ctx, 500, "Internal error - domain structure"); goto error; } if (cr_rpc_dump_tree_recursor (rpc, ctx, gh, - rd->carriers[i]->domains[j]->tree, "") < 0) + rd->carriers[i]->domains[j]->tree, "") < 0) { + LM_ERR("dump tree recursor failure at count %d/%d\n", i, j); goto error; + } } } }

7 years, 11 months

git:master:6d139bd1: ctl: more log messages for error cases

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6d139bd13944cde7e9a44a5c071cc70ab415e2fe URL: https://github.com/kamailio/kamailio/commit/6d139bd13944cde7e9a44a5c071cc70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-04T23:29:38+01:00 ctl: more log messages for error cases --- Modified: src/modules/ctl/binrpc.c Modified: src/modules/ctl/binrpc_run.c Modified: src/modules/ctl/ctl.c --- Diff: https://github.com/kamailio/kamailio/commit/6d139bd13944cde7e9a44a5c071cc70… Patch: https://github.com/kamailio/kamailio/commit/6d139bd13944cde7e9a44a5c071cc70…

7 years, 11 months

git:master:581c33a5: modules: readme files regenerated - userblacklist ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 581c33a5af26a519d9559b9ac2a37ec314bc556e URL: https://github.com/kamailio/kamailio/commit/581c33a5af26a519d9559b9ac2a37ec… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-04T23:16:13+01:00 modules: readme files regenerated - userblacklist ... --- Modified: src/modules/userblacklist/README --- Diff: https://github.com/kamailio/kamailio/commit/581c33a5af26a519d9559b9ac2a37ec… Patch: https://github.com/kamailio/kamailio/commit/581c33a5af26a519d9559b9ac2a37ec…

7 years, 11 months

git:master:e7bf4fc9: userblacklist: implemented rpc command userblacklist.reload_blacklist

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e7bf4fc9893107a4b52650b01c925c47c2d1a802 URL: https://github.com/kamailio/kamailio/commit/e7bf4fc9893107a4b52650b01c925c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-04T23:10:47+01:00 userblacklist: implemented rpc command userblacklist.reload_blacklist --- Modified: src/modules/userblacklist/doc/userblacklist_admin.xml Modified: src/modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/e7bf4fc9893107a4b52650b01c925c4… Patch: https://github.com/kamailio/kamailio/commit/e7bf4fc9893107a4b52650b01c925c4… --- diff --git a/src/modules/userblacklist/doc/userblacklist_admin.xml b/src/modules/userblacklist/doc/userblacklist_admin.xml index 263d9d0..2236248 100644 --- a/src/modules/userblacklist/doc/userblacklist_admin.xml +++ b/src/modules/userblacklist/doc/userblacklist_admin.xml @@ -383,7 +383,28 @@ if (!check_whitelist("globalblacklist")) { </section> <section> - <title><acronym>MI</acronym> Commands</title> + <title>RPC Commands</title> + <section id="userblacklist.r.reload_blacklist"> + <title> + <function moreinfo="none">userblacklist.reload_blacklist</function> + </title> + <para> + Reload the internal global blacklist cache. This is necessary after + the database tables for the global blacklist have been changed. + </para> + <example> + <title><function>userblacklist.reload_blacklist</function> usage</title> + <programlisting format="linespecific"> +... +&kamcmd; userblacklist.reload_blacklist +... + </programlisting> + </example> + </section> +</section> + +<section> + <title>MI Commands</title> <section> <title> <function moreinfo="none">reload_blacklist</function> diff --git a/src/modules/userblacklist/userblacklist.c b/src/modules/userblacklist/userblacklist.c index 32fe98a..442e754 100644 --- a/src/modules/userblacklist/userblacklist.c +++ b/src/modules/userblacklist/userblacklist.c @@ -47,6 +47,7 @@ #include "../../core/error.h" #include "../../core/ut.h" #include "../../core/mod_fix.h" +#include "../../core/rpc_lookup.h" #include "../../lib/trie/dtrie.h" #include "db.h" @@ -1065,8 +1066,38 @@ struct mi_root * mi_check_userwhitelist(struct mi_root* cmd, void* param) } #endif +static void ubl_rpc_reload_blacklist(rpc_t* rpc, void* ctx) +{ + if(reload_sources() != 0) { + rpc->fault(ctx, 500, "Reload failed"); + return; + } +} + +static const char* ubl_rpc_reload_blacklist_doc[2] = { + "Reload user blacklist records.", + 0 +}; + +rpc_export_t ubl_rpc[] = { + {"userblacklist.reload_blacklist", ubl_rpc_reload_blacklist, + ubl_rpc_reload_blacklist_doc, 0}, + {0, 0, 0, 0} +}; + +static int ubl_rpc_init(void) +{ + if (rpc_register_array(ubl_rpc)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +} + static int mod_init(void) { + if (ubl_rpc_init()<0) return -1; if (userblacklist_db_init() != 0) return -1; if (init_shmlock() != 0) return -1; if (init_source_list() != 0) return -1;

7 years, 11 months

git:master:1a05c2dd: modules: readme files regenerated - pdb ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 1a05c2dd6a3afdc8889203b8239a265d84c1ef4b URL: https://github.com/kamailio/kamailio/commit/1a05c2dd6a3afdc8889203b8239a265… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-04T23:01:12+01:00 modules: readme files regenerated - pdb ... --- Modified: src/modules/pdb/README --- Diff: https://github.com/kamailio/kamailio/commit/1a05c2dd6a3afdc8889203b8239a265… Patch: https://github.com/kamailio/kamailio/commit/1a05c2dd6a3afdc8889203b8239a265… --- diff --git a/src/modules/pdb/README b/src/modules/pdb/README index 081655e..625a008 100644 --- a/src/modules/pdb/README +++ b/src/modules/pdb/README @@ -36,20 +36,20 @@ Pawel Kuzak 4.1. pdb_query (string query, string dstavp) - 5. MI Commands + 5. RPC Commands - 5.1. pdb_status - 5.2. pdb_activate - 5.3. pdb_deactivate + 5.1. pdb.status + 5.2. pdb.activate + 5.3. pdb.deactivate List of Examples 1.1. Set timeout parameter 1.2. Set server parameter 1.3. pdb_query usage - 1.4. pdb_status usage - 1.5. pdb_activate usage - 1.6. pdb_deactivate usage + 1.4. pdb.status usage + 1.5. pdb.activate usage + 1.6. pdb.deactivate usage Chapter 1. Admin Guide @@ -70,11 +70,11 @@ Chapter 1. Admin Guide 4.1. pdb_query (string query, string dstavp) - 5. MI Commands + 5. RPC Commands - 5.1. pdb_status - 5.2. pdb_activate - 5.3. pdb_deactivate + 5.1. pdb.status + 5.2. pdb.activate + 5.3. pdb.deactivate 1. Overview @@ -160,38 +160,38 @@ if (!pdb_query("$rU", "$avp(i:82)")) cr_route("$avp(i:82)", "$rd", "$rU", "$rU", "call_id"); ... -5. MI Commands +5. RPC Commands - 5.1. pdb_status - 5.2. pdb_activate - 5.3. pdb_deactivate + 5.1. pdb.status + 5.2. pdb.activate + 5.3. pdb.deactivate -5.1. pdb_status +5.1. pdb.status Prints the status of the module. This can either be "active" or "deactivated". - Example 1.4. pdb_status usage + Example 1.4. pdb.status usage ... -kamctl fifo pdb_status +kamcmd pdb.status ... -5.2. pdb_activate +5.2. pdb.activate Activates the module. This is the default after loading the module. - Example 1.5. pdb_activate usage + Example 1.5. pdb.activate usage ... -kamctl fifo pdb_activate +kamcmd pdb.activate ... -5.3. pdb_deactivate +5.3. pdb.deactivate Deactivates the module. No more queries are performed until it is activated again. As long as the module is deactivated, the pdb_query function will return -1. - Example 1.6. pdb_deactivate usage + Example 1.6. pdb.deactivate usage ... -kamctl fifo pdb_deactivate +kamcmd pdb.deactivate ...

7 years, 11 months

git:master:5911e500: pdb: implemented rpc commands, removed mi leftovers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5911e50003391ac7b88455068706ec305e75d563 URL: https://github.com/kamailio/kamailio/commit/5911e50003391ac7b88455068706ec3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-04T22:58:45+01:00 pdb: implemented rpc commands, removed mi leftovers --- Modified: src/modules/pdb/doc/pdb_admin.xml Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/5911e50003391ac7b88455068706ec3… Patch: https://github.com/kamailio/kamailio/commit/5911e50003391ac7b88455068706ec3…

7 years, 11 months

← Newer
1
...
37
38
39
40
41
42
43
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017