sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

git:master:0aaa50ce: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 24 Mar '18

24 Mar '18

Module: kamailio Branch: master Commit: 0aaa50ce82030861bcc3bf5a300b7d0a96a61f0b URL: https://github.com/kamailio/kamailio/commit/0aaa50ce82030861bcc3bf5a300b7d0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-24T04:31:31+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/0aaa50ce82030861bcc3bf5a300b7d0… Patch: https://github.com/kamailio/kamailio/commit/0aaa50ce82030861bcc3bf5a300b7d0… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index af8df91880..59164a28d1 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -397,6 +397,7 @@ event_route[xhttp:request] { Example 1.15. jsonrpc_exec usage ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); ... 6. JSONRPC Commands

1 0

git:master:0fcac52f: jsonrpcs: example accessing the jsonrpc response for jsonrpc_exec()
by Daniel-Constantin Mierla 24 Mar '18

24 Mar '18

Module: kamailio Branch: master Commit: 0fcac52fc9e6445f986c9a5a9ee1b5230030035b URL: https://github.com/kamailio/kamailio/commit/0fcac52fc9e6445f986c9a5a9ee1b52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-24T04:21:12+01:00 jsonrpcs: example accessing the jsonrpc response for jsonrpc_exec() --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0fcac52fc9e6445f986c9a5a9ee1b52… Patch: https://github.com/kamailio/kamailio/commit/0fcac52fc9e6445f986c9a5a9ee1b52… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index fa51c62f54..4b64db557e 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -459,6 +459,7 @@ event_route[xhttp:request] { <programlisting format="linespecific"> ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); ... </programlisting> </example>

1 0

git:master:804d6b85: nathelper: Support for 192.0.0.0/29 as NATed source (pull request GH#1488)
by Henning Westerholt 23 Mar '18

23 Mar '18

Module: kamailio Branch: master Commit: 804d6b85bdbe55b32edacdbd895b0ad763bf619f URL: https://github.com/kamailio/kamailio/commit/804d6b85bdbe55b32edacdbd895b0ad… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-23T21:49:17+01:00 nathelper: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/804d6b85bdbe55b32edacdbd895b0ad… Patch: https://github.com/kamailio/kamailio/commit/804d6b85bdbe55b32edacdbd895b0ad… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index a45588a50d..935c981ee8 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -148,6 +148,7 @@ static struct { {"172.16.0.0", 0, 0xffffffffu << 20}, {"192.168.0.0", 0, 0xffffffffu << 16}, {"100.64.0.0", 0, 0xffffffffu << 22}, /* rfc6598 - cg-nat */ + {"192.0.0.0", 0, 0xffffffffu << 3}, /* rfc7335 - IPv4 Service Continuity Prefix */ {NULL, 0, 0} }; /* clang-format on */

1 0

git:master:32f1671b: nat_traversal: Support for 192.0.0.0/29 as NATed source (pull request GH#1488)
by Henning Westerholt 23 Mar '18

23 Mar '18

Module: kamailio Branch: master Commit: 32f1671bee21d5f8d52b5febf50ddc7b26f6919a URL: https://github.com/kamailio/kamailio/commit/32f1671bee21d5f8d52b5febf50ddc7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-23T21:48:55+01:00 nat_traversal: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/32f1671bee21d5f8d52b5febf50ddc7… Patch: https://github.com/kamailio/kamailio/commit/32f1671bee21d5f8d52b5febf50ddc7… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index ead4c696fe..3b2924b575 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -258,6 +258,7 @@ static NetInfo rfc1918nets[] = { {"172.16.0.0", 0xac100000UL, 0xfff00000UL}, {"192.168.0.0", 0xc0a80000UL, 0xffff0000UL}, {"100.64.0.0", 0x64400000UL, 0xffc00000UL}, // include rfc6598 shared address space as technically the same for our purpose + {"192.0.0.0", 0xc0000000UL, 0xfffffff8UL}, // include rfc7335 IPv4 Service Continuity Prefix {NULL, 0UL, 0UL} };

1 0

git:master:3848b528: ipops: Support for 192.0.0.0/29 as NATed source (pull request GH#1488)
by Henning Westerholt 23 Mar '18

23 Mar '18

Module: kamailio Branch: master Commit: 3848b5286b74894ed162e1aae8c80ee3d703c21f URL: https://github.com/kamailio/kamailio/commit/3848b5286b74894ed162e1aae8c80ee… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-23T21:43:11+01:00 ipops: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) --- Modified: src/modules/ipops/detailed_ip_type.c Modified: src/modules/ipops/detailed_ip_type.h --- Diff: https://github.com/kamailio/kamailio/commit/3848b5286b74894ed162e1aae8c80ee… Patch: https://github.com/kamailio/kamailio/commit/3848b5286b74894ed162e1aae8c80ee… --- diff --git a/src/modules/ipops/detailed_ip_type.c b/src/modules/ipops/detailed_ip_type.c index a37c4aaccd..529645e990 100644 --- a/src/modules/ipops/detailed_ip_type.c +++ b/src/modules/ipops/detailed_ip_type.c @@ -41,6 +41,7 @@ static ip4_node IPv4ranges[IPv4RANGES_SIZE] = { { 0xc0586300, "6TO4-RELAY", 0xffffff00 }, // 192.88.99.0/24 { 0xc0000200, "TEST-NET", 0xffffff00 }, // 192.0.2/24 { 0xc0000000, "RESERVED", 0xffffff00 }, // 192.0.0/24 + { 0xc0000000, "6TO4-RELAY", 0xfffffff8 }, // 192.0.0.0/29 { 0xc0a80000, "PRIVATE", 0xffff0000 }, // 192.168/16 { 0xa9fe0000, "LINK-LOCAL", 0xffff0000 }, // 169.254/16 { 0xc6120000, "RESERVED", 0xfffe0000 }, // 198.18/15 diff --git a/src/modules/ipops/detailed_ip_type.h b/src/modules/ipops/detailed_ip_type.h index 35672b9297..36cdce382a 100644 --- a/src/modules/ipops/detailed_ip_type.h +++ b/src/modules/ipops/detailed_ip_type.h @@ -25,7 +25,7 @@ #ifndef _IPOPS_DETAILED_IP_TYPE_H #define _IPOPS_DETAILED_IP_TYPE_H -#define IPv4RANGES_SIZE 16 +#define IPv4RANGES_SIZE 17 #define IPv6RANGES_SIZE 29 #include <stdint.h>

1 0

git:5.1:ff5a879b: evrexec: use route_get() in modparam callback
by Daniel-Constantin Mierla 23 Mar '18

23 Mar '18

Module: kamailio Branch: 5.1 Commit: ff5a879bb52bd2537735b453d0d5655dc837dcc3 URL: https://github.com/kamailio/kamailio/commit/ff5a879bb52bd2537735b453d0d5655… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-23T08:49:32+01:00 evrexec: use route_get() in modparam callback - routing blocks might not have been parsed yet (cherry picked from commit d2479c96891db6656dbe880c6600d18f5fa38e33) --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ff5a879bb52bd2537735b453d0d5655… Patch: https://github.com/kamailio/kamailio/commit/ff5a879bb52bd2537735b453d0d5655… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index a91ab4d9f7..0fdd06923a 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -158,7 +158,12 @@ void evrexec_process(evrexec_task_t *it, int idx) if(it->wait>0) sleep_us(it->wait); keng = sr_kemi_eng_get(); if(keng==NULL) { - run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + if(it->rtid>=0 && event_rt.rlist[it->rtid]!=NULL) { + run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + } else { + LM_WARN("empty event route block [%.*s]\n", + it->ename.len, it->ename.s); + } } else { sidx.s = int2str(idx, &sidx.len); if(keng->froute(fmsg, EVENT_ROUTE, @@ -227,7 +232,7 @@ int evrexec_param(modparam_t type, void *val) tmp.ename.s[tmp.ename.len] = '\0'; keng = sr_kemi_eng_get(); if(keng==NULL) { - tmp.rtid = route_lookup(&event_rt, tmp.ename.s); + tmp.rtid = route_get(&event_rt, tmp.ename.s); if(tmp.rtid == -1) { LM_ERR("event route not found: %.*s\n", tmp.ename.len, tmp.ename.s); free_params(params_list);

1 0

git:master:b4fdeb01: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 23 Mar '18

23 Mar '18

Module: kamailio Branch: master Commit: b4fdeb01bd52427e9fa2cb8696b3b3631e871a79 URL: https://github.com/kamailio/kamailio/commit/b4fdeb01bd52427e9fa2cb8696b3b36… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-23T08:47:09+01:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/b4fdeb01bd52427e9fa2cb8696b3b36… Patch: https://github.com/kamailio/kamailio/commit/b4fdeb01bd52427e9fa2cb8696b3b36… --- diff --git a/src/modules/rr/README b/src/modules/rr/README index 9dd64a3a28..f1c00d6c12 100644 --- a/src/modules/rr/README +++ b/src/modules/rr/README @@ -169,8 +169,8 @@ Chapter 1. Admin Guide 3261 (see 12.1.1 UAS behavior). For this purpose, the modules offers the following functions: - * add_rr_param() - see Section 5.6, “add_rr_param(param)” - * check_route_param() - see Section 5.7, “check_route_param(re)” + * add_rr_param() - see ??? + * check_route_param() - see ??? Example 1.1. Dialog support in RR module ... @@ -496,9 +496,8 @@ record_route_advertised_address("1.2.3.4:5080"); Adds a parameter to the Record-Route URI (param must be in “;name=value” format. The function may be called also before or after - the record_route() or record_route_advertised_address() calls (see - Section 5.2, “record_route() and record_route(string)” or Section 5.5, - “record_route_advertised_address(address)”)). + the record_route() or record_route_advertised_address() calls (see ??? + or ???)). Meaning of the parameters is as follows: * param - String containing the URI parameter to be added. It must @@ -516,8 +515,7 @@ add_rr_param(";nat=yes"); The function checks if the URI parameters of the local Route header (corresponding to the local server) matches the given regular - expression. It must be call after loose_route() (see Section 5.1, - “loose_route()”). + expression. It must be call after loose_route() (see ???). Meaning of the parameters is as follows: * re - regular expression to check against the Route URI parameters. @@ -535,9 +533,8 @@ if (check_route_param("nat=yes")) { The function checks the flow direction of in-dialog requests. This function uses the “ftag” parameter from the Route header, therefore the - append_fromtag (see Section 4.2, “append_fromtag (integer)” module - parameter must be enabled. Also this must be called only after - loose_route() (see Section 5.1, “loose_route()”). + append_fromtag (see ??? module parameter must be enabled. Also this + must be called only after loose_route() (see ???). The function returns true if the “dir” is the same with the request's flow direction. @@ -679,9 +676,8 @@ record_route_advertised_address("1.2.3.4:5090"); The function checks the flow direction of the request “msg”. As for checking it's used the “ftag” Route header parameter, the - append_fromtag (see Section 4.2, “append_fromtag (integer)” module - parameter must be enables. Also this must be call only after the - loose_route is done. + append_fromtag (see ??? module parameter must be enables. Also this + must be call only after the loose_route is done. The function returns 0 if the “dir” is the same with the request's flow direction. Otherwise, -1 is returned.

1 0

git:master:d2479c96: evrexec: use route_get() in modparam callback
by Daniel-Constantin Mierla 23 Mar '18

23 Mar '18

Module: kamailio Branch: master Commit: d2479c96891db6656dbe880c6600d18f5fa38e33 URL: https://github.com/kamailio/kamailio/commit/d2479c96891db6656dbe880c6600d18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-23T08:34:34+01:00 evrexec: use route_get() in modparam callback - routing blocks might not have been parsed yet --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2479c96891db6656dbe880c6600d18… Patch: https://github.com/kamailio/kamailio/commit/d2479c96891db6656dbe880c6600d18… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index a91ab4d9f7..0fdd06923a 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -158,7 +158,12 @@ void evrexec_process(evrexec_task_t *it, int idx) if(it->wait>0) sleep_us(it->wait); keng = sr_kemi_eng_get(); if(keng==NULL) { - run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + if(it->rtid>=0 && event_rt.rlist[it->rtid]!=NULL) { + run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + } else { + LM_WARN("empty event route block [%.*s]\n", + it->ename.len, it->ename.s); + } } else { sidx.s = int2str(idx, &sidx.len); if(keng->froute(fmsg, EVENT_ROUTE, @@ -227,7 +232,7 @@ int evrexec_param(modparam_t type, void *val) tmp.ename.s[tmp.ename.len] = '\0'; keng = sr_kemi_eng_get(); if(keng==NULL) { - tmp.rtid = route_lookup(&event_rt, tmp.ename.s); + tmp.rtid = route_get(&event_rt, tmp.ename.s); if(tmp.rtid == -1) { LM_ERR("event route not found: %.*s\n", tmp.ename.len, tmp.ename.s); free_params(params_list);

1 0

git:master:7907cd15: rr: docs - added section ids
by Daniel-Constantin Mierla 23 Mar '18

23 Mar '18

Module: kamailio Branch: master Commit: 7907cd15b5aacef8990e50dc19055a4e9b8e4359 URL: https://github.com/kamailio/kamailio/commit/7907cd15b5aacef8990e50dc19055a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-23T08:34:34+01:00 rr: docs - added section ids --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7907cd15b5aacef8990e50dc19055a4… Patch: https://github.com/kamailio/kamailio/commit/7907cd15b5aacef8990e50dc19055a4…

1 0

git:master:de7e4a42: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 22 Mar '18

22 Mar '18

Module: kamailio Branch: master Commit: de7e4a423f37d094b941ae3f393448e7dacb5342 URL: https://github.com/kamailio/kamailio/commit/de7e4a423f37d094b941ae3f393448e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-22T08:47:02+01:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/de7e4a423f37d094b941ae3f393448e… Patch: https://github.com/kamailio/kamailio/commit/de7e4a423f37d094b941ae3f393448e…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018