- sr-dev - kamailio.org

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: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: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: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

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

[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

git:master:198dcde0: modules: readme files regenerated - dmq_usrloc ... [skip ci]
by Kamailio Dev 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: 198dcde016514de3701e0cf1018a7427ee490f04 URL: https://github.com/kamailio/kamailio/commit/198dcde016514de3701e0cf1018a742… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-02T21:46:10+01:00 modules: readme files regenerated - dmq_usrloc ... [skip ci] --- Modified: src/modules/dmq_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] dmq_usrloc: replicate_socket_info using dmq (#2175)
by Nuno M Reis 02 Jan '20

02 Jan '20

- replicate_socket_info using dmq through a new modparam - useful for anycast scenarios You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2175 -- Commit Summary -- * dmq_usrloc: replicate_socket_info using dmq -- File Changes -- M src/modules/dmq_usrloc/dmq_usrloc.c (2) M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (33) M src/modules/dmq_usrloc/usrloc_sync.c (30) -- Patch Links -- https://github.com/kamailio/… [View More]

3 3

git:master:c60e6aac: Merge pull request #2175 from nmreis/PR_replicate_socket_info
by GitHub 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: c60e6aacb99a8e03e954edbf148cabc5573f9082 URL: https://github.com/kamailio/kamailio/commit/c60e6aacb99a8e03e954edbf148cabc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-01-02T21:42:21+01:00 Merge pull request #2175 from nmreis/PR_replicate_socket_info dmq_usrloc: replicate_socket_info using dmq --- Modified: src/modules/dmq_usrloc/dmq_usrloc.c Modified: src/modules/dmq_usrloc/… [View More]

1 0

git:master:a830504f: dmq_usrloc: replicate_socket_info using dmq
by Nuno M Reis 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: a830504f76850dff71653fb684b9c5495e895b32 URL: https://github.com/kamailio/kamailio/commit/a830504f76850dff71653fb684b9c54… Author: Nuno M Reis <nreis(a)gocontact.pt> Committer: Nuno M Reis <nreis(a)gocontact.pt> Date: 2019-12-09T18:57:37Z dmq_usrloc: replicate_socket_info using dmq - replicate_socket_info using dmq through a new modparam - useful for anycast scenarios --- Modified: src/modules/dmq_usrloc/dmq_usrloc.c Modified: src/… [View More]

1 0

git:master:2b118d4e: modules: readme files regenerated - rtpproxy ... [skip ci]
by Kamailio Dev 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: 2b118d4e1bf9f70c7d2b5a3e63fe7a5ecf68b697 URL: https://github.com/kamailio/kamailio/commit/2b118d4e1bf9f70c7d2b5a3e63fe7a5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-02T16:16:20+01:00 modules: readme files regenerated - rtpproxy ... [skip ci] --- Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] src/modules/rtpproxy: Updated FAQ about MSRP support (#2185)
by sergey-safarov 02 Jan '20

02 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature … [View More]

2 1

git:master:873f0218: Merge pull request #2185 from sergey-safarov/doc-rtpproxy
by GitHub 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: 873f0218023a1b66921a1a407ffe4416ada92208 URL: https://github.com/kamailio/kamailio/commit/873f0218023a1b66921a1a407ffe441… Author: Olle E. Johansson <oej(a)edvina.net> Committer: GitHub <noreply(a)github.com> Date: 2020-01-02T16:10:44+01:00 Merge pull request #2185 from sergey-safarov/doc-rtpproxy src/modules/rtpproxy: Updated FAQ about MSRP support --- Modified: src/modules/rtpproxy/doc/rtpproxy_faq.xml --- Diff: https://github.com/… [View More]

1 0

git:master:347a3d13: src/modules/rtpproxy: Updated FAQ about MSRP support
by Sergey Safarov 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: 347a3d1399389335102869b9253ec07fed521613 URL: https://github.com/kamailio/kamailio/commit/347a3d1399389335102869b9253ec07… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-25T15:13:29+03:00 src/modules/rtpproxy: Updated FAQ about MSRP support --- Modified: src/modules/rtpproxy/doc/rtpproxy_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] function to count medias in SDP (#2184)
by sergey-safarov 25 Dec '19

25 Dec '19

### Description I want proxy MSRP session on kamailio. Do to this I must rewrite connection information for session for case when used only one media `message`. Otherwise need to rewrite connection information for only one `message` media. To do this need to know how many medias in SDP present. One or more. Could you add function to count medias in SDP; -- 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/2184

1 2

Merry Christmas and Happy Holidays!
by Daniel-Constantin Mierla 25 Dec '19

25 Dec '19

Another year getting to its end, the season holidays are ahead, therefore it is no better time than now to express my thanks and greetings to all the friends, developers, supporting companies and community members that made 2019 an outstanding year for Kamailio project. Enjoy the holidays! Merry Christmas! Daniel * Santa is flying Kamailio! * -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - April 27-29, 2020, … [View More]

4 3

git:master:b9c50123: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 24 Dec '19

24 Dec '19

Module: kamailio Branch: master Commit: b9c5012333e90d87eb65ab5c0f176834d05b6d57 URL: https://github.com/kamailio/kamailio/commit/b9c5012333e90d87eb65ab5c0f17683… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-24T14:46:26+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/b9c5012333e90d87eb65ab5c0f17683… … [View More]

1 0

git:master:4f42115c: tls: docs - fix example for setting xavp_cfg
by Daniel-Constantin Mierla 24 Dec '19

24 Dec '19

Module: kamailio Branch: master Commit: 4f42115ce29d446ad60b32af9ad370d9b2d847c2 URL: https://github.com/kamailio/kamailio/commit/4f42115ce29d446ad60b32af9ad370d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-24T14:39:17+01:00 tls: docs - fix example for setting xavp_cfg --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

Kamailio at 36c3, Happy holidays
by Henning Westerholt 24 Dec '19

24 Dec '19

Hello, I will be at the 36c3 [1] congress in Leipzig. So, if you are also there and want to chat about Kamailio or other RTC topics, please contact me. I wish you all Merry Christmas and a Happy New Year! Henning [1] https://events.ccc.de/congress/2019/wiki/index.php/Main_Page -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:5.3:1373aedd: pkg/kamailio/obs: packaged evapi module [skip ci]
by Sergey Safarov 21 Dec '19

21 Dec '19

Module: kamailio Branch: 5.3 Commit: 1373aedd261e77c71a0b27b8c4fff72ceb5cd0e7 URL: https://github.com/kamailio/kamailio/commit/1373aedd261e77c71a0b27b8c4fff72… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-21T13:40:33+03:00 pkg/kamailio/obs: packaged evapi module [skip ci] Releated GH #2098 (cherry picked from commit 298abc9eb6240b9567df5166d64eba9f6da078dd) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff:… [View More] https://github.com/kamailio/kamailio/commit/1373aedd261e77c71a0b27b8c4fff72… Patch: https://github.com/kamailio/kamailio/commit/1373aedd261e77c71a0b27b8c4fff72… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6e789f9afd..459ced6ce9 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -7,6 +7,7 @@ %define dist_version %{?fedora} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -32,6 +33,7 @@ %define dist_version %{?centos} %bcond_with cnxcc %bcond_without dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -58,6 +60,7 @@ %define dist .el7.centos %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -84,6 +87,7 @@ %define dist .el8.centos %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_with geoip %bcond_without http_async_client %bcond_without ims @@ -109,6 +113,7 @@ %define dist_version %{?suse_version} %bcond_without cnxcc %bcond_with dnssec +%bcond_with evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -134,6 +139,7 @@ %define dist_version %{?rhel} %bcond_with cnxcc %bcond_without dnssec +%bcond_without evapi %bcond_with geoip %bcond_with http_async_client %bcond_with ims @@ -159,6 +165,7 @@ %define dist_version %{?rhel} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -184,6 +191,7 @@ %define dist_version %{?rhel} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_with geoip %bcond_without http_async_client %bcond_without ims @@ -444,6 +452,21 @@ DNSSEC support for Kamailio. %endif +%if %{with evapi} +%package evapi +Summary: Module can be used to create an event message flow from Kamailio to any application that can connect to a TCP socket +Group: %{PKGGROUP} +Requires: libev, kamailio = %ver +BuildRequires: libev-devel + +%description evapi +The remote application can also issue messages received by Kamailio. +There is no protocol definition, it is all up to the author of the routing script. +Events can be generated for any event in Kamailio. For 3rd party transaction control, a transaction can be automatically +suspended when sending the event, to be resumed at a later point, maybe triggered by an incoming message on the event socket. +%endif + + %if %{with geoip} %package geoip Summary: MaxMind GeoIP support for Kamailio @@ -1112,6 +1135,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with dnssec} kdnssec \ %endif +%if %{with evapi} + kev \ +%endif %if %{with geoip} kgeoip \ %endif @@ -1196,6 +1222,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with dnssec} kdnssec \ %endif +%if %{with evapi} + kev \ +%endif %if %{with geoip} kgeoip \ %endif @@ -1733,6 +1762,14 @@ fi %endif +%if %{with evapi} +%files evapi +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.evapi +%{_libdir}/kamailio/modules/evapi.so +%endif + + %if %{with geoip} %files geoip %defattr(-,root,root) [View Less]

1 0

git:5.2:d2d78cf2: pkg/kamailio/obs: packaged evapi module [skip ci]
by Sergey Safarov 21 Dec '19

21 Dec '19

Module: kamailio Branch: 5.2 Commit: d2d78cf21d7278a847bcbc8e90a7a70a1f240cdd URL: https://github.com/kamailio/kamailio/commit/d2d78cf21d7278a847bcbc8e90a7a70… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-21T13:40:40+03:00 pkg/kamailio/obs: packaged evapi module [skip ci] Releated GH #2098 (cherry picked from commit 298abc9eb6240b9567df5166d64eba9f6da078dd) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff:… [View More] https://github.com/kamailio/kamailio/commit/d2d78cf21d7278a847bcbc8e90a7a70… Patch: https://github.com/kamailio/kamailio/commit/d2d78cf21d7278a847bcbc8e90a7a70… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a2d927a25d..020538ca3d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -7,6 +7,7 @@ %define dist_version %{?fedora} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -32,6 +33,7 @@ %define dist_version %{?centos} %bcond_with cnxcc %bcond_without dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -58,6 +60,7 @@ %define dist .el7.centos %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -84,6 +87,7 @@ %define dist .el8.centos %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_with geoip %bcond_without http_async_client %bcond_without ims @@ -109,6 +113,7 @@ %define dist_version %{?suse_version} %bcond_without cnxcc %bcond_with dnssec +%bcond_with evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -134,6 +139,7 @@ %define dist_version %{?rhel} %bcond_with cnxcc %bcond_without dnssec +%bcond_without evapi %bcond_with geoip %bcond_with http_async_client %bcond_with ims @@ -159,6 +165,7 @@ %define dist_version %{?rhel} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -184,6 +191,7 @@ %define dist_version %{?rhel} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_with geoip %bcond_without http_async_client %bcond_without ims @@ -444,6 +452,21 @@ DNSSEC support for Kamailio. %endif +%if %{with evapi} +%package evapi +Summary: Module can be used to create an event message flow from Kamailio to any application that can connect to a TCP socket +Group: %{PKGGROUP} +Requires: libev, kamailio = %ver +BuildRequires: libev-devel + +%description evapi +The remote application can also issue messages received by Kamailio. +There is no protocol definition, it is all up to the author of the routing script. +Events can be generated for any event in Kamailio. For 3rd party transaction control, a transaction can be automatically +suspended when sending the event, to be resumed at a later point, maybe triggered by an incoming message on the event socket. +%endif + + %if %{with geoip} %package geoip Summary: MaxMind GeoIP support for Kamailio @@ -1099,6 +1122,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with dnssec} kdnssec \ %endif +%if %{with evapi} + kev \ +%endif %if %{with geoip} kgeoip \ %endif @@ -1183,6 +1209,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with dnssec} kdnssec \ %endif +%if %{with evapi} + kev \ +%endif %if %{with geoip} kgeoip \ %endif @@ -1716,6 +1745,14 @@ fi %endif +%if %{with evapi} +%files evapi +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.evapi +%{_libdir}/kamailio/modules/evapi.so +%endif + + %if %{with geoip} %files geoip %defattr(-,root,root) [View Less]

1 0

git:5.1:5441eebe: pkg/kamailio/obs: simplified fedora packaging rules [skip ci]
by Sergey Safarov 21 Dec '19

21 Dec '19

Module: kamailio Branch: 5.1 Commit: 5441eebe608f75b2bc6b1ef686907e07a7a78856 URL: https://github.com/kamailio/kamailio/commit/5441eebe608f75b2bc6b1ef686907e0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-21T10:55:12+03:00 pkg/kamailio/obs: simplified fedora packaging rules [skip ci] (cherry picked from commit 1fb5f81618dc142a51104c7b60d467eb1acd9261) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: … [View More]https://github.com/kamailio/kamailio/commit/5441eebe608f75b2bc6b1ef686907e0… Patch: https://github.com/kamailio/kamailio/commit/5441eebe608f75b2bc6b1ef686907e0… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5b2021ad1f..7fda4debeb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2,98 +2,7 @@ %define ver 5.1.9 %define rel 0%{dist} -%if 0%{?fedora} == 27 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without rabbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 28 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without rabbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 29 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without rabbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 31 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 99 +%if 0%{?fedora} %define dist_name fedora %define dist_version %{?fedora} %bcond_without cnxcc [View Less]

1 0

git:5.2:42f49a90: pkg/kamailio/obs: simplified fedora packaging rules [skip ci]
by Sergey Safarov 21 Dec '19

21 Dec '19

Module: kamailio Branch: 5.2 Commit: 42f49a901e31ebc9ae8a507ba6b1c79f0ff3daaa URL: https://github.com/kamailio/kamailio/commit/42f49a901e31ebc9ae8a507ba6b1c79… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-21T10:53:22+03:00 pkg/kamailio/obs: simplified fedora packaging rules [skip ci] (cherry picked from commit 1fb5f81618dc142a51104c7b60d467eb1acd9261) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: … [View More]https://github.com/kamailio/kamailio/commit/42f49a901e31ebc9ae8a507ba6b1c79… Patch: https://github.com/kamailio/kamailio/commit/42f49a901e31ebc9ae8a507ba6b1c79… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index b54579a073..a2d927a25d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2,132 +2,7 @@ %define ver 5.2.5 %define rel dev1.0%{dist} -%if 0%{?fedora} == 27 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 28 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 29 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 30 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 31 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 99 +%if 0%{?fedora} %define dist_name fedora %define dist_version %{?fedora} %bcond_without cnxcc [View Less]

1 0

git:5.3:0f283531: pkg/kamailio/obs: simplified fedora packaging rules [skip ci]
by Sergey Safarov 21 Dec '19

21 Dec '19

Module: kamailio Branch: 5.3 Commit: 0f2835311ef8e23cdca217e35b5e7640a69c9d80 URL: https://github.com/kamailio/kamailio/commit/0f2835311ef8e23cdca217e35b5e764… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-21T10:52:40+03:00 pkg/kamailio/obs: simplified fedora packaging rules [skip ci] (cherry picked from commit 1fb5f81618dc142a51104c7b60d467eb1acd9261) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: … [View More]https://github.com/kamailio/kamailio/commit/0f2835311ef8e23cdca217e35b5e764… Patch: https://github.com/kamailio/kamailio/commit/0f2835311ef8e23cdca217e35b5e764… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 2c2f26349c..6e789f9afd 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2,132 +2,7 @@ %define ver 5.3.1 %define rel dev1.0%{dist} -%if 0%{?fedora} == 27 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 28 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 29 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 30 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 31 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 99 +%if 0%{?fedora} %define dist_name fedora %define dist_version %{?fedora} %bcond_without cnxcc [View Less]

1 0

[kamailio/kamailio] centos7 rpm for evapi (#2098)
by sergey-safarov 21 Dec '19

21 Dec '19

Please package evapi into centos7 rpm. -- 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/2098

2 8

git:master:298abc9e: pkg/kamailio/obs: packaged evapi module [skip ci]
by Sergey Safarov 21 Dec '19

21 Dec '19

Module: kamailio Branch: master Commit: 298abc9eb6240b9567df5166d64eba9f6da078dd URL: https://github.com/kamailio/kamailio/commit/298abc9eb6240b9567df5166d64eba9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-21T10:29:52+03:00 pkg/kamailio/obs: packaged evapi module [skip ci] Releated GH #2098 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]298abc9eb6240b9567df5166d64eba9… Patch: https://github.com/kamailio/kamailio/commit/298abc9eb6240b9567df5166d64eba9… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index fcda889665..3f305ba851 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -7,6 +7,7 @@ %define dist_version %{?fedora} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -32,6 +33,7 @@ %define dist_version %{?centos} %bcond_with cnxcc %bcond_without dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -58,6 +60,7 @@ %define dist .el7.centos %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -84,6 +87,7 @@ %define dist .el8.centos %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_with geoip %bcond_without http_async_client %bcond_without ims @@ -109,6 +113,7 @@ %define dist_version %{?suse_version} %bcond_without cnxcc %bcond_with dnssec +%bcond_with evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -134,6 +139,7 @@ %define dist_version %{?rhel} %bcond_with cnxcc %bcond_without dnssec +%bcond_without evapi %bcond_with geoip %bcond_with http_async_client %bcond_with ims @@ -159,6 +165,7 @@ %define dist_version %{?rhel} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_without geoip %bcond_without http_async_client %bcond_without ims @@ -184,6 +191,7 @@ %define dist_version %{?rhel} %bcond_without cnxcc %bcond_with dnssec +%bcond_without evapi %bcond_with geoip %bcond_without http_async_client %bcond_without ims @@ -448,6 +456,21 @@ DNSSEC support for Kamailio. %endif +%if %{with evapi} +%package evapi +Summary: Module can be used to create an event message flow from Kamailio to any application that can connect to a TCP socket +Group: %{PKGGROUP} +Requires: libev, kamailio = %ver +BuildRequires: libev-devel + +%description evapi +The remote application can also issue messages received by Kamailio. +There is no protocol definition, it is all up to the author of the routing script. +Events can be generated for any event in Kamailio. For 3rd party transaction control, a transaction can be automatically +suspended when sending the event, to be resumed at a later point, maybe triggered by an incoming message on the event socket. +%endif + + %if %{with geoip} %package geoip Summary: MaxMind GeoIP support for Kamailio @@ -1116,6 +1139,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with dnssec} kdnssec \ %endif +%if %{with evapi} + kev \ +%endif %if %{with geoip} kgeoip \ %endif @@ -1204,6 +1230,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with dnssec} kdnssec \ %endif +%if %{with evapi} + kev \ +%endif %if %{with geoip} kgeoip \ %endif @@ -1755,6 +1784,14 @@ fi %endif +%if %{with evapi} +%files evapi +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.evapi +%{_libdir}/kamailio/modules/evapi.so +%endif + + %if %{with geoip} %files geoip %defattr(-,root,root) [View Less]

1 0

git:master:1fb5f816: pkg/kamailio/obs: simplified fedora packaging rules [skip ci]
by Sergey Safarov 21 Dec '19

21 Dec '19

Module: kamailio Branch: master Commit: 1fb5f81618dc142a51104c7b60d467eb1acd9261 URL: https://github.com/kamailio/kamailio/commit/1fb5f81618dc142a51104c7b60d467e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-21T08:07:03+03:00 pkg/kamailio/obs: simplified fedora packaging rules [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]1fb5f81618dc142a51104c7b60d467e… Patch: https://github.com/kamailio/kamailio/commit/1fb5f81618dc142a51104c7b60d467e… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 89c6d849b1..fcda889665 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2,132 +2,7 @@ %define ver 5.2.0 %define rel dev1.0%{dist} -%if 0%{?fedora} == 27 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 28 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 29 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 30 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 31 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 99 +%if 0%{?fedora} %define dist_name fedora %define dist_version %{?fedora} %bcond_without cnxcc [View Less]

1 0

git:master:1da19617: tls: set default tls method (version) to 1+
by Daniel-Constantin Mierla 20 Dec '19

20 Dec '19

Module: kamailio Branch: master Commit: 1da196174d8cd7e82ce57d4de60197fc063e6b50 URL: https://github.com/kamailio/kamailio/commit/1da196174d8cd7e82ce57d4de60197f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-20T16:10:45+01:00 tls: set default tls method (version) to 1+ - it was 1, but newer libssl doesn't have it anymore - while older systems don't have newer version support --- Modified: src/… [View More]

1 0

[kamailio/kamailio] Kamailio not using SNI in for incoming requests (#1938)
by Laszlo 20 Dec '19

20 Dec '19

I'm using Kamailio 5.2.2+xenial. Set up a basic tls.cfg like this: ``` [server:default] verify_certificate = no require_certificate = no private_key = /tmp/default.key certificate = /tmp/default.pem [server:any] method = TLSv1 verify_certificate = no require_certificate = no private_key = /tmp/domain.key certificate = /tmp/domain.pem server_name = sip.domain.com server_name_mode = 1 ``` Connect with openssl like this `openssl s_client -connect server:5061` and Kamailio will - obviously - … [View More]offer the default.pem certificate. However, use `openssl s_client -connect server:5061 -servername sip.domain.com` and Kamailio will still offer the default.pem certificate, where I'd expect it to offer domain.pem. I tested these `openssl` commandline invocations against an nginx server that's working with these same certificates, and SNI is working properly there. >From the Kamailio logs on starting up, it does seem to detect that a SNI callback should be registered with OpenSSL. ``` Apr 25 11:43:37 kamailio[7447]: NOTICE: tls [tls_domain.c:1083]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='sip.domain.com' ... ``` However, it's not triggering: ``` Apr 25 11:39:04 kamailio[7344]: DEBUG: <core> [core/ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: 4.1.3.1 Apr 25 11:39:04 kamailio[7344]: DEBUG: <core> [core/tcp_main.c:999]: tcpconn_new(): on port 55428, type 3 Apr 25 11:39:04 kamailio[7344]: DEBUG: <core> [core/tcp_main.c:1305]: tcpconn_add(): hashes: 3726:2401:2691, 1 Apr 25 11:39:04 kamailio[7344]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa86c60, 60, 2, 0x7f00ad8279b0), fd_no=51 Apr 25 11:39:04 kamailio[7344]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa86c60, 60, -1, 0x0) fd_no=52 called Apr 25 11:39:04 kamailio[7344]: DEBUG: <core> [core/tcp_main.c:4196]: handle_tcpconn_ev(): sending to child, events 1 Apr 25 11:39:04 kamailio[7344]: DEBUG: <core> [core/tcp_main.c:3875]: send2child(): selected tcp worker idx:0 proc:44 pid:7342 for activity on [tls:1.6.1.6:5061], 0x7f00ad8279b0 Apr 25 11:39:04 kamailio[7342]: DEBUG: <core> [core/tcp_read.c:1759]: handle_io(): received n=8 con=0x7f00ad8279b0, fd=10 Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_server.c:199]: tls_complete_init(): completing tls connection initialization Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_server.c:228]: tls_complete_init(): Using initial TLS domain TLSs<default> (dom 0x7f00ad1b02e8 ctx 0x7f00ad406408 sn []) Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_domain.c:1155]: tls_lookup_private_key(): Private key lookup for SSL_CTX-0x7f00ad406408: (nil) Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_domain.c:737]: sr_ssl_ctx_info_callback(): SSL handshake started Apr 25 11:39:04 kamailio[7342]: DEBUG: <core> [core/tcp_main.c:2460]: tcpconn_do_send(): sending... Apr 25 11:39:04 kamailio[7342]: DEBUG: <core> [core/tcp_main.c:2494]: tcpconn_do_send(): after real write: c= 0x7f00ad8279b0 n=2817 fd=10 Apr 25 11:39:04 kamailio[7342]: DEBUG: <core> [core/tcp_main.c:2495]: tcpconn_do_send(): buf=#012#026#003#001 Apr 25 11:39:04 kamailio[7342]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xae0200, 10, 2, 0x7f00ad8279b0), fd_no=1 Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_domain.c:1155]: tls_lookup_private_key(): Private key lookup for SSL_CTX-0x7f00ad406408: (nil) Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_domain.c:749]: sr_ssl_ctx_info_callback(): SSL handshake done Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_domain.c:753]: sr_ssl_ctx_info_callback(): SSL disable renegotiation Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_server.c:424]: tls_accept(): TLS accept successful Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_server.c:431]: tls_accept(): tls_accept: new connection from 4.1.3.1:55428 using TLSv1/SSLv3 AES256-SHA 256 Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_server.c:434]: tls_accept(): tls_accept: local socket: 1.6.1.6:5061 Apr 25 11:39:04 kamailio[7342]: DEBUG: tls [tls_server.c:445]: tls_accept(): tls_accept: client did not present a certificate Apr 25 11:39:04 kamailio[7342]: DEBUG: <core> [core/tcp_main.c:2460]: tcpconn_do_send(): sending... Apr 25 11:39:04 kamailio[7342]: DEBUG: <core> [core/tcp_main.c:2494]: tcpconn_do_send(): after real write: c= 0x7f00ad8279b0 n=266 fd=10 Apr 25 11:39:04 kamailio[7342]: DEBUG: <core> [core/tcp_main.c:2495]: tcpconn_do_send(): buf=#012#026#003#001 Apr 25 11:39:10 kamailio[7342]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xae0200, 10, -1, 0x10) fd_no=2 called Apr 25 11:39:10 kamailio[7342]: DEBUG: <core> [core/tcp_read.c:1680]: release_tcpconn(): releasing con 0x7f00ad8279b0, state 1, fd=10, id=1 ([4.1.3.1]:55428 -> [4.1.3.1]:5061) Apr 25 11:39:10 kamailio[7342]: DEBUG: <core> [core/tcp_read.c:1684]: release_tcpconn(): extra_data 0x7f00ad7c4ab8 Apr 25 11:39:10 kamailio[7344]: DEBUG: <core> [core/tcp_main.c:3307]: handle_tcp_child(): reader response= 7f00ad8279b0, 1 from 0 Apr 25 11:39:10 kamailio[7344]: DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0xa86c60, 60, 2, 0x7f00ad8279b0), fd_no=51 Apr 25 11:39:10 kamailio[7344]: DEBUG: <core> [core/tcp_main.c:3434]: handle_tcp_child(): CONN_RELEASE 0x7f00ad8279b0 refcnt= 1 ``` Looking at other issues like #1574, I think I'm supposed to see a `tls_server_name_cb` log line upon connecting, but there is none. -- 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/1938 [View Less]

4 10

git:master:4d045438: modules: readme files regenerated - cnxcc ... [skip ci]
by Kamailio Dev 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: 4d045438c4451cfc70e995344a2cfb42eb0ccb30 URL: https://github.com/kamailio/kamailio/commit/4d045438c4451cfc70e995344a2cfb4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-19T18:31:12+01:00 modules: readme files regenerated - cnxcc ... [skip ci] --- Modified: src/modules/cnxcc/README --- Diff: https://github.com/kamailio/kamailio/commit/4d045438c4451cfc70e995344a2cfb4…… [View More] Patch: https://github.com/kamailio/kamailio/commit/4d045438c4451cfc70e995344a2cfb4… --- diff --git a/src/modules/cnxcc/README b/src/modules/cnxcc/README index d2e317de72..425a473f16 100644 --- a/src/modules/cnxcc/README +++ b/src/modules/cnxcc/README @@ -188,18 +188,32 @@ modparam("cnxcc", "credit_check_period", 1) Associates the call with a customer id and sets the max credit, connect cost, cost per second, initial pulse and final pulse. The discount is - calculated in pulses (30/6, 1/1, etc) and subtracted from the pool of + calculated in pulses (1/1, 60/1, etc) and subtracted from the pool of credit. The customer value can be provided as a string or a variable holding a - string. + string. This value identifies all calls from the same customer. + + The maxcredit (float) value is the maximum credit available for the + current call. + + The connect (float) value is the connect cost for the current call. + + The cps (float) value is the cost per second for the current call. + + The ipuse (integer) value is the initial pulse and establishes the + minimum time to be charged. For example, value 1 establishes a charge + per second and value 60 sets a charge per minute. If it is taken as + value 60, even if the duration is 5 seconds, 1 minute will be charged. - The maxcredit, connect and cps can be double (float) or integer values, - they have to be provided as static string values of variables holding - string values. + The fpulse (integer) value is the final pulse and establishes, from the + initial pulse, the time range to be charged. For example, the value 1 + establishes a charge per second, 5 sets a charge in blocks of 5 + seconds, 60 sets a full minute charge. - The ipulse and fpulse values are integer values, they can be also given - via variables holding integers. + 1/1 will make a charge per seconds for the entire call. 60/1 will make + a charge per seconds with the first full minute. 60/60 always perform a + full minute charge. Return code: * 1 - successful @@ -210,12 +224,15 @@ modparam("cnxcc", "credit_check_period", 1) ... cnxcc_set_max_credit("john-doe", "100", "3.0", "0.5", 60, 1); ... -$var(customer) = "john-doe-premium"; # customer id -$var(credit) = "100"; # max credit -$var(connect) = "3.0"; # connect const -$var(cps) = "0.5"; # cost per second -$var(initial_p) = 60; # initial pulse -$var(final_p) = 1; # final pulse +$var(customer) = "john-doe"; # customer id +$var(credit) = "100"; # max credit for all calls with the same + # customer id +$var(connect) = "3.0"; # connect cost or initial cost for the call +$var(cps) = "0.5"; # cost per second +$var(initial_p) = 60; # initial pulse (60 = the first minute will be + # charged even if the call is shorter) +$var(final_p) = 1; # final pulse (after the first minute, it will + # be charge in ranges of 1 second) cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(connect)", "$var(cps)", "$var(initial_p)", "$var(final_p)"); ... [View Less]

1 0

[kamailio/kamailio] cnxcc: updated readme file [skip ci] (#2182)
by Jose Luis Verdeguer 19 Dec '19

19 Dec '19

<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, … [View More]

1 1

git:master:cea7fa14: cnxcc: updated readme file [skip ci]
by Jose Luis Verdeguer 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: cea7fa14b0aefc647d28eb1bf56faaec89d90d67 URL: https://github.com/kamailio/kamailio/commit/cea7fa14b0aefc647d28eb1bf56faae… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-12-19T18:22:59+01:00 cnxcc: updated readme file [skip ci] --- Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cea7fa14b0aefc647d28eb1bf56faae… … [View More]Patch: https://github.com/kamailio/kamailio/commit/cea7fa14b0aefc647d28eb1bf56faae… --- diff --git a/src/modules/cnxcc/doc/cnxcc_admin.xml b/src/modules/cnxcc/doc/cnxcc_admin.xml index 4284437a8b..0c26cb0a58 100644 --- a/src/modules/cnxcc/doc/cnxcc_admin.xml +++ b/src/modules/cnxcc/doc/cnxcc_admin.xml @@ -128,21 +128,37 @@ modparam("cnxcc", "credit_check_period", 1) <para> Associates the call with a customer id and sets the max credit, connect cost, cost per second, initial pulse and final pulse. The discount - is calculated in pulses (30/6, 1/1, etc) and subtracted from the pool + is calculated in pulses (1/1, 60/1, etc) and subtracted from the pool of credit. </para> <para> The customer value can be provided as a string or a variable holding - a string. + a string. This value identifies all calls from the same customer. + </para> + <para> + The maxcredit (float) value is the maximum credit available for the current call. + </para> + <para> + The connect (float) value is the connect cost for the current call. + </para> + <para> + The cps (float) value is the cost per second for the current call. + </para> + <para> + The ipuse (integer) value is the initial pulse and establishes the minimum + time to be charged. For example, value 1 establishes a charge per second + and value 60 sets a charge per minute. If it is taken as value 60, even + if the duration is 5 seconds, 1 minute will be charged. </para> <para> - The maxcredit, connect and cps can be double (float) or integer values, they - have to be provided as static string values of variables holding string - values. + The fpulse (integer) value is the final pulse and establishes, from the initial + pulse, the time range to be charged. For example, the value 1 establishes a charge + per second, 5 sets a charge in blocks of 5 seconds, 60 sets a full minute charge. </para> <para> - The ipulse and fpulse values are integer values, they can be also - given via variables holding integers. + 1/1 will make a charge per seconds for the entire call. 60/1 will make a + charge per seconds with the first full minute. 60/60 always perform + a full minute charge. </para> <para> <emphasis>Return code:</emphasis> @@ -173,12 +189,15 @@ modparam("cnxcc", "credit_check_period", 1) ... cnxcc_set_max_credit("john-doe", "100", "3.0", "0.5", 60, 1); ... -$var(customer) = "john-doe-premium"; # customer id -$var(credit) = "100"; # max credit -$var(connect) = "3.0"; # connect const -$var(cps) = "0.5"; # cost per second -$var(initial_p) = 60; # initial pulse -$var(final_p) = 1; # final pulse +$var(customer) = "john-doe"; # customer id +$var(credit) = "100"; # max credit for all calls with the same + # customer id +$var(connect) = "3.0"; # connect cost or initial cost for the call +$var(cps) = "0.5"; # cost per second +$var(initial_p) = 60; # initial pulse (60 = the first minute will be + # charged even if the call is shorter) +$var(final_p) = 1; # final pulse (after the first minute, it will + # be charge in ranges of 1 second) cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(connect)", "$var(cps)", "$var(initial_p)", "$var(final_p)"); ... [View Less]

1 0

git:5.1:10b861ba: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.1 Commit: 10b861bac1b53766db715ff7fb616297f0568c33 URL: https://github.com/kamailio/kamailio/commit/10b861bac1b53766db715ff7fb61629… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-19T17:47:02+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:9d8be519: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.2 Commit: 9d8be519bb0cc97a20360652085da6aaed94e86e URL: https://github.com/kamailio/kamailio/commit/9d8be519bb0cc97a20360652085da6a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-19T17:46:43+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.3:7fa917ee: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.3 Commit: 7fa917eef3c1940bb9a178b5e538fd9931dd431c URL: https://github.com/kamailio/kamailio/commit/7fa917eef3c1940bb9a178b5e538fd9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-19T17:46:29+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:42bad429: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: 42bad429680d4dbf1201394de1a5579573bcac74 URL: https://github.com/kamailio/kamailio/commit/42bad429680d4dbf1201394de1a5579… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-19T17:46:13+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.3:d9d677cb: dispatcher: fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100)
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.3 Commit: d9d677cbc30b2f771a3742c3aa95fd736dc48765 URL: https://github.com/kamailio/kamailio/commit/d9d677cbc30b2f771a3742c3aa95fd7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:44:19+01:00 dispatcher: fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100) - fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100) - ds_mode 2 should ping only gateways with mode … [View More]inactive and probing - ds_inactive threshould should work also in ds_probing_mode 0 and 2 - move ping logic to a small helper function (cherry picked from commit ee45c2a07292cc977a7a212cac18fd2156279588) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/d9d677cbc30b2f771a3742c3aa95fd7… Patch: https://github.com/kamailio/kamailio/commit/d9d677cbc30b2f771a3742c3aa95fd7… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 18b713ce02..86b7ca1f1a 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2737,6 +2737,10 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) if(idx->dlist[i].message_count < inactive_threshold) { /* Destination has not enough successful replies.. Leaving it into inactive state */ idx->dlist[i].flags |= DS_INACTIVE_DST; + /* if destination was in probing state, we stay there for now */ + if((old_state & DS_PROBING_DST) != 0) { + idx->dlist[i].flags |= DS_PROBING_DST; + } LM_DBG("destination replied successful %d times, threshold %d\n", idx->dlist[i].message_count, inactive_threshold); } else { @@ -3176,6 +3180,32 @@ static void ds_options_callback( return; } +/* + * Small helper to decide to ping a gateway or not + */ +static inline int ds_ping_result_helper(ds_set_t *node, int j) +{ + /* probe all */ + if(ds_probing_mode == DS_PROBE_ALL) { + LM_DBG("probe all, mode DS_PROBE_ALL\n"); + return 1; + } + /* probe if probing is set, but not in mode DS_PROBE_INACTIVE */ + if (ds_probing_mode != DS_PROBE_INACTIVE + && (node->dlist[j].flags & DS_PROBING_DST) != 0) { + LM_DBG("probing set, but not mode DS_PROBE_INACTIVE\n"); + return 1; + } + /* probe for mode DS_PROBE_INACTIVE only for inactive and probing gw */ + if (ds_probing_mode == DS_PROBE_INACTIVE + && (node->dlist[j].flags & DS_PROBING_DST) != 0 + && (node->dlist[j].flags & DS_INACTIVE_DST) != 0) { + LM_DBG("probing and inactive set, mode DS_PROBE_INACTIVE\n"); + return 1; + } + return 0; +} + /** * */ @@ -3196,8 +3226,7 @@ void ds_ping_set(ds_set_t *node) if((node->dlist[j].flags & DS_DISABLED_DST) != 0) continue; /* If the Flag of the entry has "Probing set, send a probe: */ - if(ds_probing_mode == DS_PROBE_ALL - || (node->dlist[j].flags & DS_PROBING_DST) != 0) { + if(ds_ping_result_helper(node, j)) { LM_DBG("probing set #%d, URI %.*s\n", node->id, node->dlist[j].uri.len, node->dlist[j].uri.s); [View Less]

1 0

git:5.3:e57e8e9e: dispatcher: small style fix in ds_probing_mode docs
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.3 Commit: e57e8e9e9301982078005ca5fdd9ad9c6310de64 URL: https://github.com/kamailio/kamailio/commit/e57e8e9e9301982078005ca5fdd9ad9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:44:25+01:00 dispatcher: small style fix in ds_probing_mode docs (cherry picked from commit faccbb1cf62bfb625d0bcc9d1a52727dcdd962ff) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: … [View More]

1 0

git:5.2:fdd8bd3c: dispatcher: small style fix in ds_probing_mode docs
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.2 Commit: fdd8bd3cce007e6256be5373d84413ffdeff802e URL: https://github.com/kamailio/kamailio/commit/fdd8bd3cce007e6256be5373d84413f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:43:48+01:00 dispatcher: small style fix in ds_probing_mode docs (cherry picked from commit faccbb1cf62bfb625d0bcc9d1a52727dcdd962ff) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: … [View More]

1 0

git:5.1:45f62634: dispatcher: small style fix in ds_probing_mode docs
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.1 Commit: 45f6263470bc6866352d450a606d094a45bcbb70 URL: https://github.com/kamailio/kamailio/commit/45f6263470bc6866352d450a606d094… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:42:44+01:00 dispatcher: small style fix in ds_probing_mode docs (cherry picked from commit faccbb1cf62bfb625d0bcc9d1a52727dcdd962ff) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: … [View More]

1 0

[kamailio/kamailio] dispatcher ds_probing_mode inconsistent behaviour (#2100)
by Henning Westerholt 19 Dec '19

19 Dec '19

I observed inconsistent behaviour in the dispatcher module. In some modes either the code needs to be fixed or the documentation adapted. As it is a widely used module, some feedback about this would be appreciated. 1) ds_probing_mode 0 This mode don't work together with a ds_inactive_threshold > 1 and gateway set to "IP". It will set a gateway to IX after the first successful ping. Therefore gateways will not be activated automatically. In mode "TP" it works and sets the gateway to "AX". … [View More]

1 2

git:master:faccbb1c: dispatcher: small style fix in ds_probing_mode docs
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: faccbb1cf62bfb625d0bcc9d1a52727dcdd962ff URL: https://github.com/kamailio/kamailio/commit/faccbb1cf62bfb625d0bcc9d1a52727… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:35:58+01:00 dispatcher: small style fix in ds_probing_mode docs --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:ee45c2a0: dispatcher: fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100)
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: ee45c2a07292cc977a7a212cac18fd2156279588 URL: https://github.com/kamailio/kamailio/commit/ee45c2a07292cc977a7a212cac18fd2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:32:14+01:00 dispatcher: fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100) - fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100) - ds_mode 2 should ping only gateways with … [View More]mode inactive and probing - ds_inactive threshould should work also in ds_probing_mode 0 and 2 - move ping logic to a small helper function --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ee45c2a07292cc977a7a212cac18fd2… Patch: https://github.com/kamailio/kamailio/commit/ee45c2a07292cc977a7a212cac18fd2… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index ab55f21990..d56f579b14 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2767,6 +2767,10 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state, if(idx->dlist[i].message_count < inactive_threshold) { /* Destination has not enough successful replies.. Leaving it into inactive state */ idx->dlist[i].flags |= DS_INACTIVE_DST; + /* if destination was in probing state, we stay there for now */ + if((old_state & DS_PROBING_DST) != 0) { + idx->dlist[i].flags |= DS_PROBING_DST; + } LM_DBG("destination replied successful %d times, threshold %d\n", idx->dlist[i].message_count, inactive_threshold); } else { @@ -3235,6 +3239,32 @@ static void ds_options_callback( return; } +/* + * Small helper to decide to ping a gateway or not + */ +static inline int ds_ping_result_helper(ds_set_t *node, int j) +{ + /* probe all */ + if(ds_probing_mode == DS_PROBE_ALL) { + LM_DBG("probe all, mode DS_PROBE_ALL\n"); + return 1; + } + /* probe if probing is set, but not in mode DS_PROBE_INACTIVE */ + if (ds_probing_mode != DS_PROBE_INACTIVE + && (node->dlist[j].flags & DS_PROBING_DST) != 0) { + LM_DBG("probing set, but not mode DS_PROBE_INACTIVE\n"); + return 1; + } + /* probe for mode DS_PROBE_INACTIVE only for inactive and probing gw */ + if (ds_probing_mode == DS_PROBE_INACTIVE + && (node->dlist[j].flags & DS_PROBING_DST) != 0 + && (node->dlist[j].flags & DS_INACTIVE_DST) != 0) { + LM_DBG("probing and inactive set, mode DS_PROBE_INACTIVE\n"); + return 1; + } + return 0; +} + /** * */ @@ -3255,8 +3285,7 @@ void ds_ping_set(ds_set_t *node) if((node->dlist[j].flags & DS_DISABLED_DST) != 0) continue; /* If the Flag of the entry has "Probing set, send a probe: */ - if(ds_probing_mode == DS_PROBE_ALL - || (node->dlist[j].flags & DS_PROBING_DST) != 0) { + if(ds_ping_result_helper(node, j)) { LM_DBG("probing set #%d, URI %.*s\n", node->id, node->dlist[j].uri.len, node->dlist[j].uri.s); [View Less]

1 0

git:5.2:32d4f587: sdpops: add missing line break for debug log
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.2 Commit: 32d4f5875e7b9624dc54a83f9f4a507ff20486a5 URL: https://github.com/kamailio/kamailio/commit/32d4f5875e7b9624dc54a83f9f4a507… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T11:35:37+01:00 sdpops: add missing line break for debug log (cherry picked from commit 0d7b5bd4575c80053e1d3851aeae34d5fbd5cf0b) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/… [View More]

1 0

git:5.3:1ebae0fa: sdpops: add missing line break for debug log
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.3 Commit: 1ebae0fa58ff83848336391422014580861bef03 URL: https://github.com/kamailio/kamailio/commit/1ebae0fa58ff8384833639142201458… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T11:35:20+01:00 sdpops: add missing line break for debug log (cherry picked from commit 0d7b5bd4575c80053e1d3851aeae34d5fbd5cf0b) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/… [View More]

1 0

git:master:0d7b5bd4: sdpops: add missing line break for debug log
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: 0d7b5bd4575c80053e1d3851aeae34d5fbd5cf0b URL: https://github.com/kamailio/kamailio/commit/0d7b5bd4575c80053e1d3851aeae34d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T11:32:30+01:00 sdpops: add missing line break for debug log --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0d7b5bd4575c80053e1d3851aeae34d… Patch: … [View More]

1 0

git:master:cb8b582f: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: cb8b582f478d80e80d0dff492e0e376427182d91 URL: https://github.com/kamailio/kamailio/commit/cb8b582f478d80e80d0dff492e0e376… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-19T11:01:22+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:52f6ca73: ims_ipsec_pcscf: small docs change for ipsec_forward
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: 52f6ca731c252a55b5c2cb605f661d04def8dd6b URL: https://github.com/kamailio/kamailio/commit/52f6ca731c252a55b5c2cb605f661d0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T11:00:02+01:00 ims_ipsec_pcscf: small docs change for ipsec_forward --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] ims_ipsec_pcscf: new parameter in ipsec_forward() (#2176)
by alexyosifov 19 Dec '19

19 Dec '19

- added a new optional parameter in ipsec_forward() to set or not 'send force socket' for request messages. Useful for ipsec and tcp connections. If set to 1 - send requests through existing ipsec tunnel when tcp is used. In combination with tcp_reuse_port=yes.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] 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/2176 -- Commit Summary -- * ims_ipsec_pcscf: new parameter in ipsec_forward() -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (8) M src/modules/ims_ipsec_pcscf/cmd.h (2) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (9) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2176.patch https://github.com/kamailio/kamailio/pull/2176.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/2176 [View Less]

2 2

git:master:6048a966: ims_ipsec_pcscf: new parameter in ipsec_forward()
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: 6048a966df29b6447052b93cd86ecaf3eaaa7a41 URL: https://github.com/kamailio/kamailio/commit/6048a966df29b6447052b93cd86ecaf… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T10:56:49+01:00 ims_ipsec_pcscf: new parameter in ipsec_forward() - added a new optional parameter in ipsec_forward() to set or not 'send force socket' for request messages. Useful for ipsec and tcp … [View More]

1 0

git:master:e99bfd23: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 17 Dec '19

17 Dec '19

Module: kamailio Branch: master Commit: e99bfd2368c28e920f92af9ade1c29cb2ba709da URL: https://github.com/kamailio/kamailio/commit/e99bfd2368c28e920f92af9ade1c29c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-17T19:31:12+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/e99bfd2368c28e920f92af9ade1c29c… … [View More]Patch: https://github.com/kamailio/kamailio/commit/e99bfd2368c28e920f92af9ade1c29c… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 4b23eacb58..71ae54e48e 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -117,7 +117,7 @@ Daniel-Constantin Mierla 4.36. t_lookup_cancel([1]) 4.37. t_drop_replies([mode]) 4.38. t_save_lumps() - 4.39. t_load_contacts() + 4.39. t_load_contacts([mode]) 4.40. t_next_contacts() 4.41. t_next_contact_flow() 4.42. t_check_status(re) @@ -372,7 +372,7 @@ Chapter 1. Admin Guide 4.36. t_lookup_cancel([1]) 4.37. t_drop_replies([mode]) 4.38. t_save_lumps() - 4.39. t_load_contacts() + 4.39. t_load_contacts([mode]) 4.40. t_next_contacts() 4.41. t_next_contact_flow() 4.42. t_check_status(re) @@ -1724,7 +1724,7 @@ modparam("tm", "rich_redirect", 3) 4.36. t_lookup_cancel([1]) 4.37. t_drop_replies([mode]) 4.38. t_save_lumps() - 4.39. t_load_contacts() + 4.39. t_load_contacts([mode]) 4.40. t_next_contacts() 4.41. t_next_contact_flow() 4.42. t_check_status(re) @@ -2473,7 +2473,7 @@ failure_route[1] { t_relay(); } -4.39. t_load_contacts() +4.39. t_load_contacts([mode]) This is the first of the three functions that can be used to implement serial/parallel forking based on q and +sip.instance values of @@ -2489,18 +2489,33 @@ failure_route[1] { nothing. If the current destination set contains more than one branch, the - function sorts them according to increasing value of the q parameter - and then stores the branches in reverse order into the XAVP. + function sorts them according to the algorithm selected with the 'mode' + paramenter and then stores the branches in reverse order into the XAVP. The q parameter of a branch contains a value from range 0-1.0 and it expresses relative preference of the branch among all branches in the destination set. The higher the q value the more preference the user - agent gave to the branch. Branches with higher q values will be tried - before branches with lower ones when serial forking takes place. + agent gave to the branch. The parameter 'mode' controls which type of + algorithm kamailio will apply to sort the branches based on the q + values: + + - '0' or missing: branches with higher q values will be tried before + branches with lower ones when serial forking takes place Equals q + values will result in a parallel forking. + + - '1': branches are ordered using a proportional algorithm that uses to + q value as the weight of the branch. Higher is the q value, higher is + the probability to be tried as first. Equals q values means equals + probability to be tried. Differently from the previous mode there is no + possibility to have parallel forking. Branches with q values equals to + 0 or lower are not considered by the ordering algorithm, but just added + at the end of the list as backup option if all other branches fail. + This algorithm can be useful in case of endpoints in ACTIVE-ACTIVE + configuration to load-balance the calls. After calling t_load_contacts(), function t_next_contacts() and possibly also t_next_contact_flow() need to be called one or more times - in order to retrieve the branches based on their q value. + in order to retrieve the branches based on their order. Function returns 1 if loading of contacts succeeded or there was nothing to do. In case of an error, function returns -1 (see syslog). [View Less]

1 0

[kamailio/kamailio] tm: new weight-based call-termination distribution (#2178)
by Marco Capetta 17 Dec '19

17 Dec '19

#### Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] 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 … [View More]

3 6

git:master:1399714f: tm: new weight-based call-termination distribution
by Henning Westerholt 17 Dec '19

17 Dec '19

Module: kamailio Branch: master Commit: 1399714fbba63732f94eb8034dabb1e565ca832a URL: https://github.com/kamailio/kamailio/commit/1399714fbba63732f94eb8034dabb1e… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-17T19:29:36+01:00 tm: new weight-based call-termination distribution Extended t_load_contacts function with the parameter 'mode'. It can be used to define the algorithm to use for ordering the contacts. If 0, or … [View More]

1 0

[kamailio/kamailio] dialog: adding RPC dlg.kill_active_dlg command (#2111)
by jklingenmeyer 17 Dec '19

17 Dec '19

- only handles active dialogs in state 4 - wipes out a given dialog callously - no subcalls to dialog-ending functions - dialog is then removed by the recurring cleaning function execution - as discussed in sr-users in topic "[Dialog] Removing entries from dialog memory" #### Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a … [View More]

2 6

git:5.1:be488483: Makefile.defs: use dedicated vars for pthread mutex flags
by Victor Seva 17 Dec '19

17 Dec '19

Module: kamailio Branch: 5.1 Commit: be488483b71ec4d1bc9eb98cc67b4c69fe8b650a URL: https://github.com/kamailio/kamailio/commit/be488483b71ec4d1bc9eb98cc67b4c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-17T09:19:41+01:00 Makefile.defs: use dedicated vars for pthread mutex flags - CC_EXTRA_OPTS and LD_EXTRA_OPTS may be set from environment (cherry picked from commit … [View More]

1 0

git:5.2:354cce84: Makefile.defs: use dedicated vars for pthread mutex flags
by Victor Seva 17 Dec '19

17 Dec '19

Module: kamailio Branch: 5.2 Commit: 354cce84135836a780364f1fef441ba850c9f2ff URL: https://github.com/kamailio/kamailio/commit/354cce84135836a780364f1fef441ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-17T09:19:09+01:00 Makefile.defs: use dedicated vars for pthread mutex flags - CC_EXTRA_OPTS and LD_EXTRA_OPTS may be set from environment (cherry picked from commit … [View More]

1 0

git:5.3:8d0d4e09: Makefile.defs: use dedicated vars for pthread mutex flags
by Victor Seva 17 Dec '19

17 Dec '19

Module: kamailio Branch: 5.3 Commit: 8d0d4e094940308fde0ff14ab4d6ddf74174ae0f URL: https://github.com/kamailio/kamailio/commit/8d0d4e094940308fde0ff14ab4d6ddf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-17T09:18:16+01:00 Makefile.defs: use dedicated vars for pthread mutex flags - CC_EXTRA_OPTS and LD_EXTRA_OPTS may be set from environment (cherry picked from commit … [View More]

1 0

git:master:be34082a: Makefile.defs: use dedicated vars for pthread mutex flags
by Daniel-Constantin Mierla 17 Dec '19

17 Dec '19

Module: kamailio Branch: master Commit: be34082aac3e275058f4747c3706499848ccd86d URL: https://github.com/kamailio/kamailio/commit/be34082aac3e275058f4747c3706499… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-17T07:49:57+01:00 Makefile.defs: use dedicated vars for pthread mutex flags - CC_EXTRA_OPTS and LD_EXTRA_OPTS may be set from environment --- Modified: src/Makefile.defs --- Diff: https://… [View More]

1 0

Errored: kamailio/kamailio#8217 (5.3 - d231c28)
by Travis CI 16 Dec '19

16 Dec '19

Build Update for kamailio/kamailio ------------------------------------- Build: #8217 Status: Errored Duration: 7 mins and 10 secs Commit: d231c28 (5.3) Author: Victor Seva Message: travis: build using pkg-kamailio-docker 5.3-$DIST tag View the changeset: https://github.com/kamailio/kamailio/compare/f36ac2aa2d5a...d231c2856d1c View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/625702001?utm_medium=notific… -- You can unsubscribe from build emails from the … [View More]

1 0

git:5.3:d231c285: travis: build using pkg-kamailio-docker 5.3-$DIST tag
by Victor Seva 16 Dec '19

16 Dec '19

Module: kamailio Branch: 5.3 Commit: d231c2856d1c056614a7ec64cddb276312f67214 URL: https://github.com/kamailio/kamailio/commit/d231c2856d1c056614a7ec64cddb276… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-16T11:39:11+01:00 travis: build using pkg-kamailio-docker 5.3-$DIST tag --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/d231c2856d1c056614a7ec64cddb276… … [View More]

1 0

git:5.2:9474e01d: travis: build using pkg-kamailio-docker 5.2-$DIST tag
by Victor Seva 16 Dec '19

16 Dec '19

Module: kamailio Branch: 5.2 Commit: 9474e01d8ffa82c80c61706b87fc1e1dfd47d747 URL: https://github.com/kamailio/kamailio/commit/9474e01d8ffa82c80c61706b87fc1e1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-16T11:40:37+01:00 travis: build using pkg-kamailio-docker 5.2-$DIST tag --- Modified: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/9474e01d8ffa82c80c61706b87fc1e1… … [View More]

1 0

git:master:c65e0926: rr: fixed warning about unused label in ki_record_route_reset_one()
by Daniel-Constantin Mierla 16 Dec '19

16 Dec '19

Module: kamailio Branch: master Commit: c65e0926b26ee9f1cdadb9fbd6f488159275cbea URL: https://github.com/kamailio/kamailio/commit/c65e0926b26ee9f1cdadb9fbd6f4881… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-16T11:02:57+01:00 rr: fixed warning about unused label in ki_record_route_reset_one() --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

Kamailio dispatcher to use tls targets.
by vinod mn 15 Dec '19

15 Dec '19

Hi I am using kamailio server to forward the request to a new kamailio-server which listens only on TLS. *problem: Not able to specify the dispatcher with tls protocol* I am using the below configuration in dispatcher.list kamailio version:4.4.2 *# setid(integer) destination(sip uri) flags (integer, optional), priority(int,opt), attrs (str,optional)1 sip:mynetwork.com <http://mynetwork.com/>;transport=tls 8 1 socket=tls:mynetwork.com:5328 <http://mynetwork.com:5328/>* and if I … [View More]

1 0

Re: [sr-dev] [SR-Users] using a pseudo-variable as a parameter to a module function
by Henning Westerholt 14 Dec '19

14 Dec '19

(adding sr-dev list to CC) Hi Michael, small general addition - you are probably already aware of this documentation: https://www.asipto.com/pub/kamailio-devel-guide/ There is work going on right now to update it, it needs also some extensions, e.g. for the PV core functions. Cheers, Henning Am 13.12.19 um 19:10 schrieb Michael Iedema: > Hi all, > > I’m trying to write a basic Kamailio module from scratch and have run into an area where I’m in need of a couple pointers (pun … [View More]

1 0

git:master:36d94144: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 13 Dec '19

13 Dec '19

Module: kamailio Branch: master Commit: 36d941442496a51e265bdb96362624b667a40132 URL: https://github.com/kamailio/kamailio/commit/36d941442496a51e265bdb96362624b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-13T18:46:09+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]36d941442496a51e265bdb96362624b… Patch: https://github.com/kamailio/kamailio/commit/36d941442496a51e265bdb96362624b… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 6929bfaf84..7408b51713 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1295,24 +1295,24 @@ if(ds_list_exists("10")) { Description of parameters: * groupid (optional) - if not given or its value is -1, the matching - will be done over all addresses in all dispacher groups. Otherwise + will be done over all addresses in all dispatcher groups. Otherwise the matching will be done only against the addresses in the specific group id. The parameter can be an integer or a variable holding an integer value. * mode - (optional) - a bitmask to specify how the matching should be - done. If is 0, all ip, port and proto are matched and active status - is ignored. If bit one is set, then port is ignored. If bit two is - set, then protocol is ignored. If bit three is set, then state must - be active. The parameter can be an integer or a variable holding an - integer value. It must be provided if the uri parameter is - provided. - * uri (optional) - if is empty or missing, the matching is done - against source IP, port and protocol. Otherwise the value has to be - a valid SIP URI, used to match against addresses in the dispatcher - list. Only IP, port and protocol are matches, any additional - parameters are ignored. The parameter can be a static or dynamic - (with variables) string. The domain part of the URI can be an IP - address or a hostname. + done. If parameter is 0, all ip, port and proto are matched and + active status is ignored. If bit one is set, then port is ignored. + If bit two is set, then protocol is ignored. If bit three is set, + then state must be active. The parameter can be an integer or a + variable holding an integer value. It must be provided if the uri + parameter is provided. + * uri (optional) - if parameter is empty or missing, the matching is + done against source IP, port and protocol. Otherwise the value has + to be a valid SIP URI, used to match against addresses in the + dispatcher list. Only IP, port and protocol are matches, any + additional parameters are ignored. The parameter can be a static or + dynamic (with variables) string. The domain part of the URI can be + an IP address or a hostname. Upon a match, the variable specified by 'setid_pvname' parameter will be set to groupid of matching address and the attributes will be set in [View Less]

1 0

git:master:da115fae: dispatcher: Minor documentation improvement for ds_is_from_list()
by Mikko Lehto 13 Dec '19

13 Dec '19

Module: kamailio Branch: master Commit: da115fae61f5e1aa5e29edd4a7a9e5a9bcd291f0 URL: https://github.com/kamailio/kamailio/commit/da115fae61f5e1aa5e29edd4a7a9e5a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2019-12-13T19:37:21+02:00 dispatcher: Minor documentation improvement for ds_is_from_list() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:93e7f4b3: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 13 Dec '19

13 Dec '19

Module: kamailio Branch: master Commit: 93e7f4b3b4120c4eaf064600a58128842cf91ace URL: https://github.com/kamailio/kamailio/commit/93e7f4b3b4120c4eaf064600a581288… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-13T16:16:12+01:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/93e7f4b3b4120c4eaf064600a581288… … [View More]

1 0

git:master:d5030adf: rr: new function rr_next_hop_route()
by Daniel-Constantin Mierla 13 Dec '19

13 Dec '19

Module: kamailio Branch: master Commit: d5030adfaab5627791ea31a26141719349dba4b2 URL: https://github.com/kamailio/kamailio/commit/d5030adfaab5627791ea31a26141719… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-13T16:09:03+01:00 rr: new function rr_next_hop_route() - return 1 (true) if there is a route header for next hop address --- Modified: src/modules/rr/loose.c Modified: src/modules/rr/rr_mod.c … [View More]--- Diff: https://github.com/kamailio/kamailio/commit/d5030adfaab5627791ea31a26141719… Patch: https://github.com/kamailio/kamailio/commit/d5030adfaab5627791ea31a26141719… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 1440b6da98..28bc700941 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -893,6 +893,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) uri.len, ZSW(uri.s)); return RR_ERROR; } + _m->msg_flags |= FL_ROUTE_ADDR; } else { #ifdef ENABLE_USER_CHECK /* check if it the ignored user */ diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 5b742223f9..fa8345e36c 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -80,6 +80,7 @@ static int w_add_rr_param(struct sip_msg *,char *, char *); static int w_check_route_param(struct sip_msg *,char *, char *); static int w_is_direction(struct sip_msg *,char *, char *); static int w_remove_record_route(sip_msg_t*, char*, char*); +static int w_rr_next_hop_route(sip_msg_t *, char *, char *); /* PV functions */ static int pv_get_route_uri_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int pv_get_from_tag_initial(sip_msg_t *msg, pv_param_t *param, @@ -113,6 +114,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"remove_record_route", w_remove_record_route, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"rr_next_hop_route", (cmd_function)w_rr_next_hop_route, 0, 0, 0, + ANY_ROUTE}, {"load_rr", (cmd_function)load_rr, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -756,6 +759,26 @@ static int pv_get_rdir(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } + +/** + * + */ +static int ki_rr_next_hop_route(sip_msg_t *msg) +{ + if(msg->msg_flags & FL_ROUTE_ADDR) { + return 1; + } + return -1; +} + +/** + * + */ +static int w_rr_next_hop_route(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_rr_next_hop_route(msg); +} + /** * */ @@ -806,6 +829,11 @@ static sr_kemi_t sr_kemi_rr_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("rr"), str_init("next_hop_route"), + SR_KEMIP_INT, ki_rr_next_hop_route, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */ [View Less]

1 0

git:master:9ddef157: rr: docs for rr_next_hop_route() function
by Daniel-Constantin Mierla 13 Dec '19

13 Dec '19

Module: kamailio Branch: master Commit: 9ddef1571c5508f2b12614d3cebac4368609a498 URL: https://github.com/kamailio/kamailio/commit/9ddef1571c5508f2b12614d3cebac43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-13T16:14:04+01:00 rr: docs for rr_next_hop_route() function --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:24afe136: core: internal flag to mark sip request if there is a route for next hop
by Daniel-Constantin Mierla 13 Dec '19

13 Dec '19

Module: kamailio Branch: master Commit: 24afe136361402f49f62aadc4401706c77a6b253 URL: https://github.com/kamailio/kamailio/commit/24afe136361402f49f62aadc4401706… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-13T16:07:55+01:00 core: internal flag to mark sip request if there is a route for next hop --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:c0ef9323: modules: readme files regenerated - keepalive ... [skip ci]
by Kamailio Dev 12 Dec '19

12 Dec '19

Module: kamailio Branch: master Commit: c0ef932324db091d8e0a14ac1287973db5bf08da URL: https://github.com/kamailio/kamailio/commit/c0ef932324db091d8e0a14ac1287973… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-12T12:16:14+01:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] keepalive : added new function del_destination and added .cfg functions (#2133)
by Yasin CANER 12 Dec '19

12 Dec '19

#### 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 added new function del_destination that deletes sip address from list added add_destination module functions for kamailio.cfg added counter parameter for attempt count. after count pass, module dont try until it adds again. added kemi interfaces both of them added lock to stack added find_destination function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2133 -- Commit Summary -- * keepalive : added new function del_destination and added .cfg functions -- File Changes -- M src/modules/keepalive/api.h (4) M src/modules/keepalive/keepalive.h (10) M src/modules/keepalive/keepalive_api.c (117) M src/modules/keepalive/keepalive_core.c (14) M src/modules/keepalive/keepalive_mod.c (93) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2133.patch https://github.com/kamailio/kamailio/pull/2133.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/2133 [View Less]

3 12

git:master:e8bd86d7: keepalive : added new function del_destination and added cfg functions (#2133)
by Daniel-Constantin Mierla 12 Dec '19

12 Dec '19

Module: kamailio Branch: master Commit: e8bd86d764eca0b9554f9eee665ba786d76230e7 URL: https://github.com/kamailio/kamailio/commit/e8bd86d764eca0b9554f9eee665ba78… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-12T12:06:24+01:00 keepalive : added new function del_destination and added cfg functions (#2133) * keepalive : added new function del_destination and added .cfg functions added new function … [View More]

1 0

git:master:ae08b595: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 12 Dec '19

12 Dec '19

Module: kamailio Branch: master Commit: ae08b5955935466c401709903b38491aba7ec33e URL: https://github.com/kamailio/kamailio/commit/ae08b5955935466c401709903b38491… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-12T08:46:16+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/ae08b5955935466c401709903b38491… … [View More]

1 0

git:master:9a0c850f: tm: clarification that the sip message flags operations after t_newtran()
by Daniel-Constantin Mierla 12 Dec '19

12 Dec '19

Module: kamailio Branch: master Commit: 9a0c850f98063da145120f90d2c5c2a43e76b976 URL: https://github.com/kamailio/kamailio/commit/9a0c850f98063da145120f90d2c5c2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-12T08:42:06+01:00 tm: clarification that the sip message flags operations after t_newtran() - they are not reflected in transaction, only in local sip message structure --- Modified: src/… [View More]

1 0

git:master:9b97d01e: kamailio.cfg: replaced xmlrpc with jsonrpc in default config
by Daniel-Constantin Mierla 11 Dec '19

11 Dec '19

Module: kamailio Branch: master Commit: 9b97d01e90963851eaa698b2ab1e04fe43822b98 URL: https://github.com/kamailio/kamailio/commit/9b97d01e90963851eaa698b2ab1e04f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-11T12:28:20+01:00 kamailio.cfg: replaced xmlrpc with jsonrpc in default config --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]9b97d01e90963851eaa698b2ab1e04f… Patch: https://github.com/kamailio/kamailio/commit/9b97d01e90963851eaa698b2ab1e04f… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index ee3ec9e63d..01e56b66ae 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -77,9 +77,9 @@ # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS # -# *** To enable XMLRPC support execute: -# - define WITH_XMLRPC -# - adjust route[XMLRPC] for access policy +# *** To enable JSONRPC over HTTP(S) support execute: +# - define WITH_JSONRPC +# - adjust route[JSONRPC] for access policy # # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is @@ -199,6 +199,10 @@ enable_tls=yes tls_max_connections=2048 #!endif +#!ifdef WITH_JSONRPC +tcp_accept_no_cl=yes +#!endif + ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface @@ -235,6 +239,9 @@ voicemail.srv_port = "5060" desc "VoiceMail Port" loadmodule "db_mysql.so" #!endif +#!ifdef WITH_JSONRPC +loadmodule "xhttp.so" +#!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" @@ -298,10 +305,6 @@ loadmodule "htable.so" loadmodule "pike.so" #!endif -#!ifdef WITH_XMLRPC -loadmodule "xmlrpc.so" -#!endif - #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif @@ -315,6 +318,9 @@ modparam("jsonrpcs", "pretty_format", 1) # modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") +#!ifdef WITH_JSONRPC +modparam("jsonrpcs", "transport", 7) +#!endif # ----- ctl params ----- /* set the path to RPC unix socket control file */ @@ -461,12 +467,6 @@ modparam("pike", "remove_latency", 4) modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif -#!ifdef WITH_XMLRPC -# ----- xmlrpc params ----- -modparam("xmlrpc", "route", "XMLRPC"); -modparam("xmlrpc", "url_match", "^/RPC") -#!endif - #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) @@ -922,22 +922,24 @@ route[PSTN] { return; } -# XMLRPC routing -#!ifdef WITH_XMLRPC -route[XMLRPC] { - # allow XMLRPC from localhost - if ((method=="POST" || method=="GET") - && (src_ip==127.0.0.1)) { - # close connection only for xmlrpclib user agents (there is a bug in - # xmlrpclib: it waits for EOF before interpreting the response). - if ($hdr(User-Agent) =~ "xmlrpclib") - set_reply_close(); - set_reply_no_connect(); - dispatch_rpc(); +# JSONRPC over HTTP(S) routing +#!ifdef WITH_JSONRPC +event_route[xhttp:request] { + set_reply_close(); + set_reply_no_connect(); + if(src_ip!=127.0.0.1) { + xhttp_reply("403", "Forbidden", "text/html", + "<html><body>Not allowed from $si</body></html>"); exit; } - send_reply("403", "Forbidden"); - exit; + if ($hu =~ "^/RPC") { + jsonrpc_dispatch(); + exit; + } + + xhttp_reply("200", "OK", "text/html", + "<html><body>Wrong URL $hu</body></html>"); + exit; } #!endif [View Less]

1 0

git:master:4b7a2d5b: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 11 Dec '19

11 Dec '19

Module: kamailio Branch: master Commit: 4b7a2d5bd9848e367f201b45fc8727a7fa8bae26 URL: https://github.com/kamailio/kamailio/commit/4b7a2d5bd9848e367f201b45fc8727a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-11T11:46:24+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:58021b2e: registrar: add documentation for xavp_rcd_mask parameter
by Victor Seva 11 Dec '19

11 Dec '19

Module: kamailio Branch: master Commit: 58021b2e94c3f98048470d83fe9e331ebb8e725f URL: https://github.com/kamailio/kamailio/commit/58021b2e94c3f98048470d83fe9e331… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-11T11:40:30+01:00 registrar: add documentation for xavp_rcd_mask parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:9593e3fe: registrar: control what values to add to xavp_rcd via xavp_rcd_mask
by Victor Seva 11 Dec '19

11 Dec '19

Module: kamailio Branch: master Commit: 9593e3fed83a79dce35536d2eb132b29388a4e0b URL: https://github.com/kamailio/kamailio/commit/9593e3fed83a79dce35536d2eb132b2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-11T11:40:30+01:00 registrar: control what values to add to xavp_rcd via xavp_rcd_mask --- Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/lookup.h Modified: src/… [View More]

1 0

[kamailio/kamailio] registrar: (#2168)
by Victor Seva 11 Dec '19

11 Dec '19

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

4 13

git:master:433551f3: tls: init EVP_PKEY pointer when loading engine key
by Daniel-Constantin Mierla 10 Dec '19

10 Dec '19

Module: kamailio Branch: master Commit: 433551f3ea00e4151f2fa4e84d7c52422b6cefe3 URL: https://github.com/kamailio/kamailio/commit/433551f3ea00e4151f2fa4e84d7c524… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-10T12:46:34+01:00 tls: init EVP_PKEY pointer when loading engine key --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:46436cf8: tcp: checks for event route index on close
by Daniel-Constantin Mierla 10 Dec '19

10 Dec '19

Module: kamailio Branch: master Commit: 46436cf8ef7d337c255b2fd9115544a6971f9741 URL: https://github.com/kamailio/kamailio/commit/46436cf8ef7d337c255b2fd9115544a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-10T12:38:30+01:00 tcp: checks for event route index on close --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/46436cf8ef7d337c255b2fd9115544a… … [View More]

1 0

git:master:263b8ce5: tm: rework code to avoid compiler warnings
by Daniel-Constantin Mierla 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 263b8ce5360716e44c6a7bcdbc65a76dfad67575 URL: https://github.com/kamailio/kamailio/commit/263b8ce5360716e44c6a7bcdbc65a76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T22:17:40+01:00 tm: rework code to avoid compiler warnings - fix log message priting wrong string variable --- Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/tm.c --- Diff: … [View More]https://github.com/kamailio/kamailio/commit/263b8ce5360716e44c6a7bcdbc65a76… Patch: https://github.com/kamailio/kamailio/commit/263b8ce5360716e44c6a7bcdbc65a76… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 949340f1ce..d2275a6151 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -165,8 +165,8 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, tm_cell_t *backup_T = T_UNDEFINED; int backup_T_branch = T_BR_UNDEFINED; sip_msg_t *faked_req; - sip_msg_t *brpl; - void *erpl; + sip_msg_t *brpl = NULL; + void *erpl = NULL; int faked_req_len = 0; struct cancel_info cancel_data; int branch; @@ -499,46 +499,48 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, } else { /* response handling */ tm_ctx_set_branch_index(T_BR_UNDEFINED); - /* unref the transaction */ - t_unref(brpl); - LM_DBG("Freeing earlier cloned reply\n"); - - /* free lumps that were added during reply processing */ - del_nonshm_lump( &(brpl->add_rm) ); - del_nonshm_lump( &(brpl->body_lumps) ); - del_nonshm_lump_rpl( &(brpl->reply_lump) ); - - /* free header's parsed structures that were added */ - for( hdr=brpl->headers ; hdr ; hdr=hdr->next ) { - if ( hdr->parsed && hdr_allocs_parse(hdr) && - (hdr->parsed<(void*)brpl || - hdr->parsed>=(void*)erpl)) { - clean_hdr_field(hdr); - hdr->parsed = 0; + if(brpl) { + /* unref the transaction */ + t_unref(brpl); + LM_DBG("Freeing earlier cloned reply\n"); + + /* free lumps that were added during reply processing */ + del_nonshm_lump( &(brpl->add_rm) ); + del_nonshm_lump( &(brpl->body_lumps) ); + del_nonshm_lump_rpl( &(brpl->reply_lump) ); + + /* free header's parsed structures that were added */ + for( hdr=brpl->headers ; hdr ; hdr=hdr->next ) { + if (hdr->parsed && hdr_allocs_parse(hdr) && + (hdr->parsed<(void*)brpl || + (erpl && hdr->parsed>=(void*)erpl))) { + clean_hdr_field(hdr); + hdr->parsed = 0; + } } - } - /* now go through hdr fields themselves - * and remove the pkg allocated space */ - hdr = brpl->headers; - while (hdr) { - if ( hdr && ((void*)hdr<(void*)brpl || - (void*)hdr>=(void*)erpl)) { - /* this header needs to be freed and removed form the list */ - if (!prev) { - brpl->headers = hdr->next; + /* now go through hdr fields themselves + * and remove the pkg allocated space */ + hdr = brpl->headers; + while (hdr) { + if ( hdr && ((void*)hdr<(void*)brpl || + (void*)hdr>=(void*)erpl)) { + /* this header needs to be freed and removed form the list */ + if (!prev) { + brpl->headers = hdr->next; + } else { + prev->next = hdr->next; + } + tmp = hdr; + hdr = hdr->next; + pkg_free(tmp); } else { - prev->next = hdr->next; + prev = hdr; + hdr = hdr->next; } - tmp = hdr; - hdr = hdr->next; - pkg_free(tmp); - } else { - prev = hdr; - hdr = hdr->next; } + sip_msg_free(brpl); } - sip_msg_free(brpl); } set_t(backup_T, backup_T_branch); diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index da47c60527..39180442e2 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1054,7 +1054,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) { regmatch_t pmatch; struct cell *t; - char *status, *s = NULL; + char *status = NULL; char backup; int lowest_status, n, ret; regex_t re; @@ -1071,7 +1071,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) memset(&re, 0, sizeof(regex_t)); if (regcomp(&re, sexp->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { - LM_ERR("Bad regular expression '%s'\n", s); + LM_ERR("Bad regular expression '%s'\n", sexp->s); goto error0; } [View Less]

1 0

git:master:fd750fe6: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: fd750fe6047343720e319479e405f6953a4097a4 URL: https://github.com/kamailio/kamailio/commit/fd750fe6047343720e319479e405f69… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T21:31:09+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/fd750fe6047343720e319479e405f69… … [View More]

1 0

git:master:0e5d24b4: tls: docs - fixed docbook tags
by Daniel-Constantin Mierla 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 0e5d24b4b5c427c1bcf0a4cecf21d6db260acb0c URL: https://github.com/kamailio/kamailio/commit/0e5d24b4b5c427c1bcf0a4cecf21d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T21:19:17+01:00 tls: docs - fixed docbook tags --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/0e5d24b4b5c427c1bcf0a4cecf21d6d… Patch: … [View More]

1 0

git:master:765f4b1f: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 765f4b1f862ca297e673f0133d1acbdc4615ccb0 URL: https://github.com/kamailio/kamailio/commit/765f4b1f862ca297e673f0133d1acbd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T21:16:14+01:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/765f4b1f862ca297e673f0133d1acbd… … [View More]

1 0

git:master:24a522ba: tls: add verify_client support (#2166)
by Daniel-Constantin Mierla 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 24a522ba8565ccf1fc1d50792f8fb2585dd30039 URL: https://github.com/kamailio/kamailio/commit/24a522ba8565ccf1fc1d50792f8fb25… Author: Armen Babikyan <armenb(a)mit.edu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T21:02:53+01:00 tls: add verify_client support (#2166) * tls: add verify_client support * tls: fix error in forward-port * tls: docbook update --- Modified: src/modules/tls/doc/params.xml Modified: src/… [View More]

1 0

[kamailio/kamailio] tls: add verify_client support (#2166)
by Armen Babikyan 09 Dec '19

09 Dec '19

Note: See below for more info about motivation of this feature. #### Pre-Submission Checklist - [ * ] Commit message has the format required by CONTRIBUTING guide - [ * ] 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 - [ ] … [View More]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 This feature aims to replace require_certificate and verify_certificate params with a single option, verify_client: * Provides flexibility: require_certificate and verify_certificate are both booleans, so there are only 4 max combinations of params, and only 3 of them make sense (require_certificate=1 and verify_certificate=0 does not). In contrast, verify_client is a list of enumerated values, which can be more gracefully expanded by adding additional behaviors to the enum. * Motivation for this feature is to enable optional_no_ca behavior, described in the docbook; Without this feature, that behavior cannot be represented by any combination of require_certificate and verify_certificate. I figured if I need to add another variable to support desired behavior, it may as well be one that can hold more than just boolean values. * This feature was inspired from a similar one in Nginx; that software has a similar "ssl_verify_client" option that takes the same "on", "off", "optional", and "optional_no_ca" values, which effectively implement the same feature. Note that there is no shared code between implementations, and that these behaviors are implemented (in both cases) via a very thin layer of glue code on top of the OpenSSL library. * Note that the only function definition in tls_verify.c, verify_callback(int pre_verify_ok, X509_STORE_CTX *ctx), has been compiled into the kamailio binary, but apparently not used. Rather than modify the existing function, I added a simple 1-line function (2 if you count the log message too) to enable this feature. Please let me know if I can answer any questions. Thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2166 -- Commit Summary -- * tls: add verify_client support -- File Changes -- M src/modules/tls/doc/params.xml (52) M src/modules/tls/tls_cfg.c (3) M src/modules/tls/tls_cfg.h (1) M src/modules/tls/tls_config.c (31) M src/modules/tls/tls_config.h (4) M src/modules/tls/tls_domain.c (20) M src/modules/tls/tls_domain.h (14) M src/modules/tls/tls_mod.c (12) M src/modules/tls/tls_rpc.c (3) M src/modules/tls/tls_verify.c (6) M src/modules/tls/tls_verify.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2166.patch https://github.com/kamailio/kamailio/pull/2166.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/2166 [View Less]

2 5

[kamailio/kamailio] dmq usrloc replicate socket info (#2173)
by Nuno M Reis 09 Dec '19

09 Dec '19

- replicate socket_info through dmq for anycast scenarios using a new modparam You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2173 -- Commit Summary -- * Merge branch 'master' of git://git.sip-router.org/kamailio * Merge branch 'master' of git://github.com/kamailio/kamailio * replicate_socket_info using dmq -- File Changes -- M src/modules/dmq_usrloc/README (17) M src/modules/… [View More]

2 3

git:5.1:51a3910d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Dec '19

09 Dec '19

Module: kamailio Branch: 5.1 Commit: 51a3910dcfc231075870e8f7739521079a8c9a35 URL: https://github.com/kamailio/kamailio/commit/51a3910dcfc231075870e8f77395210… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T19:31:58+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:c0ad6576: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Dec '19

09 Dec '19

Module: kamailio Branch: 5.2 Commit: c0ad6576661c4940b1406af99d2dae262469b470 URL: https://github.com/kamailio/kamailio/commit/c0ad6576661c4940b1406af99d2dae2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T19:31:41+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.3:f36ac2aa: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Dec '19

09 Dec '19

Module: kamailio Branch: 5.3 Commit: f36ac2aa2d5ac9ed9209176cd01b94c349c49cd8 URL: https://github.com/kamailio/kamailio/commit/f36ac2aa2d5ac9ed9209176cd01b94c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T19:31:26+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:636e3d37: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 636e3d372636172bddb266809639509d62dbcbc8 URL: https://github.com/kamailio/kamailio/commit/636e3d372636172bddb266809639509… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T19:31:12+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.1:b582d1d3: rtpengine: doc typos
by Victor Seva 09 Dec '19

09 Dec '19

Module: kamailio Branch: 5.1 Commit: b582d1d3b31a9806f41b036cc55713ed4b5d0c0e URL: https://github.com/kamailio/kamailio/commit/b582d1d3b31a9806f41b036cc55713e… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T19:28:39+01:00 rtpengine: doc typos (cherry picked from commit b86fa175e92be4a2ab36f198ebc47d8f9b7c9e2a) (cherry picked from commit 61445fc12961d414141ed2115a6003c551884e74) Adapted for 5.1 ---… [View More]

1 0

git:5.2:61445fc1: rtpengine: doc typos
by Victor Seva 09 Dec '19

09 Dec '19

Module: kamailio Branch: 5.2 Commit: 61445fc12961d414141ed2115a6003c551884e74 URL: https://github.com/kamailio/kamailio/commit/61445fc12961d414141ed2115a6003c… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T19:26:13+01:00 rtpengine: doc typos (cherry picked from commit b86fa175e92be4a2ab36f198ebc47d8f9b7c9e2a) Adapted for 5.2 --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff:… [View More]

1 0

git:5.3:763c30cc: rtpengine: doc typos
by Victor Seva 09 Dec '19

09 Dec '19

Module: kamailio Branch: 5.3 Commit: 763c30cc65307b7cdd7dd54f604acdffecb9a4b7 URL: https://github.com/kamailio/kamailio/commit/763c30cc65307b7cdd7dd54f604acdf… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T19:24:24+01:00 rtpengine: doc typos (cherry picked from commit b86fa175e92be4a2ab36f198ebc47d8f9b7c9e2a) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://… [View More]

1 0

[kamailio/kamailio] rtpengine: doc typos (#2174)
by Dmitri Savolainen 09 Dec '19

09 Dec '19

- [x ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2174 -- Commit Summary -- * rtpengine: doc typos -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2174.patch https://github.com/kamailio/kamailio/pull/… [View More]

2 2

git:master:b86fa175: rtpengine: doc typos
by Victor Seva 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: b86fa175e92be4a2ab36f198ebc47d8f9b7c9e2a URL: https://github.com/kamailio/kamailio/commit/b86fa175e92be4a2ab36f198ebc47d8… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T19:23:36+01:00 rtpengine: doc typos --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b86fa175e92be4a2ab36f198ebc47d8… … [View More]

1 0

git: new commits in branch master
by Victor Seva 09 Dec '19

09 Dec '19

- URL: https://github.com/kamailio/kamailio/commit/d39dd5480c6e8d56a1fb2c91220da07… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T19:06:47+01:00 auth: add clang-format directives to skip format on kemi_exports format is important for generating docs by our python tool - URL: https://github.com/kamailio/kamailio/commit/52f29796fc79706e31f389fbcf35d7b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T19:06:58+01:00 … [View More]

1 0

git:master:a1acd621: dialog: export dlg_reset_property() to kemi
by Daniel-Constantin Mierla 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: a1acd62128c7c1e1d7e3c6ce55a9b78a3e32c0b2 URL: https://github.com/kamailio/kamailio/commit/a1acd62128c7c1e1d7e3c6ce55a9b78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T12:47:22+01:00 dialog: export dlg_reset_property() to kemi --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/a1acd62128c7c1e1d7e3c6ce55a9b78…… [View More]

1 0

git:master:5fc66547: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 5fc6654781a930bcb9791e8214d6b53ce8482492 URL: https://github.com/kamailio/kamailio/commit/5fc6654781a930bcb9791e8214d6b53… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-09T12:46:27+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:0303415c: Merge pull request #2172 from korayvt/korayvt/dlg_reset_property
by GitHub 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 0303415cce2acafe01cbbff0601259cd9162586a URL: https://github.com/kamailio/kamailio/commit/0303415cce2acafe01cbbff0601259c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-12-09T12:44:54+01:00 Merge pull request #2172 from korayvt/korayvt/dlg_reset_property dialog: add new dlg_reset_property function --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/… [View More]

1 0

git:master:3af08bbd: dialod: indentation fixed
by KORAY VATANSEVER 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 3af08bbd0bffacc6b31029e436ce729b1952d4a9 URL: https://github.com/kamailio/kamailio/commit/3af08bbd0bffacc6b31029e436ce729… Author: KORAY VATANSEVER <koray.vatansever(a)turkcell.com.tr> Committer: KORAY VATANSEVER <koray.vatansever(a)turkcell.com.tr> Date: 2019-12-09T09:09:40+03:00 dialod: indentation fixed --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/3af08bbd0bffacc6b31029e436ce729… … [View More]Patch: https://github.com/kamailio/kamailio/commit/3af08bbd0bffacc6b31029e436ce729… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index e10b74e12c..381017032e 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -245,7 +245,7 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"dlg_set_property", (cmd_function)w_dlg_set_property,1,fixup_spve_null, 0, ANY_ROUTE }, - {"dlg_reset_property", (cmd_function)w_dlg_reset_property,1,fixup_spve_null, + {"dlg_reset_property", (cmd_function)w_dlg_reset_property,1,fixup_spve_null, 0, ANY_ROUTE }, {"dlg_remote_profile", (cmd_function)w_dlg_remote_profile, 5, fixup_dlg_remote_profile, 0, ANY_ROUTE }, @@ -1342,36 +1342,36 @@ static int ki_dlg_reset_property(sip_msg_t *msg, str *pval) dlg_cell_t *d; if(pval->len<=0) { - LM_ERR("empty property value\n"); - return -1; + LM_ERR("empty property value\n"); + return -1; } if ( (dctx=dlg_get_dlg_ctx())==NULL ) - return -1; + return -1; if(pval->len==6 && strncmp(pval->s, "ka-src", 6)==0) { - dctx->iflags &= ~(DLG_IFLAG_KA_SRC); - d = dlg_get_by_iuid(&dctx->iuid); - if(d!=NULL) { - d->iflags &= ~(DLG_IFLAG_KA_SRC); - dlg_release(d); - } + dctx->iflags &= ~(DLG_IFLAG_KA_SRC); + d = dlg_get_by_iuid(&dctx->iuid); + if(d!=NULL) { + d->iflags &= ~(DLG_IFLAG_KA_SRC); + dlg_release(d); + } } else if(pval->len==6 && strncmp(pval->s, "ka-dst", 6)==0) { - dctx->iflags &= ~(DLG_IFLAG_KA_DST); - d = dlg_get_by_iuid(&dctx->iuid); - if(d!=NULL) { - d->iflags &= ~(DLG_IFLAG_KA_DST); - dlg_release(d); - } + dctx->iflags &= ~(DLG_IFLAG_KA_DST); + d = dlg_get_by_iuid(&dctx->iuid); + if(d!=NULL) { + d->iflags &= ~(DLG_IFLAG_KA_DST); + dlg_release(d); + } } else if(pval->len==15 && strncmp(pval->s, "timeout-noreset", 15)==0) { - dctx->iflags &= ~(DLG_IFLAG_TIMER_NORESET); - d = dlg_get_by_iuid(&dctx->iuid); - if(d!=NULL) { - d->iflags &= ~(DLG_IFLAG_TIMER_NORESET); - dlg_release(d); - } + dctx->iflags &= ~(DLG_IFLAG_TIMER_NORESET); + d = dlg_get_by_iuid(&dctx->iuid); + if(d!=NULL) { + d->iflags &= ~(DLG_IFLAG_TIMER_NORESET); + dlg_release(d); + } } else { - LM_ERR("unknown property value [%.*s]\n", pval->len, pval->s); - return -1; + LM_ERR("unknown property value [%.*s]\n", pval->len, pval->s); + return -1; } return 1; @@ -1386,8 +1386,8 @@ static int w_dlg_reset_property(struct sip_msg *msg, char *prop, char *s2) if(fixup_get_svalue(msg, (gparam_t*)prop, &val)!=0) { - LM_ERR("no property value\n"); - return -1; + LM_ERR("no property value\n"); + return -1; } return ki_dlg_reset_property(msg, &val); [View Less]

1 0

[kamailio/kamailio] dialog: add new dlg_reset_property function (#2172)
by korayvt 09 Dec '19

09 Dec '19

#### 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  - new dlg_reset_property() function is added to disable the previously enabled dialog module behaviour. e.g. stop sending keep-alive OPTIONS messages. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2172 -- Commit Summary -- * dialog: add new dlg_reset_property function * dialod: indentation fixed -- File Changes -- M src/modules/dialog/dialog.c (63) M src/modules/dialog/doc/dialog_admin.xml (42) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2172.patch https://github.com/kamailio/kamailio/pull/2172.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/2172 [View Less]

2 2

git:master:4883b692: dialog: add new dlg_reset_property function
by KORAY VATANSEVER 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 4883b69298deda1fede5bcd02af9849e4142a629 URL: https://github.com/kamailio/kamailio/commit/4883b69298deda1fede5bcd02af9849… Author: KORAY VATANSEVER <koray.vatansever(a)turkcell.com.tr> Committer: KORAY VATANSEVER <koray.vatansever(a)turkcell.com.tr> Date: 2019-12-09T08:41:56+03:00 dialog: add new dlg_reset_property function - new dlg_reset_property() function is added to disable the previously enabled dialog module behaviour. e.g. stop … [View More]

1 0

5061 port Cannot assign requested address
by Jignesh Datta 09 Dec '19

09 Dec '19

Hi All, I have Kamailio v4.4.1 installed in ubuntu 14.04 server with TLS enabled. After I have done the patching of the server and then restarted the server. After that, it is not working. When I try to start the Kamailio service it says "already running". But when I check the status of the service it says "Kamailio is not running". I thought this Kamailio process might be using port 5061 but when checked using netstat it shows 5061 is not used by anywhere. SO I am wondering why it is not … [View More]

2 7

Kamailio management group updates
by Daniel-Constantin Mierla 09 Dec '19

09 Dec '19

Hello, Jesus Rodrigues and Inaki Baz Castillo changed their work roles a while ago, so they no longer deal with Kamailio and they do not expect to do it in the near future. To keep the Management group with members connected as much as possible with the project, Fred Posner and Victor Seva were proposed to replace them. For the new members in the public lists: the management group of Kamailio is not involved in the daily development or administration of the project -- all those are done on … [View More]

1 0

git:master:e1a3e0d6: cfgt: use snprintf instead of sprintf
by Victor Seva 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: e1a3e0d6f21507bc6f6ccb2e50a03c19872ff04b URL: https://github.com/kamailio/kamailio/commit/e1a3e0d6f21507bc6f6ccb2e50a03c1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T09:19:17+01:00 cfgt: use snprintf instead of sprintf --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:913ba6f1: pv_headers: use snprintf instead of sprintf
by Victor Seva 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 913ba6f196d19005a0e93ad0dbbdc48f532a9897 URL: https://github.com/kamailio/kamailio/commit/913ba6f196d19005a0e93ad0dbbdc48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T09:12:05+01:00 pv_headers: use snprintf instead of sprintf --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:46e4389a: pv_headers: add clang-format directives to skip format on kemi_exports
by Victor Seva 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 46e4389a8d4f546041cc0056473ef3fa7ebade63 URL: https://github.com/kamailio/kamailio/commit/46e4389a8d4f546041cc0056473ef3f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T08:59:41+01:00 pv_headers: add clang-format directives to skip format on kemi_exports format is important for generating docs by our python tool --- Modified: src/modules/pv_headers/… [View More]

1 0

[kamailio/kamailio] KEMI record_route_preset requires 2 parameters instead of 1 (#2171)
by Whitey 09 Dec '19

09 Dec '19

### Description Hi all! It looks like in https://github.com/kamailio/kamailio/pull/2051 `record_route_preset` was exposed to KEMI, which is awesome (thank you @aalba6675 !). However the second parameter in this function should be optional (see https://kamailio.org/docs/modules/devel/modules/rr.html#rr.f.record_route_p…). ### Troubleshooting When using with a single parameter, the following error is thrown: `Dec 9 13:24:13 ip-10-0-0-1 /usr/local/sbin/kamailio[15828]: ERROR: app_ruby [… [View More]

2 2

git:master:b05b0891: rr: exported to kemi record_route_preset_one()
by Daniel-Constantin Mierla 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: b05b0891d890d55b649d19ec22105b2bdcfd3ba5 URL: https://github.com/kamailio/kamailio/commit/b05b0891d890d55b649d19ec22105b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T07:03:18+01:00 rr: exported to kemi record_route_preset_one() - the variant for record_route_preset() with one parameter - GH #2171 --- Modified: src/modules/rr/rr_mod.c --- Diff: https:/… [View More]/github.com/kamailio/kamailio/commit/b05b0891d890d55b649d19ec22105b2… Patch: https://github.com/kamailio/kamailio/commit/b05b0891d890d55b649d19ec22105b2… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 31a6031a5f..6ed7cd8131 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -292,26 +292,45 @@ static int ki_record_route(sip_msg_t *msg) } /** - * wrapper for record_route_preset(msg, key1, key2) + * wrapper for record_route_preset(msg, addr1, addr2) */ -static int ki_record_route_preset(sip_msg_t *msg, str *key1, str *key2) +static int ki_record_route_preset(sip_msg_t *msg, str *addr1, str *addr2) { if (msg->msg_flags & FL_RR_ADDED) { LM_ERR("Double attempt to record-route\n"); return -1; } - if (key2 && !enable_double_rr) { + if (addr2 && addr2->len>0 && !enable_double_rr) { LM_ERR("Attempt to double record-route while 'enable_double_rr' param is disabled\n"); return -1; } - if ( record_route_preset( msg, key1)<0 ) + if ( record_route_preset(msg, addr1)<0 ) return -1; - if (!key2) + if (!addr2 || addr2->len<=0) goto done; - if ( record_route_preset( msg, key2)<0 ) + if ( record_route_preset(msg, addr2)<0 ) + return -1; + +done: + msg->msg_flags |= FL_RR_ADDED; + return 1; + +} + +/** + * wrapper for record_route_preset(msg, addr1) + */ +static int ki_record_route_preset_one(sip_msg_t *msg, str *addr1) +{ + if (msg->msg_flags & FL_RR_ADDED) { + LM_ERR("Double attempt to record-route\n"); + return -1; + } + + if ( record_route_preset( msg, addr1)<0 ) return -1; done: @@ -776,6 +795,11 @@ static sr_kemi_t sr_kemi_rr_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("rr"), str_init("record_route_preset_one"), + SR_KEMIP_INT, ki_record_route_preset_one, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("rr"), str_init("record_route_preset"), SR_KEMIP_INT, ki_record_route_preset, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, [View Less]

1 0

git:master:0c29f0e3: pv_headers: fixed kemi export for pvh_append_header()
by Daniel-Constantin Mierla 09 Dec '19

09 Dec '19

Module: kamailio Branch: master Commit: 0c29f0e36b5b287266b5180efac14d4366fbe272 URL: https://github.com/kamailio/kamailio/commit/0c29f0e36b5b287266b5180efac14d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T07:00:51+01:00 pv_headers: fixed kemi export for pvh_append_header() - reformat kemi exports structure to be able to parse with python tool for generating docs --- Modified: src/modules/… [View More]pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/0c29f0e36b5b287266b5180efac14d4… Patch: https://github.com/kamailio/kamailio/commit/0c29f0e36b5b287266b5180efac14d4… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index 97308479ce..999802c127 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -314,35 +314,43 @@ int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) } static sr_kemi_t pvh_kemi_exports[] = { - {str_init("pv_headers"), str_init("pvh_collect_headers"), SR_KEMIP_INT, - ki_pvh_collect_headers, - {SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_apply_headers"), SR_KEMIP_INT, - ki_pvh_apply_headers, - {SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_reset_headers"), SR_KEMIP_INT, - pvh_reset_headers, - {SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_check_header"), SR_KEMIP_INT, - pvh_check_header, - {SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_append_header"), SR_KEMIP_INT, - pvh_check_header, - {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_modify_header"), SR_KEMIP_INT, - pvh_modify_header, - {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_remove_header"), SR_KEMIP_INT, - pvh_remove_header, - {SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}}}; + { str_init("pv_headers"), str_init("pvh_collect_headers"), + SR_KEMIP_INT, ki_pvh_collect_headers, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_apply_headers"), + SR_KEMIP_INT, ki_pvh_apply_headers, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_reset_headers"), + SR_KEMIP_INT, pvh_reset_headers, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_check_header"), + SR_KEMIP_INT, pvh_check_header, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_append_header"), + SR_KEMIP_INT, pvh_append_header, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_modify_header"), + SR_KEMIP_INT, pvh_modify_header, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_remove_header"), + SR_KEMIP_INT, pvh_remove_header, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}} +}; int mod_register(char *path, int *dlflags, void *p1, void *p2) { [View Less]

1 0

[kamailio/kamailio] dispatcher: select using IP proto (#2170)
by sergey-safarov 08 Dec '19

08 Dec '19

### Description Some daemon not able to handle IPv4 and IPv6 calls simultaneously. As example `FreeSwitch`. Need to create two dispatcher records for IPv4 and IPv6 FreeSwitch sockets. Each socket will be able to handle appropriate call type. Mixing not allowed. Could you add `dispatcher` module options to compare used IP version for incoming call and for dispatcher backend sip uri. And select backend only if IP versions matched. -- You are receiving this because you are subscribed to this … [View More]

2 4

git:master:64f43879: pkg/kamailio/obs: packaged pv_headers module
by Sergey Safarov 06 Dec '19

06 Dec '19

Module: kamailio Branch: master Commit: 64f4387952fee51a696dd0906ce0f8020fbe204a URL: https://github.com/kamailio/kamailio/commit/64f4387952fee51a696dd0906ce0f80… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-06T17:15:19+03:00 pkg/kamailio/obs: packaged pv_headers module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/64f4387952fee51a696dd0906ce0f80… Patch: … [View More]

1 0

git:master:7515d64f: janssonrpcc: replaced str dup wrapers with the functions from core
by Daniel-Constantin Mierla 06 Dec '19

06 Dec '19

Module: kamailio Branch: master Commit: 7515d64f6a390e19d6caa1508348e7d21523c582 URL: https://github.com/kamailio/kamailio/commit/7515d64f6a390e19d6caa1508348e7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-06T09:49:51+01:00 janssonrpcc: replaced str dup wrapers with the functions from core - they were basic wrappers and returning variables declared on stack - time conversion inline function … [View More]

2 1

Broken: kamailio/kamailio#8177 (master - 7515d64)
by Travis CI 06 Dec '19

06 Dec '19

Build Update for kamailio/kamailio ------------------------------------- Build: #8177 Status: Broken Duration: 6 mins and 48 secs Commit: 7515d64 (master) Author: Daniel-Constantin Mierla Message: janssonrpcc: replaced str dup wrapers with the functions from core - they were basic wrappers and returning variables declared on stack - time conversion inline function replaced with macro View the changeset: https://github.com/kamailio/kamailio/compare/e03244bd5804...7515d64f6a39 View the full … [View More]

1 0

git:master:f6050e23: janssonrpcc: fixed errors from previous commit
by Daniel-Constantin Mierla 06 Dec '19

06 Dec '19

Module: kamailio Branch: master Commit: f6050e2342c3b7f2c7ede45ce96707a5a45b5aa8 URL: https://github.com/kamailio/kamailio/commit/f6050e2342c3b7f2c7ede45ce96707a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-06T09:57:54+01:00 janssonrpcc: fixed errors from previous commit --- Modified: src/modules/janssonrpcc/janssonrpc.h Modified: src/modules/janssonrpcc/janssonrpc_io.c Modified: src/modules/… [View More]janssonrpcc/janssonrpc_request.c Modified: src/modules/janssonrpcc/janssonrpc_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f6050e2342c3b7f2c7ede45ce96707a… Patch: https://github.com/kamailio/kamailio/commit/f6050e2342c3b7f2c7ede45ce96707a… --- diff --git a/src/modules/janssonrpcc/janssonrpc.h b/src/modules/janssonrpcc/janssonrpc.h index 32d14a7cb1..d8b6ffbedb 100644 --- a/src/modules/janssonrpcc/janssonrpc.h +++ b/src/modules/janssonrpcc/janssonrpc.h @@ -94,8 +94,8 @@ extern const str null_str; #define jsr_ms_to_tv(ms, tv) \ do { \ memset(&tv, 0, sizeof(struct timeval)); \ - tv.tv_sec = time/1000; \ - tv.tv_usec = ((time % 1000) * 1000); \ + tv.tv_sec = ms/1000; \ + tv.tv_usec = ((ms % 1000) * 1000); \ } while(0) #endif /* _JSONRPC_H_ */ diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 3818662c4a..ebb64705b5 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -444,7 +444,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) free_req_cmd(req->cmd); free_request(req); } else { - const struct timeval tv; + struct timeval tv; jsr_ms_to_tv(req->timeout, tv); req->timeout_ev = evtimer_new(global_ev_base, timeout_cb, (void*)req); diff --git a/src/modules/janssonrpcc/janssonrpc_request.c b/src/modules/janssonrpcc/janssonrpc_request.c index 8cddee5704..ecd43c1476 100644 --- a/src/modules/janssonrpcc/janssonrpc_request.c +++ b/src/modules/janssonrpcc/janssonrpc_request.c @@ -230,7 +230,7 @@ void retry_cb(int fd, short event, void* arg) int schedule_retry(jsonrpc_request_t* req) { - const struct timeval tv; + struct timeval tv; unsigned int ltime; if(!req) { diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index e8c50cc3fa..6c4b999b50 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -280,7 +280,7 @@ int jsonrpc_server_from_srv(str conn, str srv, server = create_server(); CHECK_MALLOC(server); - shm_str_dup(&server->conn, &/conn); + shm_str_dup(&server->conn, &conn); CHECK_MALLOC_GOTO(server->conn.s, error); shm_str_dup(&server->addr, &name); [View Less]

1 0

git:master:e03244bd: janssonrpcc: fix build warning
by Victor Seva 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: e03244bd5804045a0ea06fb1afbd2d8269855c19 URL: https://github.com/kamailio/kamailio/commit/e03244bd5804045a0ea06fb1afbd2d8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-05T20:08:08+01:00 janssonrpcc: fix build warning > In file included from janssonrpc_connect.c:41: > ./janssonrpc.h:98:9: warning: variable 'res' is uninitialized when used here [-… [View More]

1 0

git:master:fc793348: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: fc793348ee1ed25823a541e52b9ca9cee8caf2d4 URL: https://github.com/kamailio/kamailio/commit/fc793348ee1ed25823a541e52b9ca9c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-05T19:46:10+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] registrar: add path value to xavp_rcd (#2162)
by Victor Seva 05 Dec '19

05 Dec '19

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

3 7

git:master:fbe6d3bd: registrar: add path value to xavp_rcd
by Victor Seva 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: fbe6d3bd02cfeddb40a60142971760363f1eee75 URL: https://github.com/kamailio/kamailio/commit/fbe6d3bd02cfeddb40a601429717603… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-05T19:44:04+01:00 registrar: add path value to xavp_rcd --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/… [View More]

1 0

[kamailio/kamailio] pv_headers: Initial commit (#2156)
by Victor Seva 05 Dec '19

05 Dec '19

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual … [View More]modules, libs, utils, ...) - [X] 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) - [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 #### Description The main goal of the module is to offload the intermediate header processing into the XAVP dynamic container as well as provide with high level methods and pseudovariables to simplify SIP message header modifications. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2156 -- Commit Summary -- * pv_headers: Initial commit -- File Changes -- A src/modules/pv_headers/Makefile (12) A src/modules/pv_headers/README (332) A src/modules/pv_headers/doc/Makefile (4) A src/modules/pv_headers/doc/functions.xml (131) A src/modules/pv_headers/doc/params.xml (186) A src/modules/pv_headers/doc/pv_headers.xml (39) A src/modules/pv_headers/doc/pv_headers_admin.xml (116) A src/modules/pv_headers/pv_headers.c (351) A src/modules/pv_headers/pv_headers.h (51) A src/modules/pv_headers/pvh_func.c (388) A src/modules/pv_headers/pvh_func.h (38) A src/modules/pv_headers/pvh_hash.c (132) A src/modules/pv_headers/pvh_hash.h (39) A src/modules/pv_headers/pvh_hdr.c (235) A src/modules/pv_headers/pvh_hdr.h (39) A src/modules/pv_headers/pvh_str.c (144) A src/modules/pv_headers/pvh_str.h (38) A src/modules/pv_headers/pvh_xavp.c (1050) A src/modules/pv_headers/pvh_xavp.h (64) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2156.patch https://github.com/kamailio/kamailio/pull/2156.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/2156 [View Less]

3 5

git:master:9cb251ec: Makefile.groups: add new pv_headers to basic group
by Victor Seva 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: 9cb251ec664fe97f5e60ab6000f45257fd5a1b0b URL: https://github.com/kamailio/kamailio/commit/9cb251ec664fe97f5e60ab6000f4525… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-05T19:38:39+01:00 Makefile.groups: add new pv_headers to basic group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:a37140be: pv_headers: Initial commit
by Victor Seva 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: a37140bef370cdfab88dbff87bedc2e2e6922e6b URL: https://github.com/kamailio/kamailio/commit/a37140bef370cdfab88dbff87bedc2e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-05T19:38:39+01:00 pv_headers: Initial commit The main goal of the module is to offload the intermediate header processing into the XAVP dynamic container as well as provide with high … [View More]

1 0

git:master:00fb95b5: modules: readme files regenerated - cfgt ... [skip ci]
by Kamailio Dev 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: 00fb95b51572d0b057de99c28ea8f1cd7fe8361f URL: https://github.com/kamailio/kamailio/commit/00fb95b51572d0b057de99c28ea8f1c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-05T13:01:15+01:00 modules: readme files regenerated - cfgt ... [skip ci] --- Modified: src/modules/cfgt/README --- Diff: https://github.com/kamailio/kamailio/commit/00fb95b51572d0b057de99c28ea8f1c… … [View More]

1 0

[kamailio/kamailio] cfgt: RPC command to reset/clean test scenario (#574)
by Victor Seva 05 Dec '19

05 Dec '19

allow to clean the shared and private info of a test scenario in order to be able to re-trigger it without restart kamailio --- 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/574

1 1

git:master:33404809: cfgt: add RPC commands 'cfgt.list' and 'cfgt.clean'
by Victor Seva 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: 33404809c5a7e604cdf8d7a37be4fa85eb477539 URL: https://github.com/kamailio/kamailio/commit/33404809c5a7e604cdf8d7a37be4fa8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-05T12:48:24+01:00 cfgt: add RPC commands 'cfgt.list' and 'cfgt.clean' fixes #574 --- Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: … [View More]

1 0

git:5.1:3b449df8: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Dec '19

05 Dec '19

Module: kamailio Branch: 5.1 Commit: 3b449df86955fdb34b65856656259ec6a3621dab URL: https://github.com/kamailio/kamailio/commit/3b449df86955fdb34b65856656259ec… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-05T10:17:41+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:7fae9f78: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Dec '19

05 Dec '19

Module: kamailio Branch: 5.2 Commit: 7fae9f78b15c8385e4c93989532b22b79732f819 URL: https://github.com/kamailio/kamailio/commit/7fae9f78b15c8385e4c93989532b22b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-05T10:17:15+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.3:acd02bbc: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Dec '19

05 Dec '19

Module: kamailio Branch: 5.3 Commit: acd02bbcd3cdcc86f8be4807d4349d03e706db05 URL: https://github.com/kamailio/kamailio/commit/acd02bbcd3cdcc86f8be4807d4349d0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-05T10:16:46+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:89eb196f: modules: readme files regenerated - ims_usrloc_scscf ... [skip ci]
by Kamailio Dev 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: 89eb196f6ed0d4d572304c00fcfaca547fc8662d URL: https://github.com/kamailio/kamailio/commit/89eb196f6ed0d4d572304c00fcfaca5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-05T10:16:24+01:00 modules: readme files regenerated - ims_usrloc_scscf ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.1:b31befe5: ims_usrloc_scscf: fix parameter example titles
by Henning Westerholt 05 Dec '19

05 Dec '19

Module: kamailio Branch: 5.1 Commit: b31befe5dc51d05e2c9b94cd2cb5b5836f23644c URL: https://github.com/kamailio/kamailio/commit/b31befe5dc51d05e2c9b94cd2cb5b58… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-05T10:06:42+01:00 ims_usrloc_scscf: fix parameter example titles (cherry picked from commit 55233fffb6ed9165bc912565ec782624dbffaa26) --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- … [View More]

1 0

git:5.2:f4abac26: ims_usrloc_scscf: fix parameter example titles
by Henning Westerholt 05 Dec '19

05 Dec '19

Module: kamailio Branch: 5.2 Commit: f4abac26de5ce4d48e988887a03405f71e24a318 URL: https://github.com/kamailio/kamailio/commit/f4abac26de5ce4d48e988887a03405f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-05T10:06:28+01:00 ims_usrloc_scscf: fix parameter example titles (cherry picked from commit 55233fffb6ed9165bc912565ec782624dbffaa26) --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- … [View More]

1 0

git:5.3:a9a26744: ims_usrloc_scscf: fix parameter example titles
by Henning Westerholt 05 Dec '19

05 Dec '19

Module: kamailio Branch: 5.3 Commit: a9a26744f2aa469f090206850ed0016b8f22dea5 URL: https://github.com/kamailio/kamailio/commit/a9a26744f2aa469f090206850ed0016… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-05T10:06:14+01:00 ims_usrloc_scscf: fix parameter example titles (cherry picked from commit 55233fffb6ed9165bc912565ec782624dbffaa26) --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- … [View More]

1 0

git:master:55233fff: ims_usrloc_scscf: fix parameter example titles
by Henning Westerholt 05 Dec '19

05 Dec '19

Module: kamailio Branch: master Commit: 55233fffb6ed9165bc912565ec782624dbffaa26 URL: https://github.com/kamailio/kamailio/commit/55233fffb6ed9165bc912565ec78262… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-05T10:05:14+01:00 ims_usrloc_scscf: fix parameter example titles --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.1:36d08a57: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 04 Dec '19

04 Dec '19

Module: kamailio Branch: 5.1 Commit: 36d08a574628fc668224fcbf4c9bdaff883a9b3f URL: https://github.com/kamailio/kamailio/commit/36d08a574628fc668224fcbf4c9bdaf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-04T12:17:07+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/36d08a574628fc668224fcbf4c9bdaf… … [View More]

1 0

git:5.2:097687c9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 04 Dec '19

04 Dec '19

Module: kamailio Branch: 5.2 Commit: 097687c90fd9b51928aa0f10330f714f3371fa27 URL: https://github.com/kamailio/kamailio/commit/097687c90fd9b51928aa0f10330f714… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-04T12:16:24+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/097687c90fd9b51928aa0f10330f714… … [View More]

1 0

git:5.3:1e560eaf: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 04 Dec '19

04 Dec '19

Module: kamailio Branch: 5.3 Commit: 1e560eafb9ba0155bdbaee6cc54b344cfdd4aa31 URL: https://github.com/kamailio/kamailio/commit/1e560eafb9ba0155bdbaee6cc54b344… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-04T12:14:14+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ctl/README Modified: src/modules/dispatcher/README Modified: src/modules/imc/README Modified: src/… [View More]

1 0

git:master:dd6bae27: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 04 Dec '19

04 Dec '19

Module: kamailio Branch: master Commit: dd6bae27eac161832f9315560b45ebe20188f373 URL: https://github.com/kamailio/kamailio/commit/dd6bae27eac161832f9315560b45ebe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-04T12:11:33+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README Modified: src/modules/cfgt/README Modified: src/modules/dispatcher/README Modified:… [View More]

1 0

git:master:840e29d7: core: kemi - fixed missing support to check for REFER method
by Daniel-Constantin Mierla 04 Dec '19

04 Dec '19

Module: kamailio Branch: master Commit: 840e29d7d63602482e202e1b514a0ba9952dffe5 URL: https://github.com/kamailio/kamailio/commit/840e29d7d63602482e202e1b514a0ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-04T08:20:30+01:00 core: kemi - fixed missing support to check for REFER method --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] ims_ipsec_pcscf: fixed defects and warnings: (#2163)
by alexyosifov 03 Dec '19

03 Dec '19

- fixed a defect reported from Coverity Scan - Concurrent data access violations in spi_gen.c for spi_data->spi_val. - in create_ipsec_tunnel() return -1 when unable to convert ip address. - in ipsec_create() go to cleanup instead return -1 when get request for reply fails. Fixed debug message for that error.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] 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/2163 -- Commit Summary -- * ims_ipsec_pcscf: fixed defects and warnings: -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (13) M src/modules/ims_ipsec_pcscf/spi_gen.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2163.patch https://github.com/kamailio/kamailio/pull/2163.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/2163 [View Less]

2 2

git:5.3:93d06acf: ims_ipsec_pcscf: fixed defects and warnings:
by Henning Westerholt 03 Dec '19

03 Dec '19

Module: kamailio Branch: 5.3 Commit: 93d06acf1f1cc201ce3ca6970c2f73eec0e57d87 URL: https://github.com/kamailio/kamailio/commit/93d06acf1f1cc201ce3ca6970c2f73e… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-03T16:11:53+01:00 ims_ipsec_pcscf: fixed defects and warnings: - fixed a defect reported from Coverity Scan - Concurrent data access violations in spi_gen.c for spi_data->spi_val. - in … [View More]create_ipsec_tunnel() return -1 when unable to convert ip address. - in ipsec_create() go to cleanup instead return -1 when get request for reply fails. Fixed debug message for that error. (cherry picked from commit 8973feb34ab5059966158b34d3d3e3deb2af1b23) --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/spi_gen.c --- Diff: https://github.com/kamailio/kamailio/commit/93d06acf1f1cc201ce3ca6970c2f73e… Patch: https://github.com/kamailio/kamailio/commit/93d06acf1f1cc201ce3ca6970c2f73e… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 11673582ad..c494941115 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -339,18 +339,18 @@ static int create_ipsec_tunnel(const struct ip_addr *remote_addr, ipsec_t* s) if(str2ipbuf(&ipsec_listen_addr, &ipsec_addr) < 0){ LM_ERR("Unable to convert ipsec addr4 [%.*s]\n", ipsec_listen_addr.len, ipsec_listen_addr.s); close_mnl_socket(sock); - return 0; + return -1; } } else if(remote_addr->af == AF_INET6){ if(str2ip6buf(&ipsec_listen_addr6, &ipsec_addr) < 0){ LM_ERR("Unable to convert ipsec addr6 [%.*s]\n", ipsec_listen_addr6.len, ipsec_listen_addr6.s); close_mnl_socket(sock); - return 0; + return -1; } } else { LM_ERR("Unsupported AF %d\n", remote_addr->af); close_mnl_socket(sock); - return 0; + return -1; } //Convert to char* for logging @@ -574,8 +574,8 @@ int ipsec_create(struct sip_msg* m, udomain_t* d) // Get request from reply struct cell *t = tmb.t_gett(); if (!t || t == (void*) -1) { - LM_ERR("fill_contact(): Reply without transaction\n"); - return -1; + LM_ERR("Reply without transaction\n"); + goto cleanup; } struct sip_msg* req = t->uas.request; @@ -791,7 +791,8 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) t->uas.response.dst = dst_info; } - LM_DBG("Destination changed to [%d://%.*s]\n", dst_info.proto, m->dst_uri.len, m->dst_uri.s); + LM_DBG("Destination changed to [%d://%.*s], from [%d:%d]\n", dst_info.proto, m->dst_uri.len, m->dst_uri.s, + dst_info.send_sock->proto, dst_info.send_sock->port_no); ret = IPSEC_CMD_SUCCESS; // all good, return SUCCESS diff --git a/src/modules/ims_ipsec_pcscf/spi_gen.c b/src/modules/ims_ipsec_pcscf/spi_gen.c index 5e329028c9..c0c4fc4c3e 100644 --- a/src/modules/ims_ipsec_pcscf/spi_gen.c +++ b/src/modules/ims_ipsec_pcscf/spi_gen.c @@ -60,11 +60,17 @@ int init_spi_gen(uint32_t start_val, uint32_t range) return 5; } + if(pthread_mutex_lock(&spi_data->spis_mut) != 0){ + return 6; + } + spi_data->used_spis = create_list(); spi_data->spi_val = spi_data->min_spi = start_val; spi_data->max_spi = start_val + range; + pthread_mutex_unlock(&spi_data->spis_mut); + return 0; } @@ -74,14 +80,14 @@ uint32_t acquire_spi() return 0; } + if(pthread_mutex_lock(&spi_data->spis_mut) != 0){ + return 0; + } + //save the initial value for the highly unlikely case where there are no free SPIs uint32_t initial_val = spi_data->spi_val; uint32_t ret = 0; // by default return invalid SPI - if(pthread_mutex_lock(&spi_data->spis_mut) != 0){ - return ret; - } - while(1) { if(spi_in_list(&spi_data->used_spis, spi_data->spi_val) == 0){ ret = spi_data->spi_val; [View Less]

1 0

git:master:8973feb3: ims_ipsec_pcscf: fixed defects and warnings:
by Henning Westerholt 03 Dec '19

03 Dec '19

Module: kamailio Branch: master Commit: 8973feb34ab5059966158b34d3d3e3deb2af1b23 URL: https://github.com/kamailio/kamailio/commit/8973feb34ab5059966158b34d3d3e3d… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-03T16:10:39+01:00 ims_ipsec_pcscf: fixed defects and warnings: - fixed a defect reported from Coverity Scan - Concurrent data access violations in spi_gen.c for spi_data->spi_val. - in … [View More]create_ipsec_tunnel() return -1 when unable to convert ip address. - in ipsec_create() go to cleanup instead return -1 when get request for reply fails. Fixed debug message for that error. --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/spi_gen.c --- Diff: https://github.com/kamailio/kamailio/commit/8973feb34ab5059966158b34d3d3e3d… Patch: https://github.com/kamailio/kamailio/commit/8973feb34ab5059966158b34d3d3e3d… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index b72d57a0ad..53b09c56fd 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -339,18 +339,18 @@ static int create_ipsec_tunnel(const struct ip_addr *remote_addr, ipsec_t* s) if(str2ipbuf(&ipsec_listen_addr, &ipsec_addr) < 0){ LM_ERR("Unable to convert ipsec addr4 [%.*s]\n", ipsec_listen_addr.len, ipsec_listen_addr.s); close_mnl_socket(sock); - return 0; + return -1; } } else if(remote_addr->af == AF_INET6){ if(str2ip6buf(&ipsec_listen_addr6, &ipsec_addr) < 0){ LM_ERR("Unable to convert ipsec addr6 [%.*s]\n", ipsec_listen_addr6.len, ipsec_listen_addr6.s); close_mnl_socket(sock); - return 0; + return -1; } } else { LM_ERR("Unsupported AF %d\n", remote_addr->af); close_mnl_socket(sock); - return 0; + return -1; } //Convert to char* for logging @@ -574,8 +574,8 @@ int ipsec_create(struct sip_msg* m, udomain_t* d) // Get request from reply struct cell *t = tmb.t_gett(); if (!t || t == (void*) -1) { - LM_ERR("fill_contact(): Reply without transaction\n"); - return -1; + LM_ERR("Reply without transaction\n"); + goto cleanup; } struct sip_msg* req = t->uas.request; @@ -792,7 +792,8 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) t->uas.response.dst = dst_info; } - LM_DBG("Destination changed to [%d://%.*s]\n", dst_info.proto, m->dst_uri.len, m->dst_uri.s); + LM_DBG("Destination changed to [%d://%.*s], from [%d:%d]\n", dst_info.proto, m->dst_uri.len, m->dst_uri.s, + dst_info.send_sock->proto, dst_info.send_sock->port_no); ret = IPSEC_CMD_SUCCESS; // all good, return SUCCESS diff --git a/src/modules/ims_ipsec_pcscf/spi_gen.c b/src/modules/ims_ipsec_pcscf/spi_gen.c index 5e329028c9..c0c4fc4c3e 100644 --- a/src/modules/ims_ipsec_pcscf/spi_gen.c +++ b/src/modules/ims_ipsec_pcscf/spi_gen.c @@ -60,11 +60,17 @@ int init_spi_gen(uint32_t start_val, uint32_t range) return 5; } + if(pthread_mutex_lock(&spi_data->spis_mut) != 0){ + return 6; + } + spi_data->used_spis = create_list(); spi_data->spi_val = spi_data->min_spi = start_val; spi_data->max_spi = start_val + range; + pthread_mutex_unlock(&spi_data->spis_mut); + return 0; } @@ -74,14 +80,14 @@ uint32_t acquire_spi() return 0; } + if(pthread_mutex_lock(&spi_data->spis_mut) != 0){ + return 0; + } + //save the initial value for the highly unlikely case where there are no free SPIs uint32_t initial_val = spi_data->spi_val; uint32_t ret = 0; // by default return invalid SPI - if(pthread_mutex_lock(&spi_data->spis_mut) != 0){ - return ret; - } - while(1) { if(spi_in_list(&spi_data->used_spis, spi_data->spi_val) == 0){ ret = spi_data->spi_val; [View Less]

1 0

git:master:93030e5c: cfgt: remove dbg from RPC commands
by Victor Seva 03 Dec '19

03 Dec '19

Module: kamailio Branch: master Commit: 93030e5ce1bf7d64f2cacd1a1ca1d3c20e901f44 URL: https://github.com/kamailio/kamailio/commit/93030e5ce1bf7d64f2cacd1a1ca1d3c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-03T13:40:14+01:00 cfgt: remove dbg from RPC commands --- Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:2cb4ca9c: cfgt: group RPC commands using module name
by Victor Seva 03 Dec '19

03 Dec '19

Module: kamailio Branch: master Commit: 2cb4ca9c436f1e6e21a21b100f7a79a25e023865 URL: https://github.com/kamailio/kamailio/commit/2cb4ca9c436f1e6e21a21b100f7a79a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-03T12:24:33+01:00 cfgt: group RPC commands using module name --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

2 1

git:master:14729d39: cfgt: [doc] add missing </section>
by Victor Seva 03 Dec '19

03 Dec '19

Module: kamailio Branch: master Commit: 14729d390ea42cbadeda707d9207e9fdfe4512d7 URL: https://github.com/kamailio/kamailio/commit/14729d390ea42cbadeda707d9207e9f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-03T12:51:02+01:00 cfgt: [doc] add missing </section> --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:3b2225ba: cfgt: add docs for missing RPC commands
by Victor Seva 03 Dec '19

03 Dec '19

Module: kamailio Branch: master Commit: 3b2225ba762291b825dd7dead92a4aaee676b637 URL: https://github.com/kamailio/kamailio/commit/3b2225ba762291b825dd7dead92a4aa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-03T12:24:37+01:00 cfgt: add docs for missing RPC commands --- Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] Crash in permissions module (#2151)
by sjthomason 03 Dec '19

03 Dec '19

### Description Crash in permissions module when `load_backends` set to 1 ``` modparam("permissions", "db_url", DBURL) modparam("permissions", "db_mode", 0) modparam("permissions", "address_table", "gw_auth_ip") modparam("permissions", "trusted_table", "user_auth_ip") modparam("permissions", "load_backends", 1) ``` ### Troubleshooting #### Reproduction To avoid Kamailio complaining about an old version table during an upgrade, I attempted to disable the "trusted" backend as we're not using … [View More]it. Kamailio seg faults on startup. This is on 5.1.8 but I didn't see much difference in permissions with master #### Debugging Data ``` (gdb) bt full #0 0x0000000000000000 in ?? () No symbol table info available. #1 0xffffffff3ee2991c in init_child_trusted (rank=rank@entry=-2) at trusted.c:267 __func__ = "init_child_trusted" #2 0xffffffff3ee2d1d0 in child_init (rank=<optimized out>) at permissions.c:651 No locals. #3 0x000000010014a230 in init_mod_child (m=0x1007affd8, rank=rank@entry=-2) at core/sr_module.c:943 __func__ = "init_mod_child" #4 0x000000010014a0ec in init_mod_child (m=0x1007b0658, rank=rank@entry=-2) at core/sr_module.c:939 __func__ = "init_mod_child" #5 0x000000010014a0ec in init_mod_child (m=0x1007b0d80, rank=rank@entry=-2) at core/sr_module.c:939 __func__ = "init_mod_child" #6 0x000000010014a0ec in init_mod_child (m=0x1007b1a88, rank=rank@entry=-2) at core/sr_module.c:939 __func__ = "init_mod_child" #7 0x000000010014a0ec in init_mod_child (m=0x1007b1ea0, rank=rank@entry=-2) at core/sr_module.c:939 __func__ = "init_mod_child" #8 0x000000010014a0ec in init_mod_child (m=0x1007b22b8, rank=rank@entry=-2) at core/sr_module.c:939 __func__ = "init_mod_child" #9 0x000000010014a0ec in init_mod_child (m=0x1007b29c0, rank=rank@entry=-2) at core/sr_module.c:939 __func__ = "init_mod_child" #10 0x000000010014a0ec in init_mod_child (m=0x1007b33d8, rank=rank@entry=-2) at core/sr_module.c:939 __func__ = "init_mod_child" #11 0x00000001001565d0 in init_child (rank=rank@entry=-2) at core/sr_module.c:970 No locals. #12 0x000000010018cbf4 in fork_process (child_id=child_id@entry=-2, desc=<optimized out>, make_sock=make_sock@entry=1) at core/pt.c:338 pid = <optimized out> child_process_no = <optimized out> ret = -1 new_seed1 = <optimized out> new_seed2 = <optimized out> sockfd = {6, 13} __func__ = "fork_process" #13 0xffffffff3f211cd4 in mod_child (rank=<optimized out>) at ctl.c:327 pid = <optimized out> cs = <optimized out> rank = 0 rpc_handler = 1 rpc_handler = 1 #14 0x000000010014a230 in init_mod_child (m=0x1007af178, rank=rank@entry=0) at core/sr_module.c:943 __func__ = "init_mod_child" #15 0x000000010014a0ec in init_mod_child (m=0x1007af800, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #16 0x000000010014a0ec in init_mod_child (m=0x1007affd8, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #17 0x000000010014a0ec in init_mod_child (m=0x1007b0658, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #18 0x000000010014a0ec in init_mod_child (m=0x1007b0d80, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #19 0x000000010014a0ec in init_mod_child (m=0x1007b1a88, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #20 0x000000010014a0ec in init_mod_child (m=0x1007b1ea0, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #21 0x000000010014a0ec in init_mod_child (m=0x1007b22b8, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #22 0x000000010014a0ec in init_mod_child (m=0x1007b29c0, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #23 0x000000010014a0ec in init_mod_child (m=0x1007b33d8, rank=rank@entry=0) at core/sr_module.c:939 __func__ = "init_mod_child" #24 0x00000001001565d0 in init_child (rank=rank@entry=0) at core/sr_module.c:970 No locals. #25 0x00000001000c4c44 in main_loop () at main.c:1419 i = <optimized out> pid = <optimized out> si = <optimized out> si_desc = "\000\000\000\001\000h\200\000\000\000\000\000\000\000\000\330\000\000\000\001\000o6H\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000n\000\000\000\000\000\000\000\t\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\004\377\377\377\377\177\377\357\241\000\000\000\001\000\f\345\004", '\000' <repeats 11 times>, "\001\000\003\277\320\377\377\377\377\377\377\377\375\377\377\377\377\377\377\377\375\377\377\377\377\377\377\377\375\377\377\377\377\377\377\377\375" nrprocs = <optimized out> woneinit = <optimized out> __func__ = "main_loop" #26 0x00000001000ce704 in main (argc=<optimized out>, argv=<optimized out>) at main.c:2663 cfg_stream = <optimized out> c = <optimized out> r = <optimized out> tmp = 0xffffffff7ffffbb5 "" tmp_len = 0 port = 0 proto = 0 options = 0x10003ee20 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1842495819 rfd = <optimized out> debug_save = <optimized out> debug_flag = <optimized out> dont_fork_cnt = <optimized out> p = <optimized out> st = {st_dev = 70325794504717, st_ino = 205858632, st_mode = 16872, st_nlink = 2, st_uid = 1, st_gid = 12, st_rdev = 18446744073709551615, st_size = 334, st_atim = {tv_sec = 1574807105, tv_nsec = 898072627}, st_mtim = {tv_sec = 1574810139, tv_nsec = 861570968}, st_ctim = {tv_sec = 1574810139, tv_nsec = 861570968}, st_blksize = 8192, st_blocks = 16, st_fstype = "tmpfs\000\000\000\000\000\000\000\000\000\000"} __func__ = "main" (gdb) info locals cfg_stream = <optimized out> c = <optimized out> r = <optimized out> tmp = 0xffffffff7ffffbb5 "" tmp_len = 0 port = 0 proto = 0 options = 0x10003ee20 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1842495819 rfd = <optimized out> debug_save = <optimized out> debug_flag = <optimized out> dont_fork_cnt = <optimized out> p = <optimized out> st = {st_dev = 70325794504717, st_ino = 205858632, st_mode = 16872, st_nlink = 2, st_uid = 1, st_gid = 12, st_rdev = 18446744073709551615, st_size = 334, st_atim = {tv_sec = 1574807105, tv_nsec = 898072627}, st_mtim = {tv_sec = 1574810139, tv_nsec = 861570968}, st_ctim = {tv_sec = 1574810139, tv_nsec = 861570968}, st_blksize = 8192, st_blocks = 16, st_fstype = "tmpfs\000\000\000\000\000\000\000\000\000\000"} __func__ = "main" ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ```kamailio -v version: kamailio 5.1.8 (sparc64/solaris) 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, 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, select, /dev/poll. id: unknown compiled with gcc 7.3.0``` * **Operating System**: Solaris 11.4 -- 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/2151 [View Less]

2 5

git:master:d7f4493d: permissions: fix crash if load_backends parameter is 1
by Victor Seva 03 Dec '19

03 Dec '19

Module: kamailio Branch: master Commit: d7f4493da751802dc47a694d251d34a85a7b3bf1 URL: https://github.com/kamailio/kamailio/commit/d7f4493da751802dc47a694d251d34a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-03T12:12:54+01:00 permissions: fix crash if load_backends parameter is 1 fixes #2151 --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/… [View More]

1 0

Kamailio Developer Guide
by Markus Bönke 02 Dec '19

02 Dec '19

Hello all, I’ve a question about the kamailio developer guide. I’ve found 2 locations: 1. The source code on https://github.com/asipto/kamailio-devel-guide <https://github.com/asipto/kamailio-devel-guide> and 2. an HTML version on https://www.asipto.com/pub/kamailio-devel-guide/ <https://www.asipto.com/pub/kamailio-devel-guide/> . The HTML version seems to be different from the source, e.g. the doxygen link points to http://rpm.kamailio.org/doxygen/sip-router/branch/master/index.… [View More]

2 2

git:master:e896f2c9: rtproxy: docs - fixed section id value
by Daniel-Constantin Mierla 02 Dec '19

02 Dec '19

Module: kamailio Branch: master Commit: e896f2c9286809b5ef81c4952577780002ee5df8 URL: https://github.com/kamailio/kamailio/commit/e896f2c9286809b5ef81c4952577780… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-02T19:07:40+01:00 rtproxy: docs - fixed section id value --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:9e89a66b: kex: docs - fixed rpc command name for shm memory details
by Daniel-Constantin Mierla 02 Dec '19

02 Dec '19

Module: kamailio Branch: master Commit: 9e89a66b36d7aa691cf69d5b33b7ee31330693e9 URL: https://github.com/kamailio/kamailio/commit/9e89a66b36d7aa691cf69d5b33b7ee3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-02T16:47:40+01:00 kex: docs - fixed rpc command name for shm memory details --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:b2267fd5: jsonrpcc: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 02 Dec '19

02 Dec '19

Module: kamailio Branch: master Commit: b2267fd5d2825214ae9be5217514547e60e6c0f3 URL: https://github.com/kamailio/kamailio/commit/b2267fd5d2825214ae9be5217514547… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-02T16:25:44+01:00 jsonrpcc: use snprintf() instead of sprintf() --- Modified: src/modules/jsonrpcc/netstring.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:c10ab724: nsq: use snprintf() instead of sprintf()
by Daniel-Constantin Mierla 02 Dec '19

02 Dec '19

Module: kamailio Branch: master Commit: c10ab724803cc084a00bab964dc1e2d582a0627b URL: https://github.com/kamailio/kamailio/commit/c10ab724803cc084a00bab964dc1e2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-02T16:21:25+01:00 nsq: use snprintf() instead of sprintf() --- Modified: src/modules/nsq/nsq_reader.c --- Diff: https://github.com/kamailio/kamailio/commit/c10ab724803cc084a00bab964dc1e2d… … [View More]Patch: https://github.com/kamailio/kamailio/commit/c10ab724803cc084a00bab964dc1e2d… --- diff --git a/src/modules/nsq/nsq_reader.c b/src/modules/nsq/nsq_reader.c index 9a472ca8df..a8f403bda9 100644 --- a/src/modules/nsq/nsq_reader.c +++ b/src/modules/nsq/nsq_reader.c @@ -92,23 +92,23 @@ int nsq_consumer_event(char *payload, char *channel, char *topic) json_api.extract_field(json_obj, k, &ev_name); pkg_free(k); - sprintf(buffer, "nsq:consumer-event-%.*s-%.*s",ev_category.len, ev_category.s, ev_name.len, ev_name.s); + snprintf(buffer, 512, "nsq:consumer-event-%.*s-%.*s",ev_category.len, ev_category.s, ev_name.len, ev_name.s); for (p=buffer ; *p; ++p) *p = tolower(*p); for (p=buffer ; *p; ++p) if(*p == '_') *p = '-'; if (nsq_consumer_fire_event(buffer) != 0) { - sprintf(buffer, "nsq:consumer-event-%.*s", ev_category.len, ev_category.s); + snprintf(buffer, 512, "nsq:consumer-event-%.*s", ev_category.len, ev_category.s); for (p=buffer ; *p; ++p) *p = tolower(*p); for (p=buffer ; *p; ++p) if(*p == '_') *p = '-'; if (nsq_consumer_fire_event(buffer) != 0) { - sprintf(buffer, "nsq:consumer-event-%.*s-%.*s", nsq_event_key.len, nsq_event_key.s, nsq_event_sub_key.len, nsq_event_sub_key.s); + snprintf(buffer, 512, "nsq:consumer-event-%.*s-%.*s", nsq_event_key.len, nsq_event_key.s, nsq_event_sub_key.len, nsq_event_sub_key.s); for (p=buffer ; *p; ++p) *p = tolower(*p); for (p=buffer ; *p; ++p) if(*p == '_') *p = '-'; if (nsq_consumer_fire_event(buffer) != 0) { - sprintf(buffer, "nsq:consumer-event-%.*s", nsq_event_key.len, nsq_event_key.s); + snprintf(buffer, 512, "nsq:consumer-event-%.*s", nsq_event_key.len, nsq_event_key.s); for (p=buffer ; *p; ++p) *p = tolower(*p); for (p=buffer ; *p; ++p) if(*p == '_') *p = '-'; if (nsq_consumer_fire_event(buffer) != 0) { - sprintf(buffer, "nsq:consumer-event"); + snprintf(buffer, 512, "nsq:consumer-event"); if (nsq_consumer_fire_event(buffer) != 0) { LM_ERR("nsq:consumer-event not found"); } [View Less]

1 0

[kamailio/kamailio] deb.kamailio.org certificate is expired (#2161)
by Thomas Weber 02 Dec '19

02 Dec '19

<!-- Kamailio Project uses GitHub Issues only for bugs in the code or feature requests. Please use this template only for bug reports. If you have questions about using Kamailio or related to its configuration file, ask on sr-users mailing list: * http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users If you have questions about developing extensions to Kamailio or its existing C code, ask on sr-dev mailing list: * http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev … [View More]

2 3

Kamailio World 2020 - Call For Presentations
by Daniel-Constantin Mierla 02 Dec '19

02 Dec '19

Hello, I would like to announce that Call for Presentations at Kamailio World 2020 is now open. You can submit your proposal or see more details at: - https://www.kamailioworld.com/k08/call-for-speakers/ The 8th edition of the event takes place again in Berlin, Germany, during April 27-29, 2020. Expect over 150 participants, developers and community members as well as representatives of other popular open source VoIP projects such as Asterisk or FreeSwitch. Looking forward to meeting … [View More]

1 0

Strategy for visibility defines?
by Greg Troxel 01 Dec '19

01 Dec '19

(I'm new and this issue is nonobvious, so I'm posting to the list instead of opening an issue, hoping sr-dev is the right call.) I am packaging kamailio for pkgsrc, a multi-OS multi-CPU portable packaging system, with NetBSD and SmartOS being perhaps the biggest targets. Mostly this is going well, and I'm probably doing a few things wrong (but am not asking for help on those yet). During the build (NetBSD 8 amd64), I got a failure in src/lib/srdb1/db_ut.c: CC (gcc) [L libsrdb1.so.1.0] … [View More] db_ut.o In file included from db_ut.c:63:0: /usr/include/stdlib.h:273:28: error: unknown type name 'u_char' void arc4random_addrandom(u_char *, int); ^ /usr/include/stdlib.h:306:1: error: unknown type name 'devmajor_t' devmajor_t getdevmajor(const char *, mode_t); ^ gmake[3]: *** [../../Makefile.rules:100: db_ut.o] Error 1 This may be a NetBSD bug and I am investigating that in parallel. In db_ut.c, several visibility defines are set. These have the effect of ensuring that definitions mandated by a certain standard are visible, but they also restrict visibility of definitions not mandated by that standard. The code is: /** * make strptime available * use 600 for 'Single UNIX Specification, Version 3' * _XOPEN_SOURCE creates conflict in swab definition in Solaris */ #ifndef __OS_solaris #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect * of the above define on * features.h/unistd.h syscall() */ #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */ #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif #include <time.h> #ifndef __OS_solaris #undef _XOPEN_SOURCE #undef _XOPEN_SOURCE_EXTENDED #else /* solaris */ #undef _XOPEN_SOURCE_EXTENDED #endif strptime seems to have originally been XPG4, and now seems to be in base POSIX: https://pubs.opengroup.org/onlinepubs/9699919799/functions/strptime.html _XOPEN_SOURCE being 600 seems to be "X/Open 6, incorporating POSIX 2004": https://pubs.opengroup.org/onlinepubs/009695399/ I am not following the comment "_BSD_SOURCE is deprecated"; that is perhaps referring to the situation on Linux. But that define is not used on recent NetBSD. Overall, feature tests macros are complicated, and while I'm sure there were good reasons they was added over time, I suspect that today they are not needed at all, or in a far more limited manner. (I'm unclear on how far back on various systems kamailio intends to support.) On NetBSD 8, removing all the visibility defines that I quoted results in a clean build, and I have a patch in pkgsrc that does that. I would advance the hypothesis that it would be preferable to remove the visibility defines, and if there are systems on which they are needed, to #ifdef system and perhaps #ifdef version <= OK_VERSION and then define things. This would avoid setting visibility defines on systemss where they haven't been tested and probably aren't needed. I am therefore curious what happens on various systems if the above-quoted text from db_ut is removed. There are also POSIX and other XOPEN defines in other files, and I'm not sure if they are ok or if I'm just not building those modules. Alternatively I could prepare a PR to not set any defines on NetBSD, or to define _NETBSD_SOURCE, which should be more or less equivalent. Thanks, Greg [View Less]

1 1

git:5.3:dc322c0d: tm: extend t_newtran docs with a note about flag behaviour
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.3 Commit: dc322c0d24fec1a864e133bff6bb8a7a67e136b5 URL: https://github.com/kamailio/kamailio/commit/dc322c0d24fec1a864e133bff6bb8a7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T19:42:37+01:00 tm: extend t_newtran docs with a note about flag behaviour (cherry picked from commit f2f492bd580621dec23d0538b8785635a013497a) --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://… [View More]

1 0

git:5.2:bb7e84d4: tm: extend t_newtran docs with a note about flag behaviour
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.2 Commit: bb7e84d46017a112b88fa0c4a187bb5ca7f961c5 URL: https://github.com/kamailio/kamailio/commit/bb7e84d46017a112b88fa0c4a187bb5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T19:42:10+01:00 tm: extend t_newtran docs with a note about flag behaviour (cherry picked from commit f2f492bd580621dec23d0538b8785635a013497a) --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://… [View More]

1 0

git:5.1:c039af87: tm: extend t_newtran docs with a note about flag behaviour
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.1 Commit: c039af8752b553c65d375a00a017820f85ead41a URL: https://github.com/kamailio/kamailio/commit/c039af8752b553c65d375a00a017820… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T19:41:48+01:00 tm: extend t_newtran docs with a note about flag behaviour (cherry picked from commit f2f492bd580621dec23d0538b8785635a013497a) --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://… [View More]

1 0

git:master:f2f492bd: tm: extend t_newtran docs with a note about flag behaviour
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: master Commit: f2f492bd580621dec23d0538b8785635a013497a URL: https://github.com/kamailio/kamailio/commit/f2f492bd580621dec23d0538b878563… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T19:40:03+01:00 tm: extend t_newtran docs with a note about flag behaviour --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.1:e5d94d3a: utils: Change sh(1) "test ==" usage to "="
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.1 Commit: e5d94d3a8c9ce2962c03b130972715785652b605 URL: https://github.com/kamailio/kamailio/commit/e5d94d3a8c9ce2962c03b1309727157… Author: Greg Troxel <gdt(a)lexort.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T18:43:20+01:00 utils: Change sh(1) "test ==" usage to "=" The POSIX sh(1) specification says that strings are compared with test(1) (also "[") with "=". Bash accepts "==" and this leads to non-portable code. This … [View More]

1 0

git:5.3:3eac2726: utils: Change sh(1) "test ==" usage to "="
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.3 Commit: 3eac27269bb60ec062eb0c2058319c70a94e0fbb URL: https://github.com/kamailio/kamailio/commit/3eac27269bb60ec062eb0c2058319c7… Author: Greg Troxel <gdt(a)lexort.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T18:42:52+01:00 utils: Change sh(1) "test ==" usage to "=" The POSIX sh(1) specification says that strings are compared with test(1) (also "[") with "=". Bash accepts "==" and this leads to non-portable code. This … [View More]

1 0

git:5.2:d55905c1: utils: Change sh(1) "test ==" usage to "="
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.2 Commit: d55905c1877b13f5d8367e8d4fd16cd0f01dffee URL: https://github.com/kamailio/kamailio/commit/d55905c1877b13f5d8367e8d4fd16cd… Author: Greg Troxel <gdt(a)lexort.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T18:42:04+01:00 utils: Change sh(1) "test ==" usage to "=" The POSIX sh(1) specification says that strings are compared with test(1) (also "[") with "=". Bash accepts "==" and this leads to non-portable code. This … [View More]

1 0

[kamailio/kamailio] kamdbctl has bashism ("test ==") (#2157)
by Greg Troxel 29 Nov '19

29 Nov '19

### Description utils/kamctl/kamdbctl contains syntax beyond the POSIX sh stnadard. Specifically, there are multiple instances of "==" in test(1), which should be "=" #### Reproduction In the 5.3.1 release, see line 156. ### Possible Solutions Change == to = (multiple places). ### Additional Information 5.3.1 source tarball This was detected by pkgsrc which has checks for various portability issues. -- You are receiving this because you are subscribed to this thread. Reply to this … [View More]

3 4

[kamailio/kamailio] utils: Change sh(1) "test ==" usage to "=" (#2159)
by Greg Troxel 29 Nov '19

29 Nov '19

The POSIX sh(1) specification says that strings are compared with test(1) (also "[") with "=". Bash accepts "==" and this leads to non-portable code. This commit simply changes "==" within test/[ to "=". #### 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 … [View More]

2 2

git:master:e8b8251f: utils: Change sh(1) "test ==" usage to "="
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: master Commit: e8b8251f6c7382f8e373c2b309422973a3bf730d URL: https://github.com/kamailio/kamailio/commit/e8b8251f6c7382f8e373c2b30942297… Author: Greg Troxel <gdt(a)lexort.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T18:39:58+01:00 utils: Change sh(1) "test ==" usage to "=" The POSIX sh(1) specification says that strings are compared with test(1) (also "[") with "=". Bash accepts "==" and this leads to non-portable code. This … [View More]

1 0

git:master:0d800324: Revert "core: increase SHM memory pool to 128 MB"
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: master Commit: 0d80032442df3f684f62d92841c2911e5d4af5b5 URL: https://github.com/kamailio/kamailio/commit/0d80032442df3f684f62d92841c2911… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T15:55:55+01:00 Revert "core: increase SHM memory pool to 128 MB" - This reverts commit 063e6a025b8ca0163af2147f057d29447c6f9760. - to be added as comment to default sysconfig packaging files --- Modified: … [View More]

1 0

Kamailio as SBC for Microsoft Teams
by Henning Westerholt 29 Nov '19

29 Nov '19

Hello, I have created a "How-To" blog post on using Kamailio as "session border controller" for Microsoft Teams Direct Routing: https://skalatan.de/de/blog/kamailio-sbc-teams You can this way use all the existing possibilities that Kamailio provide to interact with MS Teams as well. Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

6 8

git:5.2:65d13ddf: dialplan: fixed avp usage in subst_exp field
by Victor Seva 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.2 Commit: 65d13ddf14c134555fa99555ef46273cb8f56248 URL: https://github.com/kamailio/kamailio/commit/65d13ddf14c134555fa99555ef46273… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-29T12:51:53+01:00 dialplan: fixed avp usage in subst_exp field - in case both match_exp and subst_exp contain avps, the content of match_exp were used to evaluate the substitute expression. (cherry … [View More]

1 0

git:5.3:aa26d787: cfgt: fix detection of jump to previous-previous route
by Victor Seva 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.3 Commit: aa26d787ee21733dd1f4d13a6869302b28a229a5 URL: https://github.com/kamailio/kamailio/commit/aa26d787ee21733dd1f4d13a6869302… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-29T09:31:50+01:00 cfgt: fix detection of jump to previous-previous route * this happends with onsend_route (cherry picked from commit e0ed91acb88091caf285704689f72e48c5127ae4) --- Modified: src/… [View More]modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/aa26d787ee21733dd1f4d13a6869302… Patch: https://github.com/kamailio/kamailio/commit/aa26d787ee21733dd1f4d13a6869302… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index e9f18718dc..b8a6456fc4 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -327,7 +327,7 @@ void cfgt_save_node(cfgt_node_p node) } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + if(stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { LM_DBG("dir [%s] already existing\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); @@ -465,9 +465,15 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) } else { LM_DBG("actual routename:[%.*s][%d]\n", node->route->s.len, node->route->s.s, node->route->type); - if(node->route->prev) + if(node->route->prev) { + if(node->route->prev->prev) + LM_DBG("prev prev routename:[%.*s][%d]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s, + node->route->prev->prev->type); LM_DBG("prev routename:[%.*s][%d]\n", node->route->prev->s.len, node->route->prev->s.s, node->route->prev->type); + } if(node->route->next) LM_DBG("next routename:[%.*s][%d]\n", node->route->next->s.len, node->route->next->s.s, node->route->next->type); @@ -475,12 +481,20 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) LM_DBG("same route\n"); _cfgt_set_type(node->route, a); return 2; - } else if(node->route->prev - && STR_EQ(*routename, node->route->prev->s)) { - LM_DBG("back to route[%.*s]\n", node->route->prev->s.len, - node->route->prev->s.s); - _cfgt_set_type(node->route->prev, a); - return 3; + } else if(node->route->prev) { + if(STR_EQ(*routename, node->route->prev->s)) { + LM_DBG("back to prev route[%.*s]\n", node->route->prev->s.len, + node->route->prev->s.s); + _cfgt_set_type(node->route->prev, a); + return 3; + } else if(node->route->prev->prev + && STR_EQ(*routename, node->route->prev->prev->s)) { + LM_DBG("back to prev prev route[%.*s]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s); + _cfgt_set_type(node->route->prev->prev, a); + return 3; + } } route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!route) { @@ -488,6 +502,9 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) return -1; } memset(route, 0, sizeof(cfgt_str_list_t)); + if(route->prev && node->route->prev) { + route->prev->prev = node->route->prev; + } route->prev = node->route; node->route->next = route; node->route = route; [View Less]

1 0

git:5.2:60aa0d9f: cfgt: fix detection of jump to previous-previous route
by Victor Seva 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.2 Commit: 60aa0d9fd7b3a53154b10eedcd0c51d51c6e0035 URL: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-29T09:32:03+01:00 cfgt: fix detection of jump to previous-previous route * this happends with onsend_route (cherry picked from commit e0ed91acb88091caf285704689f72e48c5127ae4) --- Modified: src/… [View More]modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… Patch: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 0e3bfecb5d..3e6f5b8c2a 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -329,7 +329,7 @@ void cfgt_save_node(cfgt_node_p node) } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + if(stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { LM_DBG("dir [%s] already existing\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); @@ -467,9 +467,15 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) } else { LM_DBG("actual routename:[%.*s][%d]\n", node->route->s.len, node->route->s.s, node->route->type); - if(node->route->prev) + if(node->route->prev) { + if(node->route->prev->prev) + LM_DBG("prev prev routename:[%.*s][%d]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s, + node->route->prev->prev->type); LM_DBG("prev routename:[%.*s][%d]\n", node->route->prev->s.len, node->route->prev->s.s, node->route->prev->type); + } if(node->route->next) LM_DBG("next routename:[%.*s][%d]\n", node->route->next->s.len, node->route->next->s.s, node->route->next->type); @@ -477,12 +483,20 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) LM_DBG("same route\n"); _cfgt_set_type(node->route, a); return 2; - } else if(node->route->prev - && STR_EQ(*routename, node->route->prev->s)) { - LM_DBG("back to route[%.*s]\n", node->route->prev->s.len, - node->route->prev->s.s); - _cfgt_set_type(node->route->prev, a); - return 3; + } else if(node->route->prev) { + if(STR_EQ(*routename, node->route->prev->s)) { + LM_DBG("back to prev route[%.*s]\n", node->route->prev->s.len, + node->route->prev->s.s); + _cfgt_set_type(node->route->prev, a); + return 3; + } else if(node->route->prev->prev + && STR_EQ(*routename, node->route->prev->prev->s)) { + LM_DBG("back to prev prev route[%.*s]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s); + _cfgt_set_type(node->route->prev->prev, a); + return 3; + } } route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!route) { @@ -490,6 +504,9 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) return -1; } memset(route, 0, sizeof(cfgt_str_list_t)); + if(route->prev && node->route->prev) { + route->prev->prev = node->route->prev; + } route->prev = node->route; node->route->next = route; node->route = route; [View Less]

1 0

git:master:e0ed91ac: cfgt: fix detection of jump to previous-previous route
by Victor Seva 29 Nov '19

29 Nov '19

Module: kamailio Branch: master Commit: e0ed91acb88091caf285704689f72e48c5127ae4 URL: https://github.com/kamailio/kamailio/commit/e0ed91acb88091caf285704689f72e4… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-29T09:28:45+01:00 cfgt: fix detection of jump to previous-previous route * this happends with onsend_route --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/… [View More]kamailio/commit/e0ed91acb88091caf285704689f72e4… Patch: https://github.com/kamailio/kamailio/commit/e0ed91acb88091caf285704689f72e4… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index e9f18718dc..b8a6456fc4 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -327,7 +327,7 @@ void cfgt_save_node(cfgt_node_p node) } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + if(stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { LM_DBG("dir [%s] already existing\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); @@ -465,9 +465,15 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) } else { LM_DBG("actual routename:[%.*s][%d]\n", node->route->s.len, node->route->s.s, node->route->type); - if(node->route->prev) + if(node->route->prev) { + if(node->route->prev->prev) + LM_DBG("prev prev routename:[%.*s][%d]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s, + node->route->prev->prev->type); LM_DBG("prev routename:[%.*s][%d]\n", node->route->prev->s.len, node->route->prev->s.s, node->route->prev->type); + } if(node->route->next) LM_DBG("next routename:[%.*s][%d]\n", node->route->next->s.len, node->route->next->s.s, node->route->next->type); @@ -475,12 +481,20 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) LM_DBG("same route\n"); _cfgt_set_type(node->route, a); return 2; - } else if(node->route->prev - && STR_EQ(*routename, node->route->prev->s)) { - LM_DBG("back to route[%.*s]\n", node->route->prev->s.len, - node->route->prev->s.s); - _cfgt_set_type(node->route->prev, a); - return 3; + } else if(node->route->prev) { + if(STR_EQ(*routename, node->route->prev->s)) { + LM_DBG("back to prev route[%.*s]\n", node->route->prev->s.len, + node->route->prev->s.s); + _cfgt_set_type(node->route->prev, a); + return 3; + } else if(node->route->prev->prev + && STR_EQ(*routename, node->route->prev->prev->s)) { + LM_DBG("back to prev prev route[%.*s]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s); + _cfgt_set_type(node->route->prev->prev, a); + return 3; + } } route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!route) { @@ -488,6 +502,9 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) return -1; } memset(route, 0, sizeof(cfgt_str_list_t)); + if(route->prev && node->route->prev) { + route->prev->prev = node->route->prev; + } route->prev = node->route; node->route->next = route; node->route = route; [View Less]

1 0

git:master:d6f16797: app_perl: use snprintf instead of sprintf
by Daniel-Constantin Mierla 28 Nov '19

28 Nov '19

Module: kamailio Branch: master Commit: d6f16797a0f895189d4a0ef2ea8fbd68acf0144e URL: https://github.com/kamailio/kamailio/commit/d6f16797a0f895189d4a0ef2ea8fbd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-28T20:08:57+01:00 app_perl: use snprintf instead of sprintf --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:f268aa2f: snmpstats: use snprintf instead of snprintf
by Daniel-Constantin Mierla 28 Nov '19

28 Nov '19

Module: kamailio Branch: master Commit: f268aa2f53f550eec45e5030a08f6d586941913e URL: https://github.com/kamailio/kamailio/commit/f268aa2f53f550eec45e5030a08f6d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-28T20:08:58+01:00 snmpstats: use snprintf instead of snprintf --- Modified: src/modules/snmpstats/snmpSIPContactTable.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:fa777881: cfgt: don't try to create dir if it already exists
by Victor Seva 28 Nov '19

28 Nov '19

Module: kamailio Branch: 5.2 Commit: fa7778816de04aea0b23f4cce06fd8af6da598fb URL: https://github.com/kamailio/kamailio/commit/fa7778816de04aea0b23f4cce06fd8a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-28T14:55:42+01:00 cfgt: don't try to create dir if it already exists (cherry picked from commit 6918a96cc61fa0b15e09db01bb02e9b9f8c78abf) --- Modified: src/modules/cfgt/cfgt_int.c --- … [View More]

1 0

git:5.3:aa94a3a3: cfgt: don't try to create dir if it already exists
by Victor Seva 28 Nov '19

28 Nov '19

Module: kamailio Branch: 5.3 Commit: aa94a3a3310f9088b2b48ddeeb69ef0e78d5d6b3 URL: https://github.com/kamailio/kamailio/commit/aa94a3a3310f9088b2b48ddeeb69ef0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-28T14:54:17+01:00 cfgt: don't try to create dir if it already exists (cherry picked from commit 6918a96cc61fa0b15e09db01bb02e9b9f8c78abf) --- Modified: src/modules/cfgt/cfgt_int.c --- … [View More]

1 0

git:master:6918a96c: cfgt: don't try to create dir if it already exists
by Victor Seva 28 Nov '19

28 Nov '19

Module: kamailio Branch: master Commit: 6918a96cc61fa0b15e09db01bb02e9b9f8c78abf URL: https://github.com/kamailio/kamailio/commit/6918a96cc61fa0b15e09db01bb02e9b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-28T14:28:14+01:00 cfgt: don't try to create dir if it already exists --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] Evaluate deprecation of function t_newtran() (#2155)
by pwakano 28 Nov '19

28 Nov '19

### Description It was discovered that the function t_newtran() is causing a conflict with the transaction flags. When calling it before setting transaction flags, the flags are apparently lost, so for instance when using the ACC module, if the ACC flags are set after the t_newtran, these flags seems to get lost and no ACC entries are saved.... Some discussion around the t_newtran usage was already held in the past and it seems the function is not needed anymore to help detecting retransmissions, given the t_precheck_trans() can do this job without having to have an early creation of the transaction. Not sure if the t_newtran is necessary in any other scenario, but if it is not I think it should be deprecated. ### Reproduction Create simple script which uses ACC and the setflag to save ACC entries in DB. Verify ACC records are being saved properly. Before calling the setflag(), add a call to t_newtran(). Make calls and check ACC records are not saved anymore. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # cat /etc/centos-release CentOS Linux release 7.7.1908 (Core) # uname -a Linux dev1-sbc-01 3.10.0-1062.1.1.el7.x86_64 #1 SMP Fri Sep 13 22:55:44 UTC 2019 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/2155 [View Less]

2 2

[kamailio/kamailio] Kamailio xavp_contact - Segmentation Fault (#2153)
by iliesh 27 Nov '19

27 Nov '19

Hello, Kamailio is crashing when I'm trying to set the parameter; `modparam("tm|usrloc", "xavp_contact", "ulattrs") ` The crash is happening when I'm register 2 devices with the same extension. This is the core dump: #### Reproduction Set the following parameter: `modparam("tm|usrloc", "xavp_contact", "ulattrs") ` and register the same extension from 2 different devices. Then send an message to them (NOTIFY/OPTION/INVITE etc) #### Debugging Data [Thread debugging using libthread_db … [View More]enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /usr/local/etc/ka'. Program terminated with signal 11, Segmentation fault. #0 0x000000000057cca2 in xavp_get_internal (name=0x8, list=0x0, idx=0, prv=0x0) at core/xavp.c:288 288 core/xavp.c: No such file or directory. (gdb) bt #0 0x000000000057cca2 in xavp_get_internal (name=0x8, list=0x0, idx=0, prv=0x0) at core/xavp.c:288 #1 0x0000000000581869 in xavp_insert (xavp=0x0, idx=0, list=0x0) at core/xavp.c:752 #2 0x00007f05be0ee3a1 in ki_t_next_contacts (msg=0x7f05cb76c218) at t_serial.c:552 #3 0x00007f05be0f09e8 in t_next_contacts (msg=0x7f05cb76c218, key=0x0, value=0x0) at t_serial.c:756 #4 0x0000000000434d41 in do_action (h=0x7ffe93c9cad0, a=0x7f05cb642250, msg=0x7f05cb76c218) at core/action.c:1067 #5 0x00000000004418e8 in run_actions (h=0x7ffe93c9cad0, a=0x7f05cb642250, msg=0x7f05cb76c218) at core/action.c:1572 #6 0x0000000000441fa9 in run_actions_safe (h=0x7ffe93c9de90, a=0x7f05cb642250, msg=0x7f05cb76c218) at core/action.c:1636 #7 0x000000000065734e in rval_get_int (h=0x7ffe93c9de90, msg=0x7f05cb76c218, i=0x7ffe93c9cf78, rv=0x7f05cb642570, cache=0x0) at core/rvalue.c:912 #8 0x000000000065b8fe in rval_expr_eval_int (h=0x7ffe93c9de90, msg=0x7f05cb76c218, res=0x7ffe93c9cf78, rve=0x7f05cb642568) at core/rvalue.c:1910 #9 0x000000000065bd51 in rval_expr_eval_int (h=0x7ffe93c9de90, msg=0x7f05cb76c218, res=0x7ffe93c9d42c, rve=0x7f05cb642c98) at core/rvalue.c:1918 #10 0x0000000000434807 in do_action (h=0x7ffe93c9de90, a=0x7f05cb645028, msg=0x7f05cb76c218) at core/action.c:1043 #11 0x00000000004418e8 in run_actions (h=0x7ffe93c9de90, a=0x7f05cb637e48, msg=0x7f05cb76c218) at core/action.c:1572 #12 0x0000000000431767 in do_action (h=0x7ffe93c9de90, a=0x7f05cb583858, msg=0x7f05cb76c218) at core/action.c:691 #13 0x00000000004418e8 in run_actions (h=0x7ffe93c9de90, a=0x7f05cb574750, msg=0x7f05cb76c218) at core/action.c:1572 #14 0x0000000000442071 in run_top_route (a=0x7f05cb574750, msg=0x7f05cb76c218, c=0x0) at core/action.c:1657 #15 0x00000000005874a9 in receive_msg (buf=0xa6ec00 <buf.6868> "OPTIONS sip:10 at 192.168.0.231:5060 SIP/2.0\r\nVia: SIP/2.0/UDP 192.168.0.231;branch=z9hG4bKd8a9.1b3abe656532065414a2f35a8916008d.1\r\nVia: SIP/2.0/UDP 192.168.0.131:5060;received=192.168.0.131;branch=z9hG"..., len=694, rcv_info=0x7ffe93c9e4d0) at core/receive.c:341 #16 0x000000000047bf81 in udp_rcv_loop () at core/udp_server.c:541 #17 0x0000000000424f9d in main_loop () at main.c:1669 #18 0x000000000042c688 in main (argc=13, argv=0x7ffe93c9ea18) at main.c:2710 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.5 (x86_64/linux) 18444d ``` * **Operating System**:  ``` Linux 3.10.0-1062.4.3.el7.x86_64 #1 SMP Wed Nov 13 23:58:53 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux CentOS 7``` -- 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/2153 [View Less]

2 2

git:5.2:ca4d105c: core: safety checks for xavp operations
by Daniel-Constantin Mierla 27 Nov '19

27 Nov '19

Module: kamailio Branch: 5.2 Commit: ca4d105c8b9718138e0d6a62b81cdf2d63470712 URL: https://github.com/kamailio/kamailio/commit/ca4d105c8b9718138e0d6a62b81cdf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-27T20:33:11+01:00 core: safety checks for xavp operations (cherry picked from commit 1067abf87cdaabc9557a99b36ad60e2349e16fa5) (cherry picked from commit 7e5b726ec106fcc06f9ed406570b3f5fea72bd7e) -… [View More]-- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/ca4d105c8b9718138e0d6a62b81cdf2… Patch: https://github.com/kamailio/kamailio/commit/ca4d105c8b9718138e0d6a62b81cdf2… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index c758a98099..44ab3ac3ed 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -54,6 +54,9 @@ void xavp_shm_free_unsafe(void *p) void xavp_free(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free); @@ -67,6 +70,9 @@ void xavp_free(sr_xavp_t *xa) void xavp_free_unsafe(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free_unsafe); @@ -114,8 +120,9 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list) { - if (xavp==NULL) + if (xavp==NULL) { return -1; + } /* Prepend new xavp to the list */ if(list) { xavp->next = *list; @@ -133,8 +140,9 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) sr_xavp_t *prev; sr_xavp_t *crt; - if (xavp==NULL) + if (xavp==NULL) { return -1; + } crt = xavp_get_internal(&xavp->name, list, 0, 0); @@ -164,6 +172,10 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp) { + if (nxavp==NULL) { + return -1; + } + if(pxavp==NULL) { nxavp->next = *_xavp_list_crt; *_xavp_list_crt = nxavp; @@ -288,7 +300,7 @@ static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav if(name==NULL || name->s==NULL) return NULL; id = get_hash1_raw(name->s, name->len); - + if(list && *list) avp = *list; else @@ -325,7 +337,7 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) if(start==NULL) return NULL; - + avp = start->next; while(avp) { @@ -455,7 +467,7 @@ int xavp_count(str *name, sr_xavp_t **start) if(name==NULL || name->s==NULL) return -1; id = get_hash1_raw(name->s, name->len); - + if(start) avp = *start; else @@ -507,7 +519,7 @@ void xavp_destroy_list(sr_xavp_t **head) void xavp_reset_list(void) { assert(_xavp_list_crt!=0 ); - + if (_xavp_list_crt!=&_xavp_list_head) _xavp_list_crt=&_xavp_list_head; xavp_destroy_list(_xavp_list_crt); @@ -517,7 +529,7 @@ void xavp_reset_list(void) sr_xavp_t **xavp_set_list(sr_xavp_t **head) { sr_xavp_t **avp; - + assert(_xavp_list_crt!=0); avp = _xavp_list_crt; @@ -749,6 +761,10 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) int n = 0; int i = 0; + if(xavp==NULL) { + return -1; + } + crt = xavp_get_internal(&xavp->name, list, 0, NULL); if (idx == 0 && (!crt || crt->val.type != SR_XTYPE_NULL)) @@ -814,7 +830,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) avp->next = NULL; } } - + return avp; } [View Less]

1 0

git:5.3:7e5b726e: core: safety checks for xavp operations
by Daniel-Constantin Mierla 27 Nov '19

27 Nov '19

Module: kamailio Branch: 5.3 Commit: 7e5b726ec106fcc06f9ed406570b3f5fea72bd7e URL: https://github.com/kamailio/kamailio/commit/7e5b726ec106fcc06f9ed406570b3f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-27T20:30:17+01:00 core: safety checks for xavp operations (cherry picked from commit 1067abf87cdaabc9557a99b36ad60e2349e16fa5) --- Modified: src/core/xavp.c --- Diff: https://github.com/… [View More]kamailio/kamailio/commit/7e5b726ec106fcc06f9ed406570b3f5… Patch: https://github.com/kamailio/kamailio/commit/7e5b726ec106fcc06f9ed406570b3f5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e5e33f6e9d..7351d830bd 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -52,6 +52,9 @@ void xavp_shm_free_unsafe(void *p) void xavp_free(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free); @@ -69,6 +72,9 @@ void xavp_free(sr_xavp_t *xa) void xavp_free_unsafe(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free_unsafe); @@ -122,8 +128,9 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list) { - if (xavp==NULL) + if (xavp==NULL) { return -1; + } /* Prepend new xavp to the list */ if(list) { xavp->next = *list; @@ -141,8 +148,9 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) sr_xavp_t *prev; sr_xavp_t *crt; - if (xavp==NULL) + if (xavp==NULL) { return -1; + } crt = xavp_get_internal(&xavp->name, list, 0, 0); @@ -172,6 +180,10 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp) { + if (nxavp==NULL) { + return -1; + } + if(pxavp==NULL) { nxavp->next = *_xavp_list_crt; *_xavp_list_crt = nxavp; @@ -296,7 +308,7 @@ static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav if(name==NULL || name->s==NULL) return NULL; id = get_hash1_raw(name->s, name->len); - + if(list && *list) avp = *list; else @@ -333,7 +345,7 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) if(start==NULL) return NULL; - + avp = start->next; while(avp) { @@ -477,7 +489,7 @@ int xavp_count(str *name, sr_xavp_t **start) if(name==NULL || name->s==NULL) return -1; id = get_hash1_raw(name->s, name->len); - + if(start) avp = *start; else @@ -529,7 +541,7 @@ void xavp_destroy_list(sr_xavp_t **head) void xavp_reset_list(void) { assert(_xavp_list_crt!=0 ); - + if (_xavp_list_crt!=&_xavp_list_head) _xavp_list_crt=&_xavp_list_head; xavp_destroy_list(_xavp_list_crt); @@ -539,7 +551,7 @@ void xavp_reset_list(void) sr_xavp_t **xavp_set_list(sr_xavp_t **head) { sr_xavp_t **avp; - + assert(_xavp_list_crt!=0); avp = _xavp_list_crt; @@ -775,6 +787,10 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) int n = 0; int i = 0; + if(xavp==NULL) { + return -1; + } + crt = xavp_get_internal(&xavp->name, list, 0, NULL); if (idx == 0 && (!crt || crt->val.type != SR_XTYPE_NULL)) @@ -840,7 +856,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) avp->next = NULL; } } - + return avp; } [View Less]

1 0

git:master:1067abf8: core: safety checks for xavp operations
by Daniel-Constantin Mierla 27 Nov '19

27 Nov '19

Module: kamailio Branch: master Commit: 1067abf87cdaabc9557a99b36ad60e2349e16fa5 URL: https://github.com/kamailio/kamailio/commit/1067abf87cdaabc9557a99b36ad60e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-27T20:28:49+01:00 core: safety checks for xavp operations --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1067abf87cdaabc9557a99b36ad60e2… Patch: https://… [View More]github.com/kamailio/kamailio/commit/1067abf87cdaabc9557a99b36ad60e2… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index f279def1ed..0899cb308a 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -52,6 +52,9 @@ void xavp_shm_free_unsafe(void *p) void xavp_free(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free); @@ -69,6 +72,9 @@ void xavp_free(sr_xavp_t *xa) void xavp_free_unsafe(sr_xavp_t *xa) { + if(xa==NULL) { + return; + } if(xa->val.type == SR_XTYPE_DATA) { if(xa->val.v.data!=NULL && xa->val.v.data->pfree!=NULL) { xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free_unsafe); @@ -122,8 +128,9 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list) { - if (xavp==NULL) + if (xavp==NULL) { return -1; + } /* Prepend new xavp to the list */ if(list) { xavp->next = *list; @@ -141,8 +148,9 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) sr_xavp_t *prev; sr_xavp_t *crt; - if (xavp==NULL) + if (xavp==NULL) { return -1; + } crt = xavp_get_internal(&xavp->name, list, 0, 0); @@ -172,6 +180,10 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp) { + if (nxavp==NULL) { + return -1; + } + if(pxavp==NULL) { nxavp->next = *_xavp_list_crt; *_xavp_list_crt = nxavp; @@ -296,7 +308,7 @@ static sr_xavp_t *xavp_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav if(name==NULL || name->s==NULL) return NULL; id = get_hash1_raw(name->s, name->len); - + if(list && *list) avp = *list; else @@ -333,7 +345,7 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) if(start==NULL) return NULL; - + avp = start->next; while(avp) { @@ -477,7 +489,7 @@ int xavp_count(str *name, sr_xavp_t **start) if(name==NULL || name->s==NULL) return -1; id = get_hash1_raw(name->s, name->len); - + if(start) avp = *start; else @@ -529,7 +541,7 @@ void xavp_destroy_list(sr_xavp_t **head) void xavp_reset_list(void) { assert(_xavp_list_crt!=0 ); - + if (_xavp_list_crt!=&_xavp_list_head) _xavp_list_crt=&_xavp_list_head; xavp_destroy_list(_xavp_list_crt); @@ -539,7 +551,7 @@ void xavp_reset_list(void) sr_xavp_t **xavp_set_list(sr_xavp_t **head) { sr_xavp_t **avp; - + assert(_xavp_list_crt!=0); avp = _xavp_list_crt; @@ -780,6 +792,10 @@ int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list) int n = 0; int i = 0; + if(xavp==NULL) { + return -1; + } + crt = xavp_get_internal(&xavp->name, list, 0, NULL); if (idx == 0 && (!crt || crt->val.type != SR_XTYPE_NULL)) @@ -845,7 +861,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) avp->next = NULL; } } - + return avp; } [View Less]

1 0

git:master:dd4f2fce: nathelper: use set_alias_to_pv() for kemi export name
by Daniel-Constantin Mierla 27 Nov '19

27 Nov '19

Module: kamailio Branch: master Commit: dd4f2fceb25bf9536a0b6239d49d15f3ded97f5d URL: https://github.com/kamailio/kamailio/commit/dd4f2fceb25bf9536a0b6239d49d15f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-27T20:15:39+01:00 nathelper: use set_alias_to_pv() for kemi export name - same as for config export - helper functions renamed to reflect better their purpose --- Modified: src/modules/… [View More]nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/dd4f2fceb25bf9536a0b6239d49d15f… Patch: https://github.com/kamailio/kamailio/commit/dd4f2fceb25bf9536a0b6239d49d15f… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index aae1791b94..c5100a466f 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -127,8 +127,8 @@ static int test_sdp_cline(struct sip_msg *msg); static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow); static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp); -static int alias_to_uri(str *contact_header, str *alias_uri); -static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp); +static int nh_alias_to_uri(str *contact_header, str *alias_uri); +static int nh_write_to_pv(struct sip_msg *msg, str *data, str *pvname); static void nh_timer(unsigned int, void *); static int mod_init(void); @@ -2460,7 +2460,8 @@ static int sel_rewrite_contact(str *res, select_t *s, struct sip_msg *msg) * * @result 1 successful , -1 fail */ -static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow){ +static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow) +{ str dest_avp={0,0}; if(!uri_avp) @@ -2481,7 +2482,8 @@ static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow){ * * @result 1 successful , -1 fail */ -static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp){ +static int ki_set_alias_to_pv(struct sip_msg *msg, str *pvname) +{ str contact; str alias_uri={0,0}; @@ -2503,10 +2505,10 @@ static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp){ contact.s = ((contact_body_t *)msg->contact->parsed)->contacts->name.s; contact.len = ((contact_body_t *)msg->contact->parsed)->contacts->len; - if(alias_to_uri(&contact,&alias_uri)<0) + if(nh_alias_to_uri(&contact, &alias_uri)<0) return -1; - if(write_to_avp(msg, &alias_uri, uri_avp)<0) + if(nh_write_to_pv(msg, &alias_uri, pvname)<0) goto error; if(alias_uri.s) @@ -2518,19 +2520,20 @@ static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp){ if(alias_uri.s) pkg_free(alias_uri.s); - return -1; + return -1; } /*! -* @function write_to_avp -* @abstract write_to_avp function writes data to given avp +* @function nh_write_to_pv +* @abstract nh_write_to_pv function writes data to given avp * @param data source data * @param uri_avp destination avp name * @result 1 successful , -1 fail */ -static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ +static int nh_write_to_pv(struct sip_msg *msg, str *data, str *pvname) +{ pv_spec_t *pvresult = NULL; pv_value_t valx; - pvresult = pv_cache_get(uri_avp); + pvresult = pv_cache_get(pvname); if(pvresult == NULL) { LM_ERR("Failed to malloc destination pseudo-variable \n"); @@ -2538,7 +2541,8 @@ static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ } if(pvresult->setf==NULL) { - LM_ERR("Destination pseudo-variable is not writable: [%.*s] \n",uri_avp->len, uri_avp->s); + LM_ERR("Destination pseudo-variable is not writable: [%.*s] \n", + pvname->len, pvname->s); return -1; } memset(&valx, 0, sizeof(pv_value_t)); @@ -2557,14 +2561,15 @@ static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp){ return 1; } /*! -* @function alias_to_uri +* @function nh_alias_to_uri * @abstract select alias paramter from contact_header * then writes to alias_uri * @param contact_header Source contact header * @param alias_uri Destination string * @result 1 successful , -1 fail */ -static int alias_to_uri(str *contact_header, str *alias_uri){ +static int nh_alias_to_uri(str *contact_header, str *alias_uri) +{ int i=0; // index str host={0,0}; str port={0,0}; @@ -2700,7 +2705,7 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("nathelper"), str_init("set_alias_to_avp"), + { str_init("nathelper"), str_init("set_alias_to_pv"), SR_KEMIP_INT, ki_set_alias_to_pv, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } [View Less]

1 0

git:master:063e6a02: core: increase SHM memory pool to 128 MB
by Henning Westerholt 27 Nov '19

27 Nov '19

Module: kamailio Branch: master Commit: 063e6a025b8ca0163af2147f057d29447c6f9760 URL: https://github.com/kamailio/kamailio/commit/063e6a025b8ca0163af2147f057d294… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-23T22:49:28+01:00 core: increase SHM memory pool to 128 MB - increase SHM memory pool to 128 MB - even an embedded system like Raspberry Pi has 1 GB RAM nowadays - make it less likely that new users run into … [View More]

2 5

git:master:f35fd46d: core: print modparam type as string in log message
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: f35fd46de42a26d910e637023396a801c0ad404c URL: https://github.com/kamailio/kamailio/commit/f35fd46de42a26d910e637023396a80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T15:18:22+01:00 core: print modparam type as string in log message --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/f35fd46de42a26d910e637023396a80… … [View More]

1 0

git:master:a0e04cb2: rr: debug messages when setting send socket on double rr
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: a0e04cb2a06ec2cae9a066003732746cb8d609d0 URL: https://github.com/kamailio/kamailio/commit/a0e04cb2a06ec2cae9a066003732746… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T11:25:46+01:00 rr: debug messages when setting send socket on double rr --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] Avoid full table scan for dispatcher table using db_redis using ds_reload() from config script In (#2149)
by Joel Serrano 26 Nov '19

26 Nov '19

# Description Trying to avoid getting this warning: Nov 22 20:36:35 test COPS[25531]: WARNING: db_redis [redis_dbase.c:1098]: db_redis_perform_query(): performing full table scan on table 'dispatcher' while performing query ### Troubleshooting Having: ``` modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "dispatcher=entry:id") ``` And debug logs showing the key being found: ``` #### Reproduction <!-- If the issue can be reproduced, describe how it … [View More]

2 2

git:master:13c1c0bf: db_redis: do not print full table scan warning when loading the entire table
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: 13c1c0bfdd93d2f727ff65275e93f4a780143dee URL: https://github.com/kamailio/kamailio/commit/13c1c0bfdd93d2f727ff65275e93f4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T09:14:42+01:00 db_redis: do not print full table scan warning when loading the entire table - GH #2149 --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/… [View More]

1 0

[kamailio/kamailio] enforce REGISTER with AKAv1 (IMS) (#2150)
by moshe-av 26 Nov '19

26 Nov '19

Can kamailio enforce client to REGISTER with AKAv1? Here our setup: 1. kamailio version 4.3.4 for IMS 2. Boghe IMS client v1.0.58.550 3. scscf.cfg is configure with: #!define REG_AUTH_DEFAULT_ALG "AKAv1-MD5" a. First REGISTER fails with 401 Unauthorized b. Second REGISTER 200 OK, but the REGISTER is MD5 and not AKAv1 Authorization: Digest username="bob(a)net1.test", realm="net1.test", nonce="XdzPaF3czjz0oMKPeNLScpKAfb9prE7x", uri="sip:net1.test", response="… [View More]

2 2

git:master:1c402ddc: core: new command line parameter --modparam
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: 1c402ddc4cc499700e186b65108303a2aaec6287 URL: https://github.com/kamailio/kamailio/commit/1c402ddc4cc499700e186b65108303a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T08:49:02+01:00 core: new command line parameter --modparam - allow setting a module parameter via command line - format: --modparam=modname:paramname:type:valye - type can be: 'i' for integer … [View More]value; 's' for string value - example: kamailio --loadmodule=xprint.so --modparam=xprint:buf_size:i:2048 --- Modified: src/core/modparam.c Modified: src/core/modparam.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1c402ddc4cc499700e186b65108303a… Patch: https://github.com/kamailio/kamailio/commit/1c402ddc4cc499700e186b65108303a… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 72ad2fbc9e..1a7d8acd78 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -154,3 +154,63 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) } return 0; } + +int set_mod_param_serialized(char* mval) +{ +#define MPARAM_MBUF_SIZE 256 + char mbuf[MPARAM_MBUF_SIZE]; + char *mname = NULL; + char *mparam = NULL; + char *sval = NULL; + int ival = 0; + int ptype = PARAM_STRING; + char *p = NULL; + + if(strlen(mval) >= MPARAM_MBUF_SIZE) { + LM_ERR("argument is too long: %s\n", mval); + return -1; + } + strcpy(mbuf, mval); + mname = mbuf; + p = strchr(mbuf, ':'); + if(p==NULL) { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + *p = '\0'; + p++; + mparam = p; + p = strchr(p, ':'); + if(p==NULL) { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + *p = '\0'; + p++; + if(*p=='i' || *p=='I') { + ptype = PARAM_INT; + } else if(*p=='s' || *p=='S') { + ptype = PARAM_STRING; + } else { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + p++; + if(*p!=':') { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + p++; + sval = p; + + if(ptype == PARAM_STRING) { + return set_mod_param_regex(mname, mparam, PARAM_STRING, sval); + } else { + if(strlen(sval) <= 0) { + LM_ERR("invalid format for argument: %s\n", mval); + return -1; + } + strz2sint(sval, &ival); + return set_mod_param_regex(mname, mparam, PARAM_INT, (void*)(long)ival); + } +} diff --git a/src/core/modparam.h b/src/core/modparam.h index 91c6867d59..0a4241ad4a 100644 --- a/src/core/modparam.h +++ b/src/core/modparam.h @@ -34,4 +34,6 @@ int set_mod_param(char* _mod, char* _name, modparam_t _type, void* _val); int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val); +int set_mod_param_serialized(char* mval); + #endif diff --git a/src/main.c b/src/main.c index 31af3d2cef..0bc2e650dc 100644 --- a/src/main.c +++ b/src/main.c @@ -78,6 +78,7 @@ #include "core/mem/shm_mem.h" #include "core/shm_init.h" #include "core/sr_module.h" +#include "core/modparam.h" #include "core/timer.h" #include "core/parser/msg_parser.h" #include "core/ip_addr.h" @@ -196,6 +197,9 @@ Options:\n\ --loadmodule=name load the module specified by name\n\ -L path Modules search path (default: " MODS_DIR ")\n\ -m nr Size of shared memory allocated in Megabytes\n\ + --modparam=modname:paramname:type:value set the module parameter\n\ + type has to be 's' for string value and 'i' for int value, \n\ + example: --modparam=corex:alias_subdomains:s:" NAME ".org\n\ -M nr Size of private memory allocated, in Megabytes\n\ -n processes Number of child processes to fork per interface\n\ (default: 8)\n" @@ -1924,6 +1928,7 @@ int main(int argc, char** argv) {"substdefs", required_argument, 0, KARGOPTVAL + 3}, {"server-id", required_argument, 0, KARGOPTVAL + 4}, {"loadmodule", required_argument, 0, KARGOPTVAL + 5}, + {"modparam", required_argument, 0, KARGOPTVAL + 6}, {0, 0, 0, 0 } }; @@ -2140,6 +2145,7 @@ int main(int argc, char** argv) case 's': case 'Y': case KARGOPTVAL+5: + case KARGOPTVAL+6: break; /* long options */ @@ -2239,6 +2245,12 @@ int main(int argc, char** argv) goto error; } break; + case KARGOPTVAL+6: + if(set_mod_param_serialized(optarg) < 0) { + LM_ERR("failed to set modparam: %s\n", optarg); + goto error; + } + break; default: break; } [View Less]

1 0

git:master:b36da1dc: core: utils functions to converts strz to integer
by Daniel-Constantin Mierla 26 Nov '19

26 Nov '19

Module: kamailio Branch: master Commit: b36da1dca71036ea3aa52675d3166317851e6594 URL: https://github.com/kamailio/kamailio/commit/b36da1dca71036ea3aa52675d316631… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-26T08:49:02+01:00 core: utils functions to converts strz to integer --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/b36da1dca71036ea3aa52675d316631… Patch: … [View More]

1 0

git:master:cef6284f: nathelper: remove AVP from log message, use generic term
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: cef6284f18e0d4c606dcee3198f77e34e4c0863d URL: https://github.com/kamailio/kamailio/commit/cef6284f18e0d4c606dcee3198f77e3… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:53:37+01:00 nathelper: remove AVP from log message, use generic term --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/cef6284f18e0d4c606dcee3198f77e3…… [View More]

1 0

git:master:0cc8a34d: nathelper: small spelling fix in docs
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 0cc8a34d3ddf2239fa8b9585d2b4432fe8362116 URL: https://github.com/kamailio/kamailio/commit/0cc8a34d3ddf2239fa8b9585d2b4432… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:45:46+01:00 nathelper: small spelling fix in docs --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0cc8a34d3ddf2239fa8b9585d2b4432… … [View More]

1 0

git:master:9ba1a6c8: nathelper: remove redundant check for zero
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 9ba1a6c851aafc402f5fbe211638159717120c31 URL: https://github.com/kamailio/kamailio/commit/9ba1a6c851aafc402f5fbe211638159… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:48:05+01:00 nathelper: remove redundant check for zero --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/9ba1a6c851aafc402f5fbe211638159… Patch: … [View More]

1 0

[kamailio/kamailio] nathelper : added new function set_alias_to_avp (#2124)
by Yasin CANER 25 Nov '19

25 Nov '19

#### 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  new function that read alias from Contact header then write to given avp as sip uri You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2124 -- Commit Summary -- * parse_uri : added new function proto type int to str * nathelper : added new function set_alias_to_avp * nathelper : added description of set_alias_to_avp function -- File Changes -- M src/core/parser/parse_uri.c (23) M src/core/parser/parse_uri.h (2) M src/modules/nathelper/nathelper.c (176) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2124.patch https://github.com/kamailio/kamailio/pull/2124.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/2124 [View Less]

3 16

git:master:28cfa397: nathelper : set_alias_to_avp is renamed to set_alias_to_pv
by Henning Westerholt 25 Nov '19

25 Nov '19

Module: kamailio Branch: master Commit: 28cfa3978684838442fbd3b4861765023252e963 URL: https://github.com/kamailio/kamailio/commit/28cfa3978684838442fbd3b48617650… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-25T20:33:30+01:00 nathelper : set_alias_to_avp is renamed to set_alias_to_pv set_alias_to_avp renamed to set_alias_to_pv --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/… [View More]nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/28cfa3978684838442fbd3b48617650… Patch: https://github.com/kamailio/kamailio/commit/28cfa3978684838442fbd3b48617650… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d983e99aa4..8c3245c5b8 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -823,9 +823,9 @@ if(is_rfc1918("$rd")) { </programlisting> </example> </section> - <section id="nathelper.set_alias_to_avp"> + <section id="nathelper.set_alias_to_pv"> <title> - <function moreinfo="none">set_alias_to_avp(target_avp)</function> + <function moreinfo="none">set_alias_to_pv(target_avp)</function> </title> <para> Reads <quote>;alias=ip~port~transport</quote> from Contact header then @@ -836,10 +836,10 @@ if(is_rfc1918("$rd")) { REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and FAILURE_ROUTE. </para> <example> - <title><function>set_alias_to_avp</function> usage</title> + <title><function>set_alias_to_pv</function> usage</title> <programlisting format="linespecific"> ... - set_alias_to_avp("$avp(aliasuri)"); + set_alias_to_pv("$avp(aliasuri)"); ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 3f820fb02c..afc38f727b 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -125,8 +125,8 @@ static int add_rcv_param_f(struct sip_msg *, char *, char *); static int nh_sip_reply_received(sip_msg_t *msg); static int test_sdp_cline(struct sip_msg *msg); -static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow); -static int ki_set_alias_to_avp(struct sip_msg *msg, str *uri_avp); +static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow); +static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp); static int alias_to_uri(str *contact_header, str *alias_uri); static int write_to_avp(struct sip_msg *msg, str *data, str *uri_avp); @@ -228,7 +228,7 @@ static cmd_export_t cmds[] = { {"is_rfc1918", (cmd_function)is_rfc1918_f, 1, fixup_spve_null, 0, ANY_ROUTE }, - {"set_alias_to_avp", (cmd_function)w_set_alias_to_avp, 1, + {"set_alias_to_pv", (cmd_function)w_set_alias_to_pv, 1, 0, 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -2453,14 +2453,14 @@ static int sel_rewrite_contact(str *res, select_t *s, struct sip_msg *msg) return 0; } /*! -* @function w_set_alias_to_avp +* @function w_set_alias_to_pv * @abstract wrapper of set_alias_to_avp_f * @param msg sip message * @param uri_avp given avp name * * @result 1 successful , -1 fail */ -static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow){ +static int w_set_alias_to_pv(struct sip_msg *msg, char *uri_avp, char *hollow){ str dest_avp={0,0}; if(!uri_avp) @@ -2469,11 +2469,11 @@ static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow){ dest_avp.s=uri_avp; dest_avp.len=strlen(dest_avp.s); - return ki_set_alias_to_avp(msg,&dest_avp); + return ki_set_alias_to_pv(msg,&dest_avp); } /*! -* @function ki_set_alias_to_avp +* @function ki_set_alias_to_pv * @abstract reads from msg then write to given avp uri_avp as sip uri * * @param msg sip message @@ -2481,7 +2481,7 @@ static int w_set_alias_to_avp(struct sip_msg *msg, char *uri_avp, char *hollow){ * * @result 1 successful , -1 fail */ -static int ki_set_alias_to_avp(struct sip_msg *msg, str *uri_avp){ +static int ki_set_alias_to_pv(struct sip_msg *msg, str *uri_avp){ str contact; str alias_uri={0,0}; @@ -2701,7 +2701,7 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("nathelper"), str_init("set_alias_to_avp"), - SR_KEMIP_INT, ki_set_alias_to_avp, + SR_KEMIP_INT, ki_set_alias_to_pv, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, [View Less]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev