sr-dev July 2018

sr-dev@lists.kamailio.org

17 participants
229 discussions

[kamailio/kamailio] Module: rr adding is_direction to kemi (#1589)

by Surendra Tiwari

#### 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 is_direction("string") method added to kemi.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1589 -- Commit Summary -- * adding is_direction to kemi -- File Changes -- M src/modules/rr/rr_mod.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1589.patch https://github.com/kamailio/kamailio/pull/1589.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/1589

5 years, 10 months

[kamailio/kamailio] Modules: sdpops export sdp_get_line_startswith (#1558)

by Surendra Tiwari

#### 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 Exporting the sdp_get_line_startswith function to KSR You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1558 -- Commit Summary -- * Modules: sdpops export sdp_get_line_startswith -- File Changes -- M src/modules/sdpops/sdpops_mod.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1558.patch https://github.com/kamailio/kamailio/pull/1558.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/1558

5 years, 10 months

git:master:3806ca12: rr: exported is_direction() to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3806ca121194d54bbd03ff257ec62505b15d0941 URL: https://github.com/kamailio/kamailio/commit/3806ca121194d54bbd03ff257ec6250… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T18:01:48+02:00 rr: exported is_direction() to kemi framework - rework of the patch from GH #1589 --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3806ca121194d54bbd03ff257ec6250… Patch: https://github.com/kamailio/kamailio/commit/3806ca121194d54bbd03ff257ec6250… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index eac10d272b..36b1c046a8 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -418,6 +418,28 @@ static int w_is_direction(struct sip_msg *msg,char *dir, char *foo) return ((is_direction(msg,(int)(long)dir)==0)?1:-1); } +static int ki_is_direction(sip_msg_t *msg, str *dir) +{ + int n; + + if (!append_fromtag) { + LM_ERR("usage of \"is_direction\" function requires parameter" + "\"append_fromtag\" enabled!!"); + return E_CFG; + } + + if (dir->len==10 && strncasecmp(dir->s, "downstream", 10)==0) { + n = RR_FLOW_DOWNSTREAM; + } else if (dir->len==8 && strncasecmp(dir->s, "upstream", 8)==0) { + n = RR_FLOW_UPSTREAM; + } else { + LM_ERR("unknown direction '%.*s' - use 'downstream' or 'upstream'\n", + dir->len, dir->s); + return E_CFG; + } + + return ((is_direction(msg,n)==0)?1:-1); +} /* * Return the URI of the topmost Route-Header. @@ -720,7 +742,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("is_direction"), + SR_KEMIP_INT, ki_is_direction, + { SR_KEMIP_STR, 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 } } };

5 years, 10 months

git:master:ade1cad6: nathelper: safety check for sipping_from when building SIP keepalive request

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ade1cad69b659e5b0923e548d3c04f550204e793 URL: https://github.com/kamailio/kamailio/commit/ade1cad69b659e5b0923e548d3c04f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T15:25:56+02:00 nathelper: safety check for sipping_from when building SIP keepalive request - reported by GH #1587 --- Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/ade1cad69b659e5b0923e548d3c04f5… Patch: https://github.com/kamailio/kamailio/commit/ade1cad69b659e5b0923e548d3c04f5… --- diff --git a/src/modules/nathelper/sip_pinger.h b/src/modules/nathelper/sip_pinger.h index 4277b407e2..23ea633d03 100644 --- a/src/modules/nathelper/sip_pinger.h +++ b/src/modules/nathelper/sip_pinger.h @@ -127,6 +127,10 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, str vaddr; str vport; + if(sipping_from.s==NULL || sipping_from.len<=0) { + LM_WARN("SIP ping enabled but no SIP ping From address\n"); + return NULL; + } if(s->useinfo.name.len > 0) vaddr = s->useinfo.name; else @@ -206,4 +210,4 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, return buf; } -#endif \ No newline at end of file +#endif

5 years, 10 months

git:master:20ebfcf3: permissions: exported allow_source_address_group() to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 20ebfcf3156912d83c087156ec3e8eb15ae26c25 URL: https://github.com/kamailio/kamailio/commit/20ebfcf3156912d83c087156ec3e8eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-11T15:25:56+02:00 permissions: exported allow_source_address_group() to kemi framework --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/address.h Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/20ebfcf3156912d83c087156ec3e8eb… Patch: https://github.com/kamailio/kamailio/commit/20ebfcf3156912d83c087156ec3e8eb… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 42418b96f8..141806edf0 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -525,7 +525,7 @@ int w_allow_source_address(struct sip_msg* _msg, char* _addr_group, char* _str2) * subnet table in any group. If yes, returns that group. If not returns -1. * Port value 0 in cached address and group table matches any port. */ -int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2) +int ki_allow_source_address_group(sip_msg_t* _msg) { int group = -1; @@ -550,6 +550,16 @@ int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2) } +/* + * Checks if source address/port is found in cached address or + * subnet table in any group. If yes, returns that group. If not returns -1. + * Port value 0 in cached address and group table matches any port. + */ +int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2) +{ + return ki_allow_source_address_group(_msg); +} + /* * Checks if address/port is found in cached address or * subnet table in any group. If yes, returns that group. If not returns -1. diff --git a/src/modules/permissions/address.h b/src/modules/permissions/address.h index a4d12b8350..cc4652a0bc 100644 --- a/src/modules/permissions/address.h +++ b/src/modules/permissions/address.h @@ -88,6 +88,7 @@ int w_allow_source_address(struct sip_msg* _msg, char* _addr_group, char* _str2) */ int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2); +int ki_allow_source_address_group(sip_msg_t* _msg); /* * Checks if address/port is found in cached address or diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 707ccd315b..822aad5e91 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1036,6 +1036,11 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("permissions"), str_init("allow_source_address_group"), + SR_KEMIP_INT, ki_allow_source_address_group, + { 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 } } };

5 years, 10 months

[kamailio/kamailio] Modules: rr adding is_direction to kemi (#1588)

by Surendra Tiwari

#### 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 is_direction(string) method is imported to kemi app_lua. this method will help to identify the direction of subsequent request.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1588 -- Commit Summary -- * Modules: rr adding is_direction to kemi -- File Changes -- M src/modules/rr/rr_mod.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1588.patch https://github.com/kamailio/kamailio/pull/1588.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/1588

5 years, 10 months

git:5.1:933660b7: usrloc: fix RPC ul.add optional received param value when unset

by Victor Seva

Module: kamailio Branch: 5.1 Commit: 933660b707b6b31272a3ca93cba67e3c2798b708 URL: https://github.com/kamailio/kamailio/commit/933660b707b6b31272a3ca93cba67e3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-07-11T11:48:42+02:00 usrloc: fix RPC ul.add optional received param value when unset fix #1586 (cherry picked from commit 9ede3f273b4e478b875369da5b92ff963ee21573) --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/933660b707b6b31272a3ca93cba67e3… Patch: https://github.com/kamailio/kamailio/commit/933660b707b6b31272a3ca93cba67e3… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 1231d4fc8a..ead017a590 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -600,6 +600,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) str aor = {0, 0}; str contact = {0, 0}; str path = {0, 0}; + str received = {0, 0}; str socket = {0, 0}; str temp = {0, 0}; double dtemp; @@ -612,7 +613,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) memset(&ci, 0, sizeof(ucontact_info_t)); ret = rpc->scan(ctx, "SSSdfSddd*SS", &table, &aor, &contact, &ci.expires, - &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &ci.received, + &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &received, &socket); if (ret < 9) { LM_ERR("not enough parameters - read so far: %d\n", ret); @@ -626,9 +627,9 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } if(ret>9) { /* received parameter */ - if(!ul_rpc_is_param_set(&ci.received)) { - ci.received.s = 0; - ci.received.len = 0; + if(ul_rpc_is_param_set(&received)) { + ci.received.s = received.s; + ci.received.len = received.len; } } if(ret>10) {

5 years, 10 months

git:master:a9a1dfb7: modules: readme files regenerated - permissions ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a9a1dfb7bdfab175153d1d0778752e6096651fe0 URL: https://github.com/kamailio/kamailio/commit/a9a1dfb7bdfab175153d1d0778752e6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-11T11:46:41+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/a9a1dfb7bdfab175153d1d0778752e6… Patch: https://github.com/kamailio/kamailio/commit/a9a1dfb7bdfab175153d1d0778752e6… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 6e2e3b972d..8452d58fac 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -78,7 +78,7 @@ Emmanuel Schmidbauer 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, furi_pvar]) 5. RPC Commands @@ -183,7 +183,7 @@ Chapter 1. Admin Guide 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, furi_pvar]) 5. RPC Commands @@ -715,7 +715,7 @@ modparam("permissions", "load_backends", 1) 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_address_group(addr, port) - 4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) + 4.11. allow_trusted([src_ip_pvar, proto_pvar, furi_pvar]) 4.1. allow_routing() @@ -948,19 +948,24 @@ if ($var(group) != -1) { }; ... -4.11. allow_trusted([src_ip_pvar, proto_pvar, uri_pvar]) +4.11. allow_trusted([src_ip_pvar, proto_pvar, furi_pvar]) Checks based either on request's source address and transport protocol or source address and transport protocol given in pvar arguments, and - From URI of request (or uri_pvar if provided) if request can be trusted - without authentication. Returns “1” if a match is found as described in - Section 1.5, “Trusted Requests” and “-1” otherwise. If a match is found - and peer_tag_avp has been defined, adds a non-NULL tag column value of - the matching peer to AVP peer_tag_avp. + From URI of request (or furi_pvar if provided) if request can be + trusted without authentication. Returns “1” if a match is found as + described in Section 1.5, “Trusted Requests” and “-1” otherwise. If a + match is found and peer_tag_avp has been defined, adds a non-NULL tag + column value of the matching peer to AVP peer_tag_avp. - Source address, transport protocol and uri given in pvar arguments must - be in string format. Valid transport protocol values are (ignoring - case) "any", "udp, "tcp", "tls", "ws", "wss" and "sctp". + NOTE: source IP is matched using string comparison. Be careful if the + IP can have different forms, for a safer alternative for matching IP + addresses, look at allow_source_address or allow_address(). + + Source address, transport protocol and uri given in the arguments must + be in string format and they can contain script variables. Valid + transport protocol values are (ignoring case) "any", "udp, "tcp", + "tls", "ws", "wss" and "sctp". This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. @@ -968,11 +973,15 @@ if ($var(group) != -1) { ... if (allow_trusted()) { t_relay(); -}; +} ... if (allow_trusted("$si", "$proto")) { t_relay(); -}; +} +... +if (allow_trusted("$si", "any", "$ai")) { + t_relay(); +} ... 5. RPC Commands

5 years, 10 months

[kamailio/kamailio] usrloc: `received` optional parameter of RPC ul.add command has garbage if not set (#1586)

by Victor Seva

``` kamcmd> ul.add location 1002-test1 sip:1002-test1@192.168.89.82 0 -1.0 . 0 0 0 kamcmd> ul.lookup location 1002-test1 { AoR: 1002-test1 Contacts: { Contact: { Address: sip:1002-test1@192.168.89.82 Expires: permanent Q: -1.000000 Call-ID: dfjrewr12386fd6-343(a)kamailio.rpc CSeq: 1 User-Agent: kamailio SIP Router - RPC Server Received: if you get this string, you don'tcheck rpc_scan return code !!! (very bad) Path: [not set] State: CS_SYNC Flags: 0 CFlags: 0 Socket: [not set] Methods: 0 Ruid: ulcx-5b448e81-e67-5 Instance: [not set] Reg-Id: 0 Server-Id: 0 Tcpconn-Id: 0 Keepalive: 0 Last-Keepalive: 0 Last-Modified: 0 } } } kamcmd> ul.add location 1002-test1 sip:1002-test1@192.168.89.82 0 -1.0 . 0 0 0 . . kamcmd> ul.lookup location 1002-test1 { AoR: 1002-test1 Contacts: { Contact: { Address: sip:1002-test1@192.168.89.82 Expires: permanent Q: -1.000000 Call-ID: dfjrewr12386fd6-343(a)kamailio.rpc CSeq: 1 User-Agent: kamailio SIP Router - RPC Server Received: [not set] Path: [not set] State: CS_SYNC Flags: 0 CFlags: 0 Socket: [not set] Methods: 0 Ruid: ulcx-5b448e81-e67-5 Instance: [not set] Reg-Id: 0 Server-Id: 0 Tcpconn-Id: 0 Keepalive: 0 Last-Keepalive: 0 Last-Modified: 0 } } } ``` ``` version: kamailio 5.1.4 (x86_64/linux) 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, 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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.8.2 ``` -- 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/1586

5 years, 10 months

git:master:9ede3f27: usrloc: fix RPC ul.add optional received param value when unset

by Victor Seva

Module: kamailio Branch: master Commit: 9ede3f273b4e478b875369da5b92ff963ee21573 URL: https://github.com/kamailio/kamailio/commit/9ede3f273b4e478b875369da5b92ff9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-07-11T11:44:51+02:00 usrloc: fix RPC ul.add optional received param value when unset fix #1586 --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9ede3f273b4e478b875369da5b92ff9… Patch: https://github.com/kamailio/kamailio/commit/9ede3f273b4e478b875369da5b92ff9… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 1231d4fc8a..ead017a590 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -600,6 +600,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) str aor = {0, 0}; str contact = {0, 0}; str path = {0, 0}; + str received = {0, 0}; str socket = {0, 0}; str temp = {0, 0}; double dtemp; @@ -612,7 +613,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) memset(&ci, 0, sizeof(ucontact_info_t)); ret = rpc->scan(ctx, "SSSdfSddd*SS", &table, &aor, &contact, &ci.expires, - &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &ci.received, + &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &received, &socket); if (ret < 9) { LM_ERR("not enough parameters - read so far: %d\n", ret); @@ -626,9 +627,9 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } if(ret>9) { /* received parameter */ - if(!ul_rpc_is_param_set(&ci.received)) { - ci.received.s = 0; - ci.received.len = 0; + if(ul_rpc_is_param_set(&received)) { + ci.received.s = received.s; + ci.received.len = received.len; } } if(ret>10) {

5 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2018