sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
298 discussions

git:master:5f2c2bb5: avpops: note that avp_copy() is reversing the order of the values
by Daniel-Constantin Mierla 12 Jul '16

12 Jul '16

Module: kamailio Branch: master Commit: 5f2c2bb5883a43cb01140b730aa126fc5d2f58d6 URL: https://github.com/kamailio/kamailio/commit/5f2c2bb5883a43cb01140b730aa126f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-12T17:51:53+02:00 avpops: note that avp_copy() is reversing the order of the values - reported by GH #706 --- Modified: modules/avpops/doc/avpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5f2c2bb5883a43cb01140b730aa126f… Patch: https://github.com/kamailio/kamailio/commit/5f2c2bb5883a43cb01140b730aa126f… --- diff --git a/modules/avpops/doc/avpops_admin.xml b/modules/avpops/doc/avpops_admin.xml index 81cdc37..f000480 100644 --- a/modules/avpops/doc/avpops_admin.xml +++ b/modules/avpops/doc/avpops_admin.xml @@ -826,8 +826,12 @@ avp_check("$xavp(op=>foo[*])","fm/$xavp(op=>fm[$var(id)])/g"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, - BRANCH_ROUTE, LOCAL_ROUTE and ONREPLY_ROUTE. + NOTE: if a list of AVPs is copied/moved (flag g|G), then the order + of the values is reversed. Copy/move twice in order to get the same + order as in original list. + </para> + <para> + This function can be used from ANY_ROUTE. </para> <example> <title><function>avp_copy</function> usage</title>

1 0

git:master:c4a57e29: dialog: parse all headers to check if cseq increment is needed
by Daniel-Constantin Mierla 12 Jul '16

12 Jul '16

Module: kamailio Branch: master Commit: c4a57e29883597869838f48d6a9f3a8a76a94240 URL: https://github.com/kamailio/kamailio/commit/c4a57e29883597869838f48d6a9f3a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-12T17:44:39+02:00 dialog: parse all headers to check if cseq increment is needed - jump over the full custom header when sending out --- Modified: modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/c4a57e29883597869838f48d6a9f3a8… Patch: https://github.com/kamailio/kamailio/commit/c4a57e29883597869838f48d6a9f3a8… --- diff --git a/modules/dialog/dlg_cseq.c b/modules/dialog/dlg_cseq.c index 72595a8..b14f67d 100644 --- a/modules/dialog/dlg_cseq.c +++ b/modules/dialog/dlg_cseq.c @@ -237,6 +237,7 @@ int dlg_cseq_msg_sent(void *data) /* check if transaction is marked for a new increment */ if(get_cseq(&msg)->method_id!=METHOD_ACK) { + parse_headers(&msg, HDR_EOH_F, 0); hfk = sr_hdr_get_z(&msg, "P-K-Auth-CSeq"); if(hfk!=NULL) { LM_DBG("uac auth request - cseq inc needed\n"); @@ -311,9 +312,9 @@ int dlg_cseq_msg_sent(void *data) tbuf_len += hfk->name.s - get_cseq(&msg)->number.s - get_cseq(&msg)->number.len; /* copy from after hfk to the end of sip message */ - memcpy(tbuf+tbuf_len, hfk->name.s + hfk->name.len, - msg.buf + msg.len - hfk->name.s - hfk->name.len); - tbuf_len += msg.buf + msg.len - hfk->name.s - hfk->name.len; + memcpy(tbuf+tbuf_len, hfk->name.s + hfk->len, + msg.buf + msg.len - hfk->name.s - hfk->len); + tbuf_len += msg.buf + msg.len - hfk->name.s - hfk->len; } else { /* copy from after cseq number to the end of sip message */ memcpy(tbuf+tbuf_len, get_cseq(&msg)->number.s+get_cseq(&msg)->number.len, @@ -350,9 +351,9 @@ int dlg_cseq_msg_sent(void *data) tbuf_len += hfk->name.s - via->branch->value.s - via->branch->value.len; /* copy from after hfk to the end of sip message */ - memcpy(tbuf+tbuf_len, hfk->name.s + hfk->name.len, - msg.buf + msg.len - hfk->name.s - hfk->name.len); - tbuf_len += msg.buf + msg.len - hfk->name.s - hfk->name.len; + memcpy(tbuf+tbuf_len, hfk->name.s + hfk->len, + msg.buf + msg.len - hfk->name.s - hfk->len); + tbuf_len += msg.buf + msg.len - hfk->name.s - hfk->len; } else { /* copy from after via to the end of sip message */ memcpy(tbuf+tbuf_len, via->branch->value.s + via->branch->value.len,

1 0

pseudo variable cache + app_lua = potential memory leak
by Timo Teras 12 Jul '16

12 Jul '16

Hi, I was recently debugging a memory leak in Kamailio running lua code. And it turned out to be rather nasty interaction with the PV cache and the Lua code. Technically, this is bug in Kamailio. However, we ended up fixing the lua code because the same bug also introduces security issues. The problem is that PV cache never releases cached items. Normally this is not a problem since in .cfg files you can only access PVs with fixed name. In cases where dynamic part is needed, like $sht() access based on variable, the expansion is done in the PV expression evaluation and the actual PV name is still static. However, app_lua exposes sr.pv.* where the PV name is a string. The lua application is free to construct it as it wishes. The case I had was using lua code to expand a variable, and then do sr.pv.get/sets on the expanded "$sht(table=>"..key..")" type expression. This resulted PV core leaking cached entry for each unique key. So I wonder if should limit the PV cache size, and e.g. make the bucket chain size limited (start releasing oldest cache entries when the bucket becomes full)? Or if this is not possible, e.g. due to memory allocation semantics, at least put big fat warning to the app_lua's sr.pv.* documentation on this. I ended up just fixing the application to set it first to "$var(tmp)" and then use that in the PV query. The security implication is noticeable if 'key' comes from untrusted source (e.g. SIP message) as then an attacker can inject string for PV expansion... Thanks, Timo

2 1

[kamailio/kamailio] To make work user-agent for http_client module you need to load utils module too (#705)
by Jurijs Ivolga 12 Jul '16

12 Jul '16

Hi, I found strange bug. When I load utils and http_client modules then user-agent are sent in http request using http_client module(http_connect funcion), but if I do not load utils module, then user-agent is not sent anymore. Thank you! --- 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/705

3 7

git:master:5f5795a8: modules: readme files regenerated - ipops ...
by Kamailio Dev 11 Jul '16

11 Jul '16

Module: kamailio Branch: master Commit: 5f5795a8637e4164c9ec57b5dfdd59395fe5aa9f URL: https://github.com/kamailio/kamailio/commit/5f5795a8637e4164c9ec57b5dfdd593… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-07-11T21:31:16+02:00 modules: readme files regenerated - ipops ... --- Modified: modules/ipops/README --- Diff: https://github.com/kamailio/kamailio/commit/5f5795a8637e4164c9ec57b5dfdd593… Patch: https://github.com/kamailio/kamailio/commit/5f5795a8637e4164c9ec57b5dfdd593… --- diff --git a/modules/ipops/README b/modules/ipops/README index 236771d..db800d8 100644 --- a/modules/ipops/README +++ b/modules/ipops/README @@ -35,7 +35,7 @@ Iñaki Baz Castillo 4.7. compare_ips (ip1, ip2) 4.8. compare_pure_ips (ip1, ip2) 4.9. is_ip_rfc1918 (ip) - 4.10. is_in_subnet (ip, subnet) + 4.10. is_in_subnet (ip, subnets_list) 4.11. dns_sys_match_ip(hostname, ipaddr) 4.12. dns_int_match_ip(hostname, ipaddr) 4.13. dns_query(hostname, pvid) @@ -80,7 +80,7 @@ Chapter 1. Admin Guide 4.7. compare_ips (ip1, ip2) 4.8. compare_pure_ips (ip1, ip2) 4.9. is_ip_rfc1918 (ip) - 4.10. is_in_subnet (ip, subnet) + 4.10. is_in_subnet (ip, subnets_list) 4.11. dns_sys_match_ip(hostname, ipaddr) 4.12. dns_int_match_ip(hostname, ipaddr) 4.13. dns_query(hostname, pvid) @@ -135,7 +135,7 @@ Chapter 1. Admin Guide 4.7. compare_ips (ip1, ip2) 4.8. compare_pure_ips (ip1, ip2) 4.9. is_ip_rfc1918 (ip) - 4.10. is_in_subnet (ip, subnet) + 4.10. is_in_subnet (ip, subnets_list) 4.11. dns_sys_match_ip(hostname, ipaddr) 4.12. dns_int_match_ip(hostname, ipaddr) 4.13. dns_query(hostname, pvid) @@ -326,15 +326,15 @@ if (is_ip_rfc1918("10.0.123.123")) { } ... -4.10. is_in_subnet (ip, subnet) +4.10. is_in_subnet (ip, subnets_list) Returns TRUE if the first argument is an IP address within the (CIDR - notation) subnet in the second argument. FALSE otherwise. + notation) subnets list in the second argument. FALSE otherwise. Parameters: * ip - string or pseudo-variable containing the ip to evaluate. * subnet - string or pseudo-variable containing the (CIDR notation) - subnet to evaluate. + subnets list to evaluate. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. @@ -345,6 +345,10 @@ if (is_in_subnet("10.0.123.123", "10.0.123.1/24")) { xlog("L_INFO", "it's in the subnet\n"); } ... +if (is_in_subnet("10.0.123.123", "10.0.0.0/16,192.168.0.0/24")) { + xlog("L_INFO", "it's in the subnets\n"); +} +... 4.11. dns_sys_match_ip(hostname, ipaddr)

1 0

git:master:7bfdbdfe: Merge pull request #704 from furmur/furmur
by GitHub 11 Jul '16

11 Jul '16

Module: kamailio Branch: master Commit: 7bfdbdfe0d9272733c173ff10a9fc043dada24a5 URL: https://github.com/kamailio/kamailio/commit/7bfdbdfe0d9272733c173ff10a9fc04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-11T21:23:31+02:00 Merge pull request #704 from furmur/furmur modules/ipops: fix subnet matching for mask /0 --- Modified: modules/ipops/doc/ipops_admin.xml Modified: modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7bfdbdfe0d9272733c173ff10a9fc04… Patch: https://github.com/kamailio/kamailio/commit/7bfdbdfe0d9272733c173ff10a9fc04…

1 0

git:master:b550a63e: modules/ipops: is_in_subnet(): add support for networks list
by murfur 11 Jul '16

11 Jul '16

Module: kamailio Branch: master Commit: b550a63e7d8dbaf9a8c284a450031f071fc57edf URL: https://github.com/kamailio/kamailio/commit/b550a63e7d8dbaf9a8c284a450031f0… Author: murfur <m.furmur(a)gmail.com> Committer: murfur <m.furmur(a)gmail.com> Date: 2016-07-11T14:08:28+03:00 modules/ipops: is_in_subnet(): add support for networks list --- Modified: modules/ipops/doc/ipops_admin.xml Modified: modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b550a63e7d8dbaf9a8c284a450031f0… Patch: https://github.com/kamailio/kamailio/commit/b550a63e7d8dbaf9a8c284a450031f0…

1 0

git:master:2c26f8b5: modules/ipops: fix subnet matching for mask /0
by murfur 11 Jul '16

11 Jul '16

Module: kamailio Branch: master Commit: 2c26f8b574e1b8adb0e4fa5a6db7a54ab455ee21 URL: https://github.com/kamailio/kamailio/commit/2c26f8b574e1b8adb0e4fa5a6db7a54… Author: murfur <m.furmur(a)gmail.com> Committer: murfur <m.furmur(a)gmail.com> Date: 2016-07-11T13:24:21+03:00 modules/ipops: fix subnet matching for mask /0 --- Modified: modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2c26f8b574e1b8adb0e4fa5a6db7a54… Patch: https://github.com/kamailio/kamailio/commit/2c26f8b574e1b8adb0e4fa5a6db7a54… --- diff --git a/modules/ipops/ipops_mod.c b/modules/ipops/ipops_mod.c index 916a713..2f1c716 100644 --- a/modules/ipops/ipops_mod.c +++ b/modules/ipops/ipops_mod.c @@ -535,7 +535,7 @@ static int w_ip_is_in_subnet(struct sip_msg* _msg, char* _s1, char* _s2) str string1, string2; enum enum_ip_type ip1_type, ip2_type; char *cidr_pos = NULL; - int netmask = 0; + int netmask = -1; if (_s1 == NULL || _s2 == NULL ) { LM_ERR("bad parameters\n"); @@ -586,7 +586,7 @@ static int w_ip_is_in_subnet(struct sip_msg* _msg, char* _s1, char* _s2) break; } - if (netmask == 0) + if (netmask == -1) { if (_compare_ips(string1.s, string1.len, ip1_type, string2.s, string2.len, ip2_type)) return 1;

1 0

git:4.4:1a5e8321: rtpproxy: init rtpproxy sockets array after allocation
by Daniel-Constantin Mierla 11 Jul '16

11 Jul '16

Module: kamailio Branch: 4.4 Commit: 1a5e83216e8699cab3680ff321a62a9be7c3c85f URL: https://github.com/kamailio/kamailio/commit/1a5e83216e8699cab3680ff321a62a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-11T18:01:40+02:00 rtpproxy: init rtpproxy sockets array after allocation - do not init sockets for PROC_MAIN (for for=yes) and PROC_INIT to avoid duplicating sockets with child processed (cherry picked from commit 0fbac693b4d3ed913b64c2d000f27a96903b7e09) --- Modified: modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/1a5e83216e8699cab3680ff321a62a9… Patch: https://github.com/kamailio/kamailio/commit/1a5e83216e8699cab3680ff321a62a9… --- diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index bb644de..80be249 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -1007,6 +1007,10 @@ child_init(int rank) if(rtpp_set_list==NULL ) return 0; + if(rank==PROC_INIT || (rank==PROC_MAIN && dont_fork==0)) { + return 0; + } + /* Iterate known RTP proxies - create sockets */ mypid = getpid(); @@ -1015,6 +1019,7 @@ child_init(int rank) LM_ERR("no more pkg memory\n"); return -1; } + memset(rtpp_socks, -1, sizeof(int)*rtpp_no); for(rtpp_list = rtpp_set_list->rset_first; rtpp_list != 0; rtpp_list = rtpp_list->rset_next){

1 0

git:4.4:9aae641c: rtpengine: init rtp engine sockets array after allocation
by Daniel-Constantin Mierla 11 Jul '16

11 Jul '16

Module: kamailio Branch: 4.4 Commit: 9aae641cd6e9fcb28d1f4a7b1c9bb8be1adcf7ef URL: https://github.com/kamailio/kamailio/commit/9aae641cd6e9fcb28d1f4a7b1c9bb8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-11T18:01:28+02:00 rtpengine: init rtp engine sockets array after allocation - it can result in closing the random values found in memory, which can overlap with valid sockets, due to follow up execution of build_rtpp_socks() - do not init sockets for PROC_MAIN (for for=yes) and PROC_INIT to avoid duplicating sockets with child processed (cherry picked from commit d76761bf95a5745240d655ee63241b8d4652611d) --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9aae641cd6e9fcb28d1f4a7b1c9bb8b… Patch: https://github.com/kamailio/kamailio/commit/9aae641cd6e9fcb28d1f4a7b1c9bb8b… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 5fe83b0..afb9315 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -1809,6 +1809,7 @@ static int build_rtpp_socks(unsigned int current_rtpp_no) { for (i = 0; i < rtpp_socks_size; i++) { if (rtpp_socks[i] >= 0) { close(rtpp_socks[i]); + rtpp_socks[i] = -1; } } @@ -1818,6 +1819,7 @@ static int build_rtpp_socks(unsigned int current_rtpp_no) { LM_ERR("no more pkg memory for rtpp_socks\n"); return -1; } + memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); lock_get(rtpp_set_list->rset_head_lock); for (rtpp_list = rtpp_set_list->rset_first; rtpp_list != 0; @@ -1911,6 +1913,11 @@ child_init(int rank) if(!rtpp_set_list) return 0; + /* do not init sockets for PROC_INIT and main process when fork=yes */ + if(rank==PROC_INIT || (rank==PROC_MAIN && dont_fork==0)) { + return 0; + } + mypid = getpid(); lock_get(rtpp_no_lock); @@ -1921,6 +1928,7 @@ child_init(int rank) if (!rtpp_socks) { return -1; } + memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); // vector of pointers to queried nodes queried_nodes_ptr = (struct rtpp_node**)pkg_malloc(queried_nodes_limit * sizeof(struct rtpp_node*));

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016