sr-dev December 2019

sr-dev@lists.kamailio.org

19 participants
279 discussions

git:5.3:d231c285: travis: build using pkg-kamailio-docker 5.3-$DIST tag

by Victor Seva

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… Patch: https://github.com/kamailio/kamailio/commit/d231c2856d1c056614a7ec64cddb276… --- diff --git a/.travis.yml b/.travis.yml index 73638bb613..79f356af9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ env: services: - docker before_install: - - docker pull kamailio/pkg-kamailio-docker:dev-$DIST -script: docker run -v $TRAVIS_BUILD_DIR:/code:rw kamailio/pkg-kamailio-docker:dev-$DIST /bin/bash -c "cd /code; CC=$CC DIST=$DIST ./test/travis/build_travis.sh" + - docker pull kamailio/pkg-kamailio-docker:5.3-$DIST +script: docker run -v $TRAVIS_BUILD_DIR:/code:rw kamailio/pkg-kamailio-docker:5.3-$DIST /bin/bash -c "cd /code; CC=$CC DIST=$DIST ./test/travis/build_travis.sh" branches: only: - 'master'

4 years, 11 months

git:5.2:9474e01d: travis: build using pkg-kamailio-docker 5.2-$DIST tag

by Victor Seva

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… Patch: https://github.com/kamailio/kamailio/commit/9474e01d8ffa82c80c61706b87fc1e1… --- diff --git a/.travis.yml b/.travis.yml index 11eae2df71..439bd66286 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ env: services: - docker before_install: - - docker pull kamailio/pkg-kamailio-docker:dev-$DIST -script: docker run -v $TRAVIS_BUILD_DIR:/code:rw kamailio/pkg-kamailio-docker:dev-$DIST /bin/bash -c "cd /code; CC=$CC DIST=$DIST ./test/travis/build_travis.sh" + - docker pull kamailio/pkg-kamailio-docker:5.2-$DIST +script: docker run -v $TRAVIS_BUILD_DIR:/code:rw kamailio/pkg-kamailio-docker:5.2-$DIST /bin/bash -c "cd /code; CC=$CC DIST=$DIST ./test/travis/build_travis.sh" branches: only: - 'master'

4 years, 11 months

git:master:c65e0926: rr: fixed warning about unused label in ki_record_route_reset_one()

by Daniel-Constantin Mierla

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/c65e0926b26ee9f1cdadb9fbd6f4881… Patch: https://github.com/kamailio/kamailio/commit/c65e0926b26ee9f1cdadb9fbd6f4881… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index fa8345e36c..f61c693cb0 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -333,10 +333,10 @@ static int ki_record_route_preset_one(sip_msg_t *msg, str *addr1) return -1; } - if ( record_route_preset( msg, addr1)<0 ) + if ( record_route_preset(msg, addr1)<0 ) { return -1; + } -done: msg->msg_flags |= FL_RR_ADDED; return 1;

4 years, 11 months

Kamailio dispatcher to use tls targets.

by vinod mn

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 specify the destination as just sip:mynetwork.com:5328 with out attrs and transport=tls if is falling back to UDP. Thank you vinod.M.N

4 years, 11 months

Re: [sr-dev] [SR-Users] using a pseudo-variable as a parameter to a module function

by Henning Westerholt

(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 not intended). :-) I have the module loading correctly and can call a function in my routing script like this: > > mymod_getinfo(“5551234”); > > This, for now, just triggers a print of the submitted parameter. > > What I’d like to do next is have it accept and print the From URI in configuration script like so: > > mymod_getinfo(“$fU”); > > For now, this prints the string literal of “$fU” and I’m trying to extract the value of the referenced variable and print that. The example module “print” does not involve this concept of pseudo-variables. The skeleton module example in the wiki also does not mention variables. > > I’ve looked into other modules to see how it works but they all seem to have a slightly different handling of this task. Can someone point me to an example in the modules which accomplishes this? > > What I’ve been searching for is a replace_all function which accepts a string containing pseudo-variables and returns a new string with them all replaced with their corresponding values. > > Thanks in advance and apologies if I’ve overlooked a relevant piece of developer documentation or if I’m looking at this incorrectly. > > Regards, > -Michael > > > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

4 years, 11 months

git:master:36d94144: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

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

4 years, 11 months

git:master:da115fae: dispatcher: Minor documentation improvement for ds_is_from_list()

by Mikko Lehto

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/da115fae61f5e1aa5e29edd4a7a9e5a… Patch: https://github.com/kamailio/kamailio/commit/da115fae61f5e1aa5e29edd4a7a9e5a… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 87a7735b1d..4c9430a630 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1568,14 +1568,14 @@ if(ds_list_exists("10")) { <listitem> <para><emphasis>groupid</emphasis> (optional) - if not given or its value is -1, the matching will be done over all addresses in - all dispacher groups. Otherwise the matching will be done only + 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. </para> </listitem> <listitem> <para><emphasis>mode</emphasis> - (optional) - a bitmask to specify - how the matching should be done. If is 0, all ip, port and + how the matching should be 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. @@ -1585,7 +1585,7 @@ if(ds_list_exists("10")) { </para> </listitem> <listitem> - <para><emphasis>uri</emphasis> (optional) - if is empty or missing, + <para><emphasis>uri</emphasis> (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

4 years, 11 months

git:master:93e7f4b3: modules: readme files regenerated - rr ... [skip ci]

by Kamailio Dev

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… Patch: https://github.com/kamailio/kamailio/commit/93e7f4b3b4120c4eaf064600a581288… --- diff --git a/src/modules/rr/README b/src/modules/rr/README index 1b1ef14557..3e77939fdd 100644 --- a/src/modules/rr/README +++ b/src/modules/rr/README @@ -57,6 +57,7 @@ Bogdan-Andrei Iancu 5.6. add_rr_param(param) 5.7. check_route_param(re) 5.8. is_direction(dir) + 5.9. rr_next_hop_route() 6. Exported Pseudo Variables @@ -96,7 +97,8 @@ Bogdan-Andrei Iancu 1.16. add_rr_param usage 1.17. check_route_param usage 1.18. is_direction usage - 1.19. $route_uri + 1.19. rr_next_hop_route usage + 1.20. $route_uri 2.1. record_route usage 2.2. record_route_advertised_address usage 2.3. Loading RR module's API from another module @@ -133,6 +135,7 @@ Chapter 1. Admin Guide 5.6. add_rr_param(param) 5.7. check_route_param(re) 5.8. is_direction(dir) + 5.9. rr_next_hop_route() 6. Exported Pseudo Variables @@ -367,6 +370,7 @@ modparam("rr", "ignore_sips", 1) 5.6. add_rr_param(param) 5.7. check_route_param(re) 5.8. is_direction(dir) + 5.9. rr_next_hop_route() 5.1. loose_route() @@ -577,6 +581,24 @@ if (is_direction("downstream")) { } ... +5.9. rr_next_hop_route() + + The function returns 1 (true) if there is a Route header for the next + hop address. It has to be used after loose_route(), when the local + Route headers are processed. + + This function can be used from ANY_ROUTE. + + Example 1.19. rr_next_hop_route usage +... +if(loose_route) { + if(rr_next_hop_route()) { + # next hop address is from Route header + } + +} +... + 6. Exported Pseudo Variables 6.1. $route_uri @@ -585,7 +607,7 @@ if (is_direction("downstream")) { Returns the URI of the top route-header. - Example 1.19. $route_uri + Example 1.20. $route_uri ... xdbg("Route-URI is: $route_uri\n"); ...

4 years, 11 months

git:master:9ddef157: rr: docs for rr_next_hop_route() function

by Daniel-Constantin Mierla

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/9ddef1571c5508f2b12614d3cebac43… Patch: https://github.com/kamailio/kamailio/commit/9ddef1571c5508f2b12614d3cebac43… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 362edd4f1f..01bee1b451 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -649,6 +649,35 @@ if (is_direction("downstream")) { </programlisting> </example> </section> + + <section id="rr.f.rr_next_hop_route"> + <title><function moreinfo="none">rr_next_hop_route()</function></title> + + <para>The function returns 1 (true) if there is a Route header for the + next hop address. It has to be used after loose_route(), when the + local Route headers are processed. + </para> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title><function>rr_next_hop_route</function> usage</title> + + <programlisting format="linespecific"> +... +if(loose_route) { + if(rr_next_hop_route()) { + # next hop address is from Route header + } + +} +... +</programlisting> + </example> + </section> + </section> <section>

4 years, 11 months

git:master:d5030adf: rr: new function rr_next_hop_route()

by Daniel-Constantin Mierla

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 --- 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 */

4 years, 11 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2019