sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
318 discussions

git:master:a1884dca: sdpops: fix module README '&&' in example, fix conversion error
by Henning Westerholt 08 Apr '19

08 Apr '19

Module: kamailio Branch: master Commit: a1884dca372d0b3bc82d5ad36dced99fa088d141 URL: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-08T09:29:42+02:00 sdpops: fix module README '&&' in example, fix conversion error --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… Patch: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 6cd8a68f69..5ed3c57d40 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -583,15 +583,16 @@ if(sdp_get_line_startswith("$avp(mline)", "m=")) { </para> <example> <title><function>sdp_get_address_family</function>usage</title> - <programlisting format="linespecific"> - ... - if(is_method("INVITE") && has_body("application/sdp")){ - - $avp(af) = sdp_get_address_family(); - xlog("L_INFO","ADDRESS FAMILY OF SDP C line $avp(af) "); - } - ... - </programlisting> + <programlisting> +<![CDATA[ +... +if(is_method("INVITE") && has_body("application/sdp")){ + $avp(af) = sdp_get_address_family(); + xlog("L_INFO","ADDRESS FAMILY OF SDP C line $avp(af) "); +} +... +]]> + </programlisting> </example> </section>

1 0

[kamailio/kamailio] kamailio crashes when attempting to query offline database (#1821)
by srinikart 05 Apr '19

05 Apr '19

### Description I am testing how kamailio reacts to various database conditions. One such condition is if the database engine is simply shut down (that is, database server process no longer running, tcp listening socket closed, etc...) I am utilizing the db_unixodbc module to connect to an Informix database engine. I am currently running on Kamailio version 5.0.1. I have a test query that executes against the database engine every 10 seconds. Here is what i have noticed if i shut down the database engine at some point after i run Kamailio. The first test query that attempts to run against the db engine fails; it tries to reconnect and fails. The second test query (10 seconds after the 1st) results in a SIGCHILD and shuts down the entire Kamailio process. I communicated this info to the mailing list and was asked to open an issue regarding this and to also test the more recent version 5 releases. Here is the update on said tests: I have tested the master branch and 5.3.0-dev2 and neither branch resolves the issue. However I did notice in the master branch that there is new code that is related to this issue. https://github.com/kamailio/kamailio/issues/1681 In issue 1681 there is code that allows Kamailio to start even if a database connection can not be established. Queries attempting to run against the offline database fail gracefully. And once the database is back online, a connection is established and queries against it are successful. However, if at some later point I shut down the database, we're back to the original issue that i reported. Kamailio crashes with the same output as listed before except the first query that is attempted against the offline db causes the crash in this master branch unlike previously (branch 5.series) the first attempt fails, tries again and fails, and the second attempt causes the crash. Regardless, the output is more or less the same and Kamailio is down. I suspect this might be the same behavior even if one is not using an odbc driver; but maybe not. ### Troubleshooting #### Reproduction Start Kamailio; kill the database engine; run test query from kamailo to said database engine; Kamailio crashes. This can be replicated using the db_unixodbc module; not sure if it's the same for other types of database drivers. #### Log Messages Jan 17 20:07:25 [29297]: INFO: (s) SQL query: FIRST TEST QUERY Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [dbase.c:135]: db_unixodbc_submit_query(): rv=-1. Query= FIRST TEST QUERY Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [connection.c:220]: db_unixodbc_extract_error(): unixodbc:SQLExecDirect=08S01:1:-11020:[Informix][Informix ODBC Driver]Communication link failure. Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [dbase.c:59]: reconnect(): Attempting DB reconnect Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [dbase.c:74]: reconnect(): failed to connect Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [connection.c:220]: db_unixodbc_extract_error(): unixodbc:SQLDriverConnect=08002:1:0:[unixODBC][Driver Manager]Connection name in use Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [connection.c:220]: db_unixodbc_extract_error(): unixodbc:SQLDriverConnect=HY010:2:-11067:[Informix][Informix ODBC Driver]Function sequence error. Jan 17 20:07:25 [29297]: ERROR: <core> [db_query.c:181]: db_do_raw_query(): error while submitting query Jan 17 20:07:25 [29297]: ERROR: sqlops [sql_api.c:265]: sql_do_query(): cannot do the query FIRST TEST QUERY Jan 17 20:07:25 [29297]: INFO: (s) [123] SQL ret: fail (-1) Jan 17 20:07:25 [29297]: INFO: (s) [123] SQL res: no rows Jan 17 20:07:35 [29297]: INFO: (s) [123] SQL query: 10 seconds later the SECOND TEST QUERY (it's the same query as the first one) Jan 17 20:07:35 [29301]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 28 Jan 17 20:07:35 [29283]: ALERT: <core> [main.c:744]: handle_sigs(): child process 29297 exited by a signal 11 Jan 17 20:07:35 [29283]: ALERT: <core> [main.c:747]: handle_sigs(): core was not generated Jan 17 20:07:35 [29283]: INFO: <core> [main.c:759]: handle_sigs(): terminating due to SIGCHLD Jan 17 20:07:35 [29301]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29295]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29291]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29288]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29300]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29284]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29286]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29293]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29289]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29287]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29292]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29296]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29298]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29299]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29285]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29294]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29290]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29283]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ### Additional Information version: kamailio 5.0.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 11:25:09 May 2 2018 with gcc 4.1.2 version: kamailio 5.3.0-dev2 (x86_64/linux) 30857d-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 30857d -dirty compiled on 14:30:54 Jan 22 2019 with gcc 4.1.2 * **Operating System**: Red Hat Enterprise Linux Server release 5.11 (Tikanga) Linux 2.6.18-404.el5 #1 SMP Sat Mar 7 04:14:13 EST 2015 x86_64 x86_64 x86_64 GNU/Linux -- 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/issues/1821

3 16

git:master:83966b2a: sqlops: fix reversed logic in db re-connecting handling (GH #1821)
by Henning Westerholt 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 83966b2aaee656c0b18098f7e477190a8cb32c5c URL: https://github.com/kamailio/kamailio/commit/83966b2aaee656c0b18098f7e477190… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-05T11:03:51+02:00 sqlops: fix reversed logic in db re-connecting handling (GH #1821) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/83966b2aaee656c0b18098f7e477190… Patch: https://github.com/kamailio/kamailio/commit/83966b2aaee656c0b18098f7e477190… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 87c4f2f229..f39da7fed8 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -161,7 +161,7 @@ int sql_connect(int mode) sc->dbh = sc->dbf.init(&sc->db_url); if (sc->dbh==NULL) { - if(mode) { + if(!mode) { LM_ERR("failed to connect to the database [%.*s]\n", sc->name.len, sc->name.s); return -1;

1 0

git:master:21dc5288: sqlops: add debug output about sql connect_mode parameter
by Henning Westerholt 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 21dc5288533eb0860edc53b273f84cde76b82909 URL: https://github.com/kamailio/kamailio/commit/21dc5288533eb0860edc53b273f84cd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-05T10:51:26+02:00 sqlops: add debug output about sql connect_mode parameter --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/21dc5288533eb0860edc53b273f84cd… Patch: https://github.com/kamailio/kamailio/commit/21dc5288533eb0860edc53b273f84cd… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index bb75bebc35..87c4f2f229 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -143,6 +143,7 @@ int sql_connect(int mode) { sql_con_t *sc; sc = _sql_con_root; + LM_DBG("trying to connect to database with mode %d\n", mode); while(sc) { if (db_bind_mod(&sc->db_url, &sc->dbf))

1 0

git:master:179dadd3: app_ruby: execution log message based on core latency_limit_action
by Daniel-Constantin Mierla 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 179dadd31f1cad561163400a8fee8ea5861b6324 URL: https://github.com/kamailio/kamailio/commit/179dadd31f1cad561163400a8fee8ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-05T08:56:42+02:00 app_ruby: execution log message based on core latency_limit_action --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/179dadd31f1cad561163400a8fee8ea… Patch: https://github.com/kamailio/kamailio/commit/179dadd31f1cad561163400a8fee8ea… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 5a325f7538..ece9e6b76d 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -745,23 +745,19 @@ static VALUE ksr_ruby_exec_callback(VALUE ptr) } /** - * + * */ -VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, +VALUE sr_kemi_ruby_exec_func_ex(ksr_ruby_context_t *R, sr_kemi_t *ket, int argc, VALUE* argv, VALUE self) { sr_kemi_val_t vps[SR_KEMI_PARAMS_MAX]; sr_ruby_env_t *env_R; - sr_kemi_t *ket; str *fname; str *mname; int i; int ret = -1; env_R = app_ruby_sr_env_get(); - ket = sr_kemi_ruby_export_get(eidx); - - LM_DBG("executing %p eidx %d\n", ket, eidx); if(env_R==NULL || env_R->msg==NULL || ket==NULL) { LM_ERR("invalid ruby environment attributes or parameters\n"); return Qfalse; @@ -1035,6 +1031,47 @@ VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, } } +/** + * + */ +VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, + VALUE* argv, VALUE self) +{ + sr_kemi_t *ket; + int ret; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; + + ket = sr_kemi_ruby_export_get(eidx); + + LM_DBG("executing %p eidx %d\n", ket, eidx); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } + + ret = sr_kemi_ruby_exec_func_ex(R, ket, argc, argv, self); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u us]\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff); + } + } + + return ret; +} + /** * */

1 0

git:master:626a8bf3: app_jsdt: use system time to compute execution duration
by Daniel-Constantin Mierla 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 626a8bf3e6cbc6dbdf11de0e6f8737f08c79a0bb URL: https://github.com/kamailio/kamailio/commit/626a8bf3e6cbc6dbdf11de0e6f8737f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-05T08:56:42+02:00 app_jsdt: use system time to compute execution duration --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/626a8bf3e6cbc6dbdf11de0e6f8737f… Patch: https://github.com/kamailio/kamailio/commit/626a8bf3e6cbc6dbdf11de0e6f8737f… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 8ecd62c46b..abd54215da 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1347,29 +1347,34 @@ int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; int sline = 0; ket = sr_kemi_jsdt_export_get(eidx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_kemi_jsdt_exec_func_ex(J, ket); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { duk_inspect_callstack_entry(J, -1); duk_get_prop_string(J, -1, "lineNumber"); sline = (int)duk_to_int(J, -1); duk_pop_2(J); LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (line: %d)\n", + " took too long [%u us] (line: %d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, sline); + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, sline); } }

1 0

git:master:639db054: app_sqlang: execution log message based on core latency_limit_action
by Daniel-Constantin Mierla 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 639db054d0d2e8b0bb50c9109750419654dedbe1 URL: https://github.com/kamailio/kamailio/commit/639db054d0d2e8b0bb50c9109750419… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-05T08:56:42+02:00 app_sqlang: execution log message based on core latency_limit_action --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/639db054d0d2e8b0bb50c9109750419… Patch: https://github.com/kamailio/kamailio/commit/639db054d0d2e8b0bb50c9109750419… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 79465940fd..0e878fa99a 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1457,9 +1457,36 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) int sr_kemi_sqlang_exec_func(HSQUIRRELVM J, int eidx) { sr_kemi_t *ket; + int ret; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_kemi_sqlang_export_get(eidx); - return sr_kemi_sqlang_exec_func_ex(J, ket); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } + + ret = sr_kemi_sqlang_exec_func_ex(J, ket); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u us]\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff); + } + } + + return ret; } /**

1 0

git:master:3131832b: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 04 Apr '19

04 Apr '19

Module: kamailio Branch: master Commit: 3131832b65850593b78dfd5b8335a0e26009fb58 URL: https://github.com/kamailio/kamailio/commit/3131832b65850593b78dfd5b8335a0e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-04T17:01:47+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/3131832b65850593b78dfd5b8335a0e… Patch: https://github.com/kamailio/kamailio/commit/3131832b65850593b78dfd5b8335a0e… --- diff --git a/src/modules/lcr/README b/src/modules/lcr/README index 0dd6fae04e..396945e714 100644 --- a/src/modules/lcr/README +++ b/src/modules/lcr/README @@ -10,6 +10,12 @@ Juha Heinanen <jh(a)tutpro.com> +Edited by + +Ovidiu Sas + + <osas(a)voipembedded.com> + Copyright © 2005-2014 Juha Heinanen __________________________________________________________________ @@ -1234,9 +1240,13 @@ if (to_any_gw("192.55.66.2", 1)) { 5.3. lcr.dump_rules Causes lcr module to dump the contents of its in-memory lcr_rule and - lcr_rule_target tables. + lcr_rule_target tables. Rules can be filetered by lcr_id or lcr_id and + prefix. The filters are passed as optional parameters. - Parameters: none + Parameters: + * lcr_id filter rules based on lcr_id. + * prefix filter rules based on prefix (prefixes shorter or equal to + the give prefix) in addition to the previous lcr_id parameter. Example 1.60. lcr.dump_rules RPC example $ kamcmd lcr.dump_rules

1 0

[kamailio/kamailio] lcr: enhance the lcr.dump_rules with filtering params: (#1922)
by Ovidiu Sas 04 Apr '19

04 Apr '19

lcr: enhance the lcr.dump_rules with filtering params: - lcr_id [optional] - prefix [optional] If lcr_id param is provided, then only the rules belonging to the given lcr_id will be dumped. If the lcr_id and prefix param is provided, then only the rules belonging to the given lcr_id and prefixes that equal or longer to the given prefix will be dumped.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  lcr: enhance the lcr.dump_rules with filtering params: - lcr_id [optional] - prefix [optional] If lcr_id param is provided, then only the rules belonging to the given lcr_id will be dumped. If the lcr_id and prefix param is provided, then only the rules belonging to the given lcr_id and prefixes that equal or longer to the given prefix will be dumped. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1922 -- Commit Summary -- * lcr: enhance the lcr.dump_rules with filtering params: -- File Changes -- M src/modules/lcr/lcr_rpc.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1922.patch https://github.com/kamailio/kamailio/pull/1922.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/1922

2 3

git:master:8f796ab6: lcr: enhance RPC command lcr.dump_rules with filetring params
by Ovidiu Sas 04 Apr '19

04 Apr '19

Module: kamailio Branch: master Commit: 8f796ab6f5b1edb0c4b9a7d4e3251a026dd0bb1a URL: https://github.com/kamailio/kamailio/commit/8f796ab6f5b1edb0c4b9a7d4e3251a0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-04-04T10:46:33-04:00 lcr: enhance RPC command lcr.dump_rules with filetring params --- Modified: src/modules/lcr/doc/lcr.xml Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8f796ab6f5b1edb0c4b9a7d4e3251a0… Patch: https://github.com/kamailio/kamailio/commit/8f796ab6f5b1edb0c4b9a7d4e3251a0… --- diff --git a/src/modules/lcr/doc/lcr.xml b/src/modules/lcr/doc/lcr.xml index 720528d713..a328860214 100644 --- a/src/modules/lcr/doc/lcr.xml +++ b/src/modules/lcr/doc/lcr.xml @@ -22,6 +22,11 @@ <surname>Heinanen</surname> <email>jh(a)tutpro.com</email> </editor> + <editor> + <firstname>Ovidiu</firstname> + <surname>Sas</surname> + <email>osas(a)voipembedded.com</email> + </editor> </authorgroup> <copyright> <year>2005-2014</year> diff --git a/src/modules/lcr/doc/lcr_admin.xml b/src/modules/lcr/doc/lcr_admin.xml index e0e8755322..47bed3ee9f 100644 --- a/src/modules/lcr/doc/lcr_admin.xml +++ b/src/modules/lcr/doc/lcr_admin.xml @@ -1641,8 +1641,20 @@ if (to_any_gw("192.55.66.2", 1)) { <para> Causes lcr module to dump the contents of its in-memory lcr_rule and lcr_rule_target tables. + Rules can be filetered by lcr_id or lcr_id and prefix. + The filters are passed as optional parameters. </para> - <para>Parameters: <emphasis>none</emphasis></para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>lcr_id</emphasis> filter rules based on lcr_id. + </para></listitem> + <listitem><para> + <emphasis>prefix</emphasis> filter rules based on prefix + (prefixes shorter or equal to the give prefix) in addition + to the previous lcr_id parameter. + </para></listitem> + </itemizedlist> <example> <title><function>lcr.dump_rules</function> RPC example</title> <programlisting format="linespecific"> diff --git a/src/modules/lcr/lcr_rpc.c b/src/modules/lcr/lcr_rpc.c index baf657ad0c..ec10653a32 100644 --- a/src/modules/lcr/lcr_rpc.c +++ b/src/modules/lcr/lcr_rpc.c @@ -126,18 +126,36 @@ static const char *dump_rules_doc[2] = { static void dump_rules(rpc_t *rpc, void *c) { int i, j; + int _filter_by_prefix = 0; + int _lcr_id = 0; + str _prefix = {NULL,0}; struct rule_info **rules, *rule; struct target *t; void *st; str prefix, from_uri, request_uri; + if (rpc->scan(c, "d", &_lcr_id)>0) { + if (rpc->scan(c, ".S", &_prefix)>0) { + _filter_by_prefix = 1; + } + } + for(j = 1; j <= lcr_count_param; j++) { + if (_lcr_id && _lcr_id!=j) continue; + rules = rule_pt[j]; for(i = 0; i < lcr_rule_hash_size_param; i++) { rule = rules[i]; while(rule) { + if (_filter_by_prefix && _prefix.len && _prefix.s) { + if (_prefix.len < rule->prefix_len || + strncmp(_prefix.s, rule->prefix, rule->prefix_len)!=0) { + rule = rule->next; + continue; + } + } if(rpc->add(c, "{", &st) < 0) return; prefix.s = rule->prefix; @@ -160,6 +178,8 @@ static void dump_rules(rpc_t *rpc, void *c) rule = rule->next; } } + if (_filter_by_prefix) + continue; rule = rules[lcr_rule_hash_size_param]; while(rule) { rpc->add(c, "d", rule->prefix_len); @@ -243,4 +263,4 @@ rpc_export_t lcr_rpc[] = { {"lcr.load_gws", load_gws, load_gws_doc, 0}, {0, 0, 0, 0} }; -/* clang-format on */ \ No newline at end of file +/* clang-format on */

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019