sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

[kamailio] recover htable replication through dmq after kamailio restart (#260)

by José Seabra

(Feature request) be able to recover data from htable variable when kamailio starts, from another kamailio instances through dmq module. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/260

5 years, 8 months

git:master:fb63da5f: Merge pull request #1667 from kamailio/cchance/ht-dmq-sync

by GitHub

Module: kamailio Branch: master Commit: fb63da5ff6fca08b1b1153aae9e495baf04806ff URL: https://github.com/kamailio/kamailio/commit/fb63da5ff6fca08b1b1153aae9e495b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-05T07:19:43+02:00 Merge pull request #1667 from kamailio/cchance/ht-dmq-sync htable: added startup synchronization over dmq --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/fb63da5ff6fca08b1b1153aae9e495b… Patch: https://github.com/kamailio/kamailio/commit/fb63da5ff6fca08b1b1153aae9e495b…

5 years, 8 months

git:master:57f87fcb: htable: added startup synchronization over dmq

by Charles Chance

Module: kamailio Branch: master Commit: 57f87fcb3a973735681dba5c9e9484c5664db3aa URL: https://github.com/kamailio/kamailio/commit/57f87fcb3a973735681dba5c9e9484c… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-09-28T19:09:28+02:00 htable: added startup synchronization over dmq --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/57f87fcb3a973735681dba5c9e9484c… Patch: https://github.com/kamailio/kamailio/commit/57f87fcb3a973735681dba5c9e9484c…

5 years, 8 months

[kamailio/kamailio] htable: added startup synchronization over dmq (#1667)

by Charles Chance

#### 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 - [x] Related to issue #260 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1667 -- Commit Summary -- * htable: added startup synchronization over dmq -- File Changes -- M src/modules/htable/doc/htable_admin.xml (22) M src/modules/htable/ht_dmq.c (395) M src/modules/htable/ht_dmq.h (6) M src/modules/htable/htable.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1667.patch https://github.com/kamailio/kamailio/pull/1667.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/1667

5 years, 8 months

[kamailio/kamailio] siputils: add is_uri function (#1666)

by lazedo

#### 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) - [ ] 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  maybe this already exists but i didn't find. not required to backport but could be useful in 5.1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1666 -- Commit Summary -- * siputils: add is_uri function -- File Changes -- M src/modules/siputils/checks.c (31) M src/modules/siputils/checks.h (4) M src/modules/siputils/doc/siputils_admin.xml (27) M src/modules/siputils/siputils.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1666.patch https://github.com/kamailio/kamailio/pull/1666.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/1666

5 years, 8 months

git:master:0eb8c03c: Merge pull request #1666 from kamailio/lazedo/is-uri

by GitHub

Module: kamailio Branch: master Commit: 0eb8c03c9c73d14d288a4993b30fecf6e244be13 URL: https://github.com/kamailio/kamailio/commit/0eb8c03c9c73d14d288a4993b30fecf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-05T07:19:27+02:00 Merge pull request #1666 from kamailio/lazedo/is-uri siputils: add is_uri function --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/0eb8c03c9c73d14d288a4993b30fecf… Patch: https://github.com/kamailio/kamailio/commit/0eb8c03c9c73d14d288a4993b30fecf… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 0a33bddbd6..b700c620c0 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -129,6 +129,37 @@ int w_has_totag(struct sip_msg* _m, char* _foo, char* _bar) return has_totag(_m); } +/* + * Check if pseudo variable contains a valid uri + */ +int is_uri(struct sip_msg* _m, char* _sp, char* _s2) +{ + pv_spec_t *sp; + pv_value_t pv_val; + sip_uri_t turi; + + sp = (pv_spec_t *)_sp; + + if (sp && (pv_get_spec_value(_m, sp, &pv_val) == 0)) { + if (pv_val.flags & PV_VAL_STR) { + if (pv_val.rs.len == 0 || pv_val.rs.s == NULL) { + LM_DBG("missing argument\n"); + return -1; + } + if(parse_uri(pv_val.rs.s, pv_val.rs.len, &turi)!=0) { + return -1; + } + return 1; + } else { + LM_ERR("pseudo variable value is not string\n"); + return -1; + } + } else { + LM_ERR("failed to get pseudo variable value\n"); + return -1; + } +} + /* * Check if the username matches the username in credentials */ diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 39a575d94c..a9186386a2 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -75,6 +75,10 @@ int add_uri_param(struct sip_msg* _msg, char* _param, char* _s2); */ int tel2sip(struct sip_msg* _msg, char* _uri, char* _hostpart, char* _res); +/* + * Check if pseudo variable contains a valid uri + */ +int is_uri(struct sip_msg* _m, char* _sp, char* _s2); /* * Check if user part of URI in pseudo variable is an e164 number diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index d55641d9f1..c022dd2dd1 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -608,6 +608,33 @@ if (is_uri_user_e164("$avp(i:705)") { </example> </section> + <section id="siputils.f.is_uri"> + <title> + <function moreinfo="none">is_uri(pseudo-variable)</function> + </title> + <para> + Checks if string value of pseudo variable argument is a + valid uri. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_uri</function> usage</title> + <programlisting format="linespecific"> +... +if (is_uri("$var(x)")) { # Check if variable contains a uri + ... +} +if (is_uri("$avp(i:705)") { + # Check value stored in avp i:705 + ... +}; +... +</programlisting> + </example> + </section> + <section id="siputils.f.is_tel_number"> <title> <function moreinfo="none">is_tel_number(tval)</function> diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index af8cb29d4b..50cd7425aa 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -137,6 +137,8 @@ static cmd_export_t cmds[]={ free_fixup_get_uri_param, REQUEST_ROUTE|LOCAL_ROUTE}, {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE}, + {"is_uri", (cmd_function)is_uri, 1, fixup_pvar_null, + fixup_free_pvar_null, ANY_ROUTE}, {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"is_uri_user_e164", (cmd_function)w_is_uri_user_e164, 1, fixup_pvar_null,

5 years, 8 months

git:master:45479865: siputils: add is_uri function

by lazedo

Module: kamailio Branch: master Commit: 454798654c2b2acd252df411d64e55bee0a70f52 URL: https://github.com/kamailio/kamailio/commit/454798654c2b2acd252df411d64e55b… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2018-10-04T12:40:11Z siputils: add is_uri function --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/454798654c2b2acd252df411d64e55b… Patch: https://github.com/kamailio/kamailio/commit/454798654c2b2acd252df411d64e55b… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 0a33bddbd6..b700c620c0 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -129,6 +129,37 @@ int w_has_totag(struct sip_msg* _m, char* _foo, char* _bar) return has_totag(_m); } +/* + * Check if pseudo variable contains a valid uri + */ +int is_uri(struct sip_msg* _m, char* _sp, char* _s2) +{ + pv_spec_t *sp; + pv_value_t pv_val; + sip_uri_t turi; + + sp = (pv_spec_t *)_sp; + + if (sp && (pv_get_spec_value(_m, sp, &pv_val) == 0)) { + if (pv_val.flags & PV_VAL_STR) { + if (pv_val.rs.len == 0 || pv_val.rs.s == NULL) { + LM_DBG("missing argument\n"); + return -1; + } + if(parse_uri(pv_val.rs.s, pv_val.rs.len, &turi)!=0) { + return -1; + } + return 1; + } else { + LM_ERR("pseudo variable value is not string\n"); + return -1; + } + } else { + LM_ERR("failed to get pseudo variable value\n"); + return -1; + } +} + /* * Check if the username matches the username in credentials */ diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 39a575d94c..a9186386a2 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -75,6 +75,10 @@ int add_uri_param(struct sip_msg* _msg, char* _param, char* _s2); */ int tel2sip(struct sip_msg* _msg, char* _uri, char* _hostpart, char* _res); +/* + * Check if pseudo variable contains a valid uri + */ +int is_uri(struct sip_msg* _m, char* _sp, char* _s2); /* * Check if user part of URI in pseudo variable is an e164 number diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index a882c3b069..58dd81adcf 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -608,6 +608,33 @@ if (is_uri_user_e164("$avp(i:705)") { </example> </section> + <section id="siputils.f.is_uri"> + <title> + <function moreinfo="none">is_uri(pseudo-variable)</function> + </title> + <para> + Checks if string value of pseudo variable argument is a + valid uri. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_uri</function> usage</title> + <programlisting format="linespecific"> +... +if (is_uri("$var(x)")) { # Check if variable contains a uri + ... +} +if (is_uri("$avp(i:705)") { + # Check value stored in avp i:705 + ... +}; +... +</programlisting> + </example> + </section> + <section id="siputils.f.is_tel_number"> <title> <function moreinfo="none">is_tel_number(tval)</function> diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index af8cb29d4b..50cd7425aa 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -137,6 +137,8 @@ static cmd_export_t cmds[]={ free_fixup_get_uri_param, REQUEST_ROUTE|LOCAL_ROUTE}, {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE}, + {"is_uri", (cmd_function)is_uri, 1, fixup_pvar_null, + fixup_free_pvar_null, ANY_ROUTE}, {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"is_uri_user_e164", (cmd_function)w_is_uri_user_e164, 1, fixup_pvar_null,

5 years, 8 months

git:master:6685a797: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 6685a79778ade7821d521b23d791ed3ac80938a8 URL: https://github.com/kamailio/kamailio/commit/6685a79778ade7821d521b23d791ed3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-04T17:01:39+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/6685a79778ade7821d521b23d791ed3… Patch: https://github.com/kamailio/kamailio/commit/6685a79778ade7821d521b23d791ed3… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 58f0d16228..a67289bdb5 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -57,6 +57,7 @@ Muhammad Shahzad Shafi 4.17. set_source_address(saddr) 4.18. via_add_srvid(flags) 4.19. via_add_xavp_params(flags) + 4.20. via_use_xavp_fields(flags) 5. RPC Commands @@ -98,8 +99,9 @@ Muhammad Shahzad Shafi 1.21. set_source_address usage 1.22. via_add_srvid usage 1.23. via_add_xavp_params usage - 1.24. event_route[network:msg] use cases - 1.25. Sample PERL code for do_compress and do_uncompress + 1.24. via_use_xavp_fields usage + 1.25. event_route[network:msg] use cases + 1.26. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -139,6 +141,7 @@ Chapter 1. Admin Guide 4.17. set_source_address(saddr) 4.18. via_add_srvid(flags) 4.19. via_add_xavp_params(flags) + 4.20. via_use_xavp_fields(flags) 5. RPC Commands @@ -277,6 +280,7 @@ modparam("corex", "msg_avp", "$avp(msg)") 4.17. set_source_address(saddr) 4.18. via_add_srvid(flags) 4.19. via_add_xavp_params(flags) + 4.20. via_use_xavp_fields(flags) 4.1. append_branch([ uri, [ q ] ]) @@ -573,6 +577,21 @@ via_add_srv("1"); via_add_xavp_params("1"); ... +4.20. via_use_xavp_fields(flags) + + Control if fields of the xavp with the name specified by + xavp_via_fields global parameter are used or not to build local Via. + + Meaning of the parameters is as follows: + * flags: 1 - use xavp fields; 0 - do not use xavp fields. + + This function can be used from ANY_ROUTE. + + Example 1.24. via_use_xavp_fields usage +... +via_use_xavp_fields("1"); +... + 5. RPC Commands 5.1. corex.debug @@ -707,7 +726,7 @@ via_add_xavp_params("1"); Next is a basic usage example where encoding and decoding is done using PERL, - Example 1.24. event_route[network:msg] use cases + Example 1.25. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -738,7 +757,7 @@ event_route[network:msg] { } ... - Example 1.25. Sample PERL code for do_compress and do_uncompress + Example 1.26. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

5 years, 8 months

git:master:61405d0f: corex: docs for via_use_xavp_fields()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 61405d0f0139622f78d81daa634caff86f5b3970 URL: https://github.com/kamailio/kamailio/commit/61405d0f0139622f78d81daa634caff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-04T16:52:00+02:00 corex: docs for via_use_xavp_fields() --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/61405d0f0139622f78d81daa634caff… Patch: https://github.com/kamailio/kamailio/commit/61405d0f0139622f78d81daa634caff… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 346ecf2019..6460d11913 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -664,6 +664,34 @@ via_add_srv("1"); ... via_add_xavp_params("1"); ... +</programlisting> + </example> + </section> + <section id="corex.f.via_use_xavp_fields"> + <title><function moreinfo="none">via_use_xavp_fields(flags)</function></title> + <para> + Control if fields of the xavp with the name specified by + xavp_via_fields global parameter are used or not to build local Via. + + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flags</emphasis>: 1 - use xavp fields; 0 - do not + use xavp fields. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>via_use_xavp_fields</function> usage</title> + <programlisting format="linespecific"> +... +via_use_xavp_fields("1"); +... </programlisting> </example> </section>

5 years, 8 months

git:master:b81e049f: corex: new function via_use_xavp_fields(mode)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b81e049f568c162d03c4d146a16f9d6c20898905 URL: https://github.com/kamailio/kamailio/commit/b81e049f568c162d03c4d146a16f9d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-04T16:47:52+02:00 corex: new function via_use_xavp_fields(mode) - set/unset the flag for building local Via using fields from via_xavp_fields xavp --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b81e049f568c162d03c4d146a16f9d6… Patch: https://github.com/kamailio/kamailio/commit/b81e049f568c162d03c4d146a16f9d6… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 431d25ad16..a6a01e9af1 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -58,6 +58,7 @@ static int w_set_recv_socket(sip_msg_t *msg, char *psock, char *p2); static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2); static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2); static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); +static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *p2); static int fixup_file_op(void** param, int param_no); @@ -121,6 +122,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"via_add_xavp_params", (cmd_function)w_via_add_xavp_params, 1, fixup_igp_null, 0, ANY_ROUTE }, + {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -795,6 +798,35 @@ static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) return ki_via_add_xavp_params(msg, fval); } +/** + * + */ +static int ki_via_use_xavp_fields(sip_msg_t *msg, int fval) +{ + if(msg==NULL) + return -1; + if(fval) { + msg->msg_flags |= FL_USE_XAVP_VIA_FIELDS; + } else { + msg->msg_flags &= ~(FL_USE_XAVP_VIA_FIELDS); + } + return 1; +} + +/** + * + */ +static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)pflags, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_via_use_xavp_fields(msg, fval); +} + + /** * */ @@ -900,6 +932,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("via_use_xavp_fields"), + SR_KEMIP_INT, ki_via_use_xavp_fields, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("corex"), str_init("has_ruri_user"), SR_KEMIP_INT, ki_has_ruri_user, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

5 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2018