sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
418 discussions

git:master:8c318356: pkg/docker: update submodule
by Sergey Safarov 04 Jan '20

04 Jan '20

Module: kamailio Branch: master Commit: 8c3183569aa79214cf6b74196438962f63f8ef9e URL: https://github.com/kamailio/kamailio/commit/8c3183569aa79214cf6b74196438962… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-01-04T23:51:42+03:00 pkg/docker: update submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/8c3183569aa79214cf6b74196438962… Patch: https://github.com/kamailio/kamailio/… [View More]

1 0

[kamailio/kamailio] dmq_usrloc: use DEBUG loglevel for message (#2189)
by Emmanuel Schmidbauer 03 Jan '20

03 Jan '20

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2189 -- Commit Summary -- * dmq_usrloc: use DEBUG loglevel for message -- File Changes -- M src/modules/dmq_usrloc/usrloc_sync.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2189.patch https://github.com/kamailio/kamailio/pull/2189.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/2189

2 2

git:master:32529289: Merge pull request #2189 from kamailio/dmq_usrloc-fix-log-message
by GitHub 03 Jan '20

03 Jan '20

Module: kamailio Branch: master Commit: 325292897d5ecdbdd202608fbe84dceaec6cfdac URL: https://github.com/kamailio/kamailio/commit/325292897d5ecdbdd202608fbe84dce… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2020-01-03T08:42:55-05:00 Merge pull request #2189 from kamailio/dmq_usrloc-fix-log-message dmq_usrloc: use DEBUG loglevel for message --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/… [View More]

1 0

git:master:21358270: dmq_usrloc: use DEBUG loglevel for message
by Emmanuel Schmidbauer 03 Jan '20

03 Jan '20

Module: kamailio Branch: master Commit: 21358270e49855f668dd01f3e4d9a00dc4c356a7 URL: https://github.com/kamailio/kamailio/commit/21358270e49855f668dd01f3e4d9a00… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2020-01-02T10:58:35-05:00 dmq_usrloc: use DEBUG loglevel for message --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:2c4faf26: modules: readme files regenerated - avpops ... [skip ci]
by Kamailio Dev 03 Jan '20

03 Jan '20

Module: kamailio Branch: master Commit: 2c4faf265abf0502a840d5068c37e453a96f25f4 URL: https://github.com/kamailio/kamailio/commit/2c4faf265abf0502a840d5068c37e45… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-03T09:46:15+01:00 modules: readme files regenerated - avpops ... [skip ci] --- Modified: src/modules/avpops/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]2c4faf265abf0502a840d5068c37e45… Patch: https://github.com/kamailio/kamailio/commit/2c4faf265abf0502a840d5068c37e45… --- diff --git a/src/modules/avpops/README b/src/modules/avpops/README index 0c199f1754..e30b9bae22 100644 --- a/src/modules/avpops/README +++ b/src/modules/avpops/README @@ -49,9 +49,10 @@ Ramona-Elena Modroiu 5.8. avp_copy(old_name,new_name) 5.9. avp_printf(dest, format) 5.10. avp_subst(avps, subst) - 5.11. avp_op(name,op_value) - 5.12. is_avp_set(name) - 5.13. avp_print() + 5.11. avp_subst_pv(avps, subst) + 5.12. avp_op(name,op_value) + 5.13. is_avp_set(name) + 5.14. avp_print() List of Examples @@ -76,9 +77,10 @@ Ramona-Elena Modroiu 1.19. avp_copy usage 1.20. avp_printf usage 1.21. avp_subst usage - 1.22. avp_op usage - 1.23. is_avp_set usage - 1.24. avp_print usage + 1.22. avp_subst_pv usage + 1.23. avp_op usage + 1.24. is_avp_set usage + 1.25. avp_print usage Chapter 1. Admin Guide @@ -116,9 +118,10 @@ Chapter 1. Admin Guide 5.8. avp_copy(old_name,new_name) 5.9. avp_printf(dest, format) 5.10. avp_subst(avps, subst) - 5.11. avp_op(name,op_value) - 5.12. is_avp_set(name) - 5.13. avp_print() + 5.11. avp_subst_pv(avps, subst) + 5.12. avp_op(name,op_value) + 5.13. is_avp_set(name) + 5.14. avp_print() 1. Overview @@ -345,9 +348,10 @@ modparam("avpops","db_scheme", 5.8. avp_copy(old_name,new_name) 5.9. avp_printf(dest, format) 5.10. avp_subst(avps, subst) - 5.11. avp_op(name,op_value) - 5.12. is_avp_set(name) - 5.13. avp_print() + 5.11. avp_subst_pv(avps, subst) + 5.12. avp_op(name,op_value) + 5.13. is_avp_set(name) + 5.14. avp_print() 5.1. avp_db_load(source,name) @@ -657,7 +661,29 @@ avp_subst("$avp(i:678)/$avp(i:679)/g", "/(.*)@(.*)/\1@$rd/"); after the first src_avp is processed, it will be added in avp list and next processing will use it. -5.11. avp_op(name,op_value) +5.11. avp_subst_pv(avps, subst) + + Same functionality than avp_subst() but seccond parameter will be + evaluated first. + + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + BRANCH_ROUTE, LOCAL_ROUTE and ONREPLY_ROUTE. + + Example 1.22. avp_subst_pv usage +... +$(avp(src)[*]) = "testME"; +$var(z) = "j"; +$var(y) = "e"; +$var(x) = "/" + $var(y) + "/" + $var(z) + "/gi"; + +## all this calls will produce the same result "tjstMj" +avp_subst_pv("$avp(src)", "/e/j/gi"); +avp_subst_pv("$avp(src)", "/" + $var(y) + "/" + $var(z) + "/gi"); +avp_subst_pv("$avp(src)", "/$var(y)/$var(z)/gi"); +avp_subst_pv("$avp(src)", "$var(x)"); +... + +5.12. avp_op(name,op_value) Different integer operations with avps. @@ -683,13 +709,13 @@ avp_subst("$avp(i:678)/$avp(i:679)/g", "/(.*)@(.*)/\1@$rd/"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, LOCAL_ROUTE and ONREPLY_ROUTE. - Example 1.22. avp_op usage + Example 1.23. avp_op usage ... avp_op("$avp(i:678)", "add/i:345/g"); avp_op("$avp(number)","sub/$avp(number2)/d"); ... -5.12. is_avp_set(name) +5.13. is_avp_set(name) Check if any AVP with name is set. @@ -702,13 +728,13 @@ avp_op("$avp(number)","sub/$avp(number2)/d"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, LOCAL_ROUTE and ONREPLY_ROUTE. - Example 1.23. is_avp_set usage + Example 1.24. is_avp_set usage ... if(is_avp_set("$avp(i:678)")) log("AVP with integer id 678 exists\n"); ... -5.13. avp_print() +5.14. avp_print() Prints the list with all the AVPs from memory. This is only a helper/debug function. @@ -716,7 +742,7 @@ if(is_avp_set("$avp(i:678)")) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, LOCAL_ROUTE and ONREPLY_ROUTE. - Example 1.24. avp_print usage + Example 1.25. avp_print usage ... avp_print(); ... [View Less]

1 0

[kamailio/kamailio] avpops: avp_subst() support pvar as subst parameter (#2158)
by Victor Seva 03 Jan '20

03 Jan '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual … [View More]

3 10

git:master:5c8ddbc6: avpops: add avp_subst_pv() documentation
by Victor Seva 03 Jan '20

03 Jan '20

Module: kamailio Branch: master Commit: 5c8ddbc64f556e4fec1f0e1215a42abb0b010cd3 URL: https://github.com/kamailio/kamailio/commit/5c8ddbc64f556e4fec1f0e1215a42ab… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-01-03T09:44:07+01:00 avpops: add avp_subst_pv() documentation --- Modified: src/modules/avpops/doc/avpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:3693ab0b: avpops: add avp_subst_pv()
by Victor Seva 03 Jan '20

03 Jan '20

Module: kamailio Branch: master Commit: 3693ab0bbb5254e4286e1894884380295e99ad52 URL: https://github.com/kamailio/kamailio/commit/3693ab0bbb5254e4286e18948843802… Author: Kirill Solomko <ksolomko(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-01-03T09:44:07+01:00 avpops: add avp_subst_pv() * same functionality as avp_subst() but second parameter will be evaluated before calling subst. --- Modified: src/modules/avpops/avpops.c --- … [View More]Diff: https://github.com/kamailio/kamailio/commit/3693ab0bbb5254e4286e18948843802… Patch: https://github.com/kamailio/kamailio/commit/3693ab0bbb5254e4286e18948843802… --- diff --git a/src/modules/avpops/avpops.c b/src/modules/avpops/avpops.c index 0805407cff..3d8f949b39 100644 --- a/src/modules/avpops/avpops.c +++ b/src/modules/avpops/avpops.c @@ -67,6 +67,8 @@ static int fixup_pushto_avp(void** param, int param_no); static int fixup_check_avp(void** param, int param_no); static int fixup_op_avp(void** param, int param_no); static int fixup_subst(void** param, int param_no); +static int fixup_subst_pv(void** param, int param_no); +static int fixup_free_subst_pv(void** param, int param_no); static int fixup_is_avp_set(void** param, int param_no); static int w_print_avps(struct sip_msg* msg, char* foo, char *bar); @@ -81,6 +83,7 @@ static int w_pushto_avps(struct sip_msg* msg, char* destination, char *param); static int w_check_avps(struct sip_msg* msg, char* param, char *check); static int w_op_avps(struct sip_msg* msg, char* param, char *op); static int w_subst(struct sip_msg* msg, char* src, char *subst); +static int w_subst_pv(struct sip_msg* msg, char* src, char *param); static int w_is_avp_set(struct sip_msg* msg, char* param, char *foo); /*! \brief @@ -111,6 +114,9 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"avp_subst", (cmd_function)w_subst, 2, fixup_subst, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, + {"avp_subst_pv", (cmd_function)w_subst_pv, 2, fixup_subst_pv, + fixup_free_subst_pv, + REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"is_avp_set", (cmd_function)w_is_avp_set, 1, fixup_is_avp_set, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -708,6 +714,16 @@ static int fixup_check_avp(void** param, int param_no) return 0; } +static int fixup_subst_pv(void** param, int param_no) +{ + if(param_no==1) { + return fixup_subst(param, param_no); + } else if (param_no==2) { + return fixup_var_str_2(param, param_no); + } + return 0; +} + static int fixup_subst(void** param, int param_no) { struct subst_expr* se; @@ -841,6 +857,14 @@ static int fixup_subst(void** param, int param_no) return 0; } +static int fixup_free_subst_pv(void** param, int param_no) +{ + if (param_no==2) + fparam_free_restore(param); + + return 0; +} + static int fixup_op_avp(void** param, int param_no) { struct fis_param *ap; @@ -1054,6 +1078,40 @@ static int w_subst(struct sip_msg* msg, char* src, char *subst) return ops_subst(msg, (struct fis_param**)src, (struct subst_expr*)subst); } +static int w_subst_pv(struct sip_msg* msg, char* src, char *param) +{ + str tstr = STR_NULL; + str subst = STR_NULL; + struct subst_expr* se; + fparam_t *fp; + int res; + + fp = (fparam_t*)param; + if(get_str_fparam(&tstr, msg, fp) != 0) + { + LM_ERR("error fetching subst re\n"); + return -1; + } + + LM_DBG("preparing to evaluate: [%.*s]\n", tstr.len, tstr.s); + if(pv_eval_str(msg, &subst, &tstr)<0){ + subst.s = tstr.s; + subst.len = tstr.len; + } + + LM_DBG("preparing %s\n", subst.s); + se = subst_parser(&subst); + if(se==0) + { + LM_ERR("bad subst re %s\n", subst.s); + return E_BAD_RE; + } + + res = ops_subst(msg, (struct fis_param**)src, se); + subst_expr_free(se); + return res; +} + static int w_is_avp_set(struct sip_msg* msg, char* param, char *op) { return ops_is_avp_set(msg, (struct fis_param*)param); [View Less]

1 0

[kamailio/kamailio] core: stop start if ifdef check fails (#2183)
by Victor Seva 03 Jan '20

03 Jan '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, ...) - [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) - [] New feature (non-breaking change which adds new functionality) - [X] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #2057 #### Description If the config doesn't have the same amount of if[n]def endif directives, don't start it You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2183 -- Commit Summary -- * core: stop start if ifdef check fails -- File Changes -- M src/core/ppcfg.c (20) M src/core/ppcfg.h (3) M src/main.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2183.patch https://github.com/kamailio/kamailio/pull/2183.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/2183 [View Less]

2 2

git:master:992dcdab: core: stop start if ifdef check fails
by Victor Seva 03 Jan '20

03 Jan '20

Module: kamailio Branch: master Commit: 992dcdabbb42394ad694354cf283a3beb7b66878 URL: https://github.com/kamailio/kamailio/commit/992dcdabbb42394ad694354cf283a3b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-01-03T09:43:23+01:00 core: stop start if ifdef check fails Related #2057 --- Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/main.c --- Diff: https://github.com/… [View More]kamailio/kamailio/commit/992dcdabbb42394ad694354cf283a3b… Patch: https://github.com/kamailio/kamailio/commit/992dcdabbb42394ad694354cf283a3b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 584a491ba2..115707aa00 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -216,19 +216,27 @@ void pp_ifdef_level_update(int val) /** * */ -void pp_ifdef_level_check(void) +int pp_ifdef_level_check(void) +{ + if(_pp_ifdef_level!=0) { + return -1; + } else { + LM_DBG("same number of pairing preprocessor directives" + " #!IF[N]DEF - #!ENDIF\n"); + } + return 0; +} + +void pp_ifdef_level_error(void) { if(_pp_ifdef_level!=0) { if (_pp_ifdef_level > 0) { - LM_WARN("different number of preprocessor directives:" + LM_ERR("different number of preprocessor directives:" " %d more #!if[n]def as #!endif\n", _pp_ifdef_level); } else { - LM_WARN("different number of preprocessor directives:" + LM_ERR("different number of preprocessor directives:" " %d more #!endif as #!if[n]def\n", (_pp_ifdef_level)*-1); } - } else { - LM_DBG("same number of pairing preprocessor directives" - " #!IF[N]DEF - #!ENDIF\n"); } } diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 8485059918..6fbd8a3521 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -44,7 +44,8 @@ int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); void pp_ifdef_level_update(int val); -void pp_ifdef_level_check(void); +int pp_ifdef_level_check(void); +void pp_ifdef_level_error(void); void pp_define_core(void); diff --git a/src/main.c b/src/main.c index 0bc2e650dc..1c62c6d130 100644 --- a/src/main.c +++ b/src/main.c @@ -2299,10 +2299,10 @@ int main(int argc, char** argv) yyin=cfg_stream; debug_save = default_core_cfg.debug; - if ((yyparse()!=0)||(cfg_errors)){ + if ((yyparse()!=0)||(cfg_errors)||(pp_ifdef_level_check()<0)){ fprintf(stderr, "ERROR: bad config file (%d errors)\n", cfg_errors); if (debug_flag) default_core_cfg.debug = debug_save; - pp_ifdef_level_check(); + pp_ifdef_level_error(); goto error; } @@ -2310,7 +2310,6 @@ int main(int argc, char** argv) fprintf(stderr, "%d config warnings\n", cfg_warnings); } if (debug_flag) default_core_cfg.debug = debug_save; - pp_ifdef_level_check(); print_rls(); if(init_dst_set()<0) { [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020