sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
313 discussions

Simple Feature / Help
by Brandon Armstead 10 Nov '20

10 Nov '20

Hello all, I'm looking to add a -C [filename] flag that will read the root kamailio.cfg file and its included files and dump the compiled result and exit. i.e. kamailio -C /path/to/root/file.cfg [ DUMPS COMPILED CONFIGURATION INCLUDING / IMPORTS & INCLUSIONS ] Similar to nginx -T I attempted to research what files are involved and it looks like: src/main.c src/core/cfg.lex src/core/lex.yy.c src/core/cfg.tab.c src/core/cfg.tab.h Problems, I'm having: 1) It looks like I need to add the -C option similar to the -c option, which I've done and it does not recognize the new -C flag. 2) I'm not entirely sure how to access the compiled configuration from memory, it looks like yyparse maybe involved in compiling the configuration? sr_push_yy_state seems to do some compiling, but how do I access the result from src/main.c ? Any further direction or help with this is appreciated. - Brandon

3 3

git:master:1750d195: core: groupped --cfg-print state switch condition in a function
by Daniel-Constantin Mierla 10 Nov '20

10 Nov '20

Module: kamailio Branch: master Commit: 1750d195ccd5de80ac586b902d6f05c2f3703a33 URL: https://github.com/kamailio/kamailio/commit/1750d195ccd5de80ac586b902d6f05c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-10T16:15:47+01:00 core: groupped --cfg-print state switch condition in a function --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/1750d195ccd5de80ac586b902d6f05c… Patch: https://github.com/kamailio/kamailio/commit/1750d195ccd5de80ac586b902d6f05c…

1 0

git:master:d40d23da: core: print also define value during --cfg-print
by Daniel-Constantin Mierla 10 Nov '20

10 Nov '20

Module: kamailio Branch: master Commit: d40d23da34634ca0cfb35fa561189ffe08d850d2 URL: https://github.com/kamailio/kamailio/commit/d40d23da34634ca0cfb35fa561189ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-10T16:00:35+01:00 core: print also define value during --cfg-print --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/d40d23da34634ca0cfb35fa561189ff… Patch: https://github.com/kamailio/kamailio/commit/d40d23da34634ca0cfb35fa561189ff… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index f497122a78..deae026250 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1334,6 +1334,7 @@ IMPORTFILE "import_file" } } <DEFINE_DATA>. { count(); + ksr_print_cfg_part(yytext); addstr(&s_buf, yytext, yyleng); } <INITIAL>{PREP_START}{SUBST} { count(); return SUBST;}

1 0

git:master:7a88baf9: core: evalute define expressions in config for --cfg-print option
by Daniel-Constantin Mierla 10 Nov '20

10 Nov '20

Module: kamailio Branch: master Commit: 7a88baf9b0dbd4e46557278eaaaf755a5f4350a9 URL: https://github.com/kamailio/kamailio/commit/7a88baf9b0dbd4e46557278eaaaf755… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-10T15:56:00+01:00 core: evalute define expressions in config for --cfg-print option --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/7a88baf9b0dbd4e46557278eaaaf755… Patch: https://github.com/kamailio/kamailio/commit/7a88baf9b0dbd4e46557278eaaaf755… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 76f4ba0491..f497122a78 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -119,6 +119,7 @@ static void pp_ifdef(); static void pp_else(); static void pp_endif(); + static void ksr_print_cfg_part(char *text); %} @@ -1283,32 +1284,55 @@ IMPORTFILE "import_file" } sr_cfg_compat=SR_COMPAT_MAX;} -<INITIAL>{PREP_START}{DEFINE}{EAT_ABLE}+ { count(); pp_define_set_type(0); +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFINE}{EAT_ABLE}+ { count(); + ksr_print_cfg_part(yytext); + pp_define_set_type(0); state = DEFINE_S; BEGIN(DEFINE_ID); } -<INITIAL>{PREP_START}{TRYDEF}{EAT_ABLE}+ { count(); pp_define_set_type(1); +<INITIAL,CFGPRINTMODE>{PREP_START}{TRYDEF}{EAT_ABLE}+ { count(); + ksr_print_cfg_part(yytext); + pp_define_set_type(1); state = DEFINE_S; BEGIN(DEFINE_ID); } -<INITIAL>{PREP_START}{REDEF}{EAT_ABLE}+ { count(); pp_define_set_type(2); +<INITIAL,CFGPRINTMODE>{PREP_START}{REDEF}{EAT_ABLE}+ { count(); + ksr_print_cfg_part(yytext); + pp_define_set_type(2); state = DEFINE_S; BEGIN(DEFINE_ID); } <DEFINE_ID>{ID}{MINUS} { count(); + ksr_print_cfg_part(yytext); LM_CRIT( "error at %s line %d: '-' not allowed\n", (finame)?finame:"cfg", line); exit(-1); } <DEFINE_ID>{ID} { count(); + ksr_print_cfg_part(yytext); if (pp_define(yyleng, yytext)) return 1; state = DEFINE_EOL_S; BEGIN(DEFINE_EOL); } -<DEFINE_EOL>{EAT_ABLE} { count(); } +<DEFINE_EOL>{EAT_ABLE} { count(); ksr_print_cfg_part(yytext); } <DEFINE_EOL>{CR} { count(); - state = INITIAL; BEGIN(INITIAL); } + ksr_print_cfg_part(yytext); + state = INITIAL; + if(ksr_cfg_print_mode == 1) { + BEGIN(CFGPRINTMODE); + } else { + BEGIN(INITIAL); + } + } <DEFINE_EOL>. { count(); + ksr_print_cfg_part(yytext); addstr(&s_buf, yytext, yyleng); state = DEFINE_DATA_S; BEGIN(DEFINE_DATA); } -<DEFINE_DATA>\\{CR} { count(); } /* eat the escaped CR */ +<DEFINE_DATA>\\{CR} { count(); ksr_print_cfg_part(yytext); } /* eat the escaped CR */ <DEFINE_DATA>{CR} { count(); + ksr_print_cfg_part(yytext); if (pp_define_set(strlen(s_buf.s), s_buf.s)) return 1; memset(&s_buf, 0, sizeof(s_buf)); - state = INITIAL; BEGIN(INITIAL); } + state = INITIAL; + if(ksr_cfg_print_mode == 1) { + BEGIN(CFGPRINTMODE); + } else { + BEGIN(INITIAL); + } + } <DEFINE_DATA>. { count(); addstr(&s_buf, yytext, yyleng); } @@ -1454,6 +1478,12 @@ IMPORTFILE "import_file" %% +static void ksr_print_cfg_part(char *text) +{ + if(ksr_cfg_print_mode == 1) { + printf("%s", text); + } +} static char* addchar(struct str_buf* dst, char c) {

1 0

git:master:0b379b81: kamctl: removed old fine after renaming module to userblocklist
by Daniel-Constantin Mierla 10 Nov '20

10 Nov '20

Module: kamailio Branch: master Commit: 0b379b81364f61e91288379aade4eea7613b253a URL: https://github.com/kamailio/kamailio/commit/0b379b81364f61e91288379aade4eea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-10T15:37:36+01:00 kamctl: removed old fine after renaming module to userblocklist --- Removed: utils/kamctl/db_berkeley/kamailio/globalblacklist Removed: utils/kamctl/db_berkeley/kamailio/userblacklist Removed: utils/kamctl/db_redis/kamailio/globalblacklist Removed: utils/kamctl/db_redis/kamailio/userblacklist Removed: utils/kamctl/db_sqlite/userblacklist-create.sql Removed: utils/kamctl/dbtext/kamailio/globalblacklist Removed: utils/kamctl/dbtext/kamailio/userblacklist Removed: utils/kamctl/mongodb/kamailio/globalblacklist.json Removed: utils/kamctl/mongodb/kamailio/userblacklist.json Removed: utils/kamctl/mysql/userblacklist-create.sql Removed: utils/kamctl/oracle/userblacklist-create.sql Removed: utils/kamctl/postgres/userblacklist-create.sql Removed: utils/kamctl/xhttp_pi/userblacklist-mod Removed: utils/kamctl/xhttp_pi/userblacklist-table --- Diff: https://github.com/kamailio/kamailio/commit/0b379b81364f61e91288379aade4eea… Patch: https://github.com/kamailio/kamailio/commit/0b379b81364f61e91288379aade4eea…

1 0

git:master:87365947: doc: renamed rpc list files to userblocklist
by Daniel-Constantin Mierla 10 Nov '20

10 Nov '20

Module: kamailio Branch: master Commit: 8736594784ff56df3a3496c19c17ac1513437488 URL: https://github.com/kamailio/kamailio/commit/8736594784ff56df3a3496c19c17ac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-10T15:34:03+01:00 doc: renamed rpc list files to userblocklist --- Added: doc/tutorials/rpc_list/docbook/rpc_userblocklist.xml Added: doc/tutorials/rpc_list/rpc_userblocklist.txt Removed: doc/tutorials/rpc_list/docbook/rpc_userblacklist.xml Removed: doc/tutorials/rpc_list/rpc_userblacklist.txt --- Diff: https://github.com/kamailio/kamailio/commit/8736594784ff56df3a3496c19c17ac1… Patch: https://github.com/kamailio/kamailio/commit/8736594784ff56df3a3496c19c17ac1… --- diff --git a/doc/tutorials/rpc_list/docbook/rpc_userblacklist.xml b/doc/tutorials/rpc_list/docbook/rpc_userblocklist.xml similarity index 69% rename from doc/tutorials/rpc_list/docbook/rpc_userblacklist.xml rename to doc/tutorials/rpc_list/docbook/rpc_userblocklist.xml index a92e4950e0..67a7d44ca4 100644 --- a/doc/tutorials/rpc_list/docbook/rpc_userblacklist.xml +++ b/doc/tutorials/rpc_list/docbook/rpc_userblocklist.xml @@ -8,9 +8,9 @@ RPC Exports for userblacklist </title> -<section id="userblacklist.reload_blacklist"><title>userblacklist.reload_blacklist</title> +<section id="userblocklist.reload_blacklist"><title>userblocklist.reload_blocklist</title> <para> - Documentation missing (ubl_rpc_reload_blacklist_doc). + Documentation missing (ubl_rpc_reload_blocklist_doc). </para> <para> </para> diff --git a/doc/tutorials/rpc_list/rpc_userblacklist.txt b/doc/tutorials/rpc_list/rpc_userblacklist.txt deleted file mode 100644 index 32e56444c0..0000000000 --- a/doc/tutorials/rpc_list/rpc_userblacklist.txt +++ /dev/null @@ -1,9 +0,0 @@ -RPC Exports for userblacklist -============================= - - [ this file is autogenerated, do not edit ] - - - 1. userblacklist.reload_blacklist - Documentation missing (ubl_rpc_reload_blacklist_doc). - diff --git a/doc/tutorials/rpc_list/rpc_userblocklist.txt b/doc/tutorials/rpc_list/rpc_userblocklist.txt new file mode 100644 index 0000000000..b3c8675a17 --- /dev/null +++ b/doc/tutorials/rpc_list/rpc_userblocklist.txt @@ -0,0 +1,9 @@ +RPC Exports for userblocklist +============================= + + [ this file is autogenerated, do not edit ] + + + 1. userblocklist.reload_blocklist + Documentation missing (ubl_rpc_reload_blocklist_doc). +

1 0

[kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
by Lucian Balaceanu 10 Nov '20

10 Nov '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2544 -- Commit Summary -- * userblocklist: renaming userblacklist module * src/lib/srdb1/schema: renaming userblacklist to userblocklist * src/lib/srdb1/schema: replacing denomination to blocklist/allowlist -- File Changes -- M src/Makefile.groups (2) R src/lib/srdb1/schema/globalblocklist.xml (18) R src/lib/srdb1/schema/kamailio-userblocklist.xml (4) R src/lib/srdb1/schema/userblocklist.xml (22) D src/modules/userblacklist/db_userblacklist.c (116) D src/modules/userblacklist/db_userblacklist.h (100) R src/modules/userblocklist/Makefile (2) R src/modules/userblocklist/README (348) R src/modules/userblocklist/db.c (38) R src/modules/userblocklist/db.h (10) A src/modules/userblocklist/db_userblocklist.c (116) A src/modules/userblocklist/db_userblocklist.h (100) R src/modules/userblocklist/doc/Makefile (2) R src/modules/userblocklist/doc/userblocklist.xml (4) R src/modules/userblocklist/doc/userblocklist_admin.xml (270) R src/modules/userblocklist/userblocklist.c (404) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2544.patch https://github.com/kamailio/kamailio/pull/2544.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/2544

2 9

git:master:7563a52e: Merge pull request #2544 from lbalaceanu/master
by GitHub 10 Nov '20

10 Nov '20

Module: kamailio Branch: master Commit: 7563a52eab3043a389e50eb3e21dcb359c054cf9 URL: https://github.com/kamailio/kamailio/commit/7563a52eab3043a389e50eb3e21dcb3… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2020-11-10T15:15:24+02:00 Merge pull request #2544 from lbalaceanu/master Renaming userblacklist to userblocklist --- Added: src/lib/srdb1/schema/globalblocklist.xml Added: src/lib/srdb1/schema/kamailio-userblocklist.xml Added: src/lib/srdb1/schema/userblocklist.xml Added: src/modules/userblocklist/Makefile Added: src/modules/userblocklist/README Added: src/modules/userblocklist/db.c Added: src/modules/userblocklist/db.h Added: src/modules/userblocklist/db_userblocklist.c Added: src/modules/userblocklist/db_userblocklist.h Added: src/modules/userblocklist/doc/Makefile Added: src/modules/userblocklist/doc/userblocklist.xml Added: src/modules/userblocklist/doc/userblocklist_admin.xml Added: src/modules/userblocklist/userblocklist.c Added: utils/kamctl/db_berkeley/kamailio/globalblocklist Added: utils/kamctl/db_berkeley/kamailio/userblocklist Added: utils/kamctl/db_redis/kamailio/globalblocklist Added: utils/kamctl/db_redis/kamailio/userblocklist Added: utils/kamctl/db_sqlite/userblocklist-create.sql Added: utils/kamctl/dbtext/kamailio/globalblocklist Added: utils/kamctl/dbtext/kamailio/userblocklist Added: utils/kamctl/mongodb/kamailio/globalblocklist.json Added: utils/kamctl/mongodb/kamailio/userblocklist.json Added: utils/kamctl/mysql/userblocklist-create.sql Added: utils/kamctl/oracle/userblocklist-create.sql Added: utils/kamctl/postgres/userblocklist-create.sql Added: utils/kamctl/xhttp_pi/userblocklist-mod Added: utils/kamctl/xhttp_pi/userblocklist-table Modified: src/Makefile.groups Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/kamdbctl.base Modified: utils/kamctl/xhttp_pi/pi_framework.xml Removed: src/lib/srdb1/schema/globalblacklist.xml Removed: src/lib/srdb1/schema/kamailio-userblacklist.xml Removed: src/lib/srdb1/schema/userblacklist.xml Removed: src/modules/userblacklist/Makefile Removed: src/modules/userblacklist/README Removed: src/modules/userblacklist/db.c Removed: src/modules/userblacklist/db.h Removed: src/modules/userblacklist/db_userblacklist.c Removed: src/modules/userblacklist/db_userblacklist.h Removed: src/modules/userblacklist/doc/Makefile Removed: src/modules/userblacklist/doc/userblacklist.xml Removed: src/modules/userblacklist/doc/userblacklist_admin.xml Removed: src/modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/7563a52eab3043a389e50eb3e21dcb3… Patch: https://github.com/kamailio/kamailio/commit/7563a52eab3043a389e50eb3e21dcb3…

1 0

git:master:b1af4ec9: kamctl: regenerated db schema for userblocklist
by Lucian Balaceanu 10 Nov '20

10 Nov '20

Module: kamailio Branch: master Commit: b1af4ec9f976febd2efb5e657938ff731d8151df URL: https://github.com/kamailio/kamailio/commit/b1af4ec9f976febd2efb5e657938ff7… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2020-11-09T13:42:44+02:00 kamctl: regenerated db schema for userblocklist --- Added: utils/kamctl/db_berkeley/kamailio/globalblocklist Added: utils/kamctl/db_berkeley/kamailio/userblocklist Added: utils/kamctl/db_redis/kamailio/globalblocklist Added: utils/kamctl/db_redis/kamailio/userblocklist Added: utils/kamctl/db_sqlite/userblocklist-create.sql Added: utils/kamctl/dbtext/kamailio/globalblocklist Added: utils/kamctl/dbtext/kamailio/userblocklist Added: utils/kamctl/mongodb/kamailio/globalblocklist.json Added: utils/kamctl/mongodb/kamailio/userblocklist.json Added: utils/kamctl/mysql/userblocklist-create.sql Added: utils/kamctl/oracle/userblocklist-create.sql Added: utils/kamctl/postgres/userblocklist-create.sql Added: utils/kamctl/xhttp_pi/userblocklist-mod Added: utils/kamctl/xhttp_pi/userblocklist-table Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/b1af4ec9f976febd2efb5e657938ff7… Patch: https://github.com/kamailio/kamailio/commit/b1af4ec9f976febd2efb5e657938ff7…

1 0

git:master:719c2987: kamctl: rename userblacklist to userblocklist
by Lucian Balaceanu 10 Nov '20

10 Nov '20

Module: kamailio Branch: master Commit: 719c2987fcd02186554ed880c75a8e229804c8f8 URL: https://github.com/kamailio/kamailio/commit/719c2987fcd02186554ed880c75a8e2… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2020-11-09T11:51:11+02:00 kamctl: rename userblacklist to userblocklist --- Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/719c2987fcd02186554ed880c75a8e2… Patch: https://github.com/kamailio/kamailio/commit/719c2987fcd02186554ed880c75a8e2… --- diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 3846196b20..4cfd11c4f9 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -39,7 +39,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs usr_preferences aliases silo dialog dialog_vars dispatcher dialplan acc_cdrs topos_d topos_t'} EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy - carrierroute carrier_name domain_name carrierfailureroute userblacklist + carrierroute carrier_name domain_name carrierfailureroute userblocklist globalblacklist htable purplemap uacreg pl_pipes mtree mtrees sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine dr_gateways dr_rules dr_gw_lists dr_groups secfilter'} @@ -76,7 +76,7 @@ STANDARD_MODULES=${STANDARD_MODULES:-'standard acc lcr domain group PRESENCE_MODULES=${PRESENCE_MODULES:-'presence rls'} EXTRA_MODULES=${EXTRA_MODULES:-'imc cpl siptrace domainpolicy carrierroute - drouting userblacklist htable purple uac pipelimit mtree sca mohqueue + drouting userblocklist htable purple uac pipelimit mtree sca mohqueue rtpproxy rtpengine secfilter'} DBUID_MODULES=${UID_MODULES:-'uid_auth_db uid_avp_db uid_domain uid_gflags

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
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 November 2020