sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

[kamailio/kamailio] janssonrpc-c: fix shared memory leak on notification requests (#843)

by Emmanuel Schmidbauer

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/843 -- Commit Summary -- * janssonrpc-c: fix shared memory leak on notification requests -- File Changes -- M modules/janssonrpc-c/janssonrpc_io.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/843.patch https://github.com/kamailio/kamailio/pull/843.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/843

8 years

git:master:90284a0f: ratelimit: close file pointer in case of scan error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 90284a0f43a6782d0241e1e48c0dcfc3b084ddeb URL: https://github.com/kamailio/kamailio/commit/90284a0f43a6782d0241e1e48c0dcfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T15:42:55+01:00 ratelimit: close file pointer in case of scan error --- Modified: modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/90284a0f43a6782d0241e1e48c0dcfc… Patch: https://github.com/kamailio/kamailio/commit/90284a0f43a6782d0241e1e48c0dcfc… --- diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index dc5748f..69fcd74 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -338,6 +338,7 @@ static int get_cpuload(double * load) if (fscanf(f, "cpu %lld%lld%lld%lld%lld%lld%lld%lld", &n_user, &n_nice, &n_sys, &n_idle, &n_iow, &n_irq, &n_sirq, &n_stl) < 0) { LM_ERR("could not parse load information\n"); + fclose(f); return -1; } fclose(f);

8 years

git:master:29c96974: mi_fifo: close reply stream in case of continuing due to no response

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 29c96974fe80b1f19200314231f961fbf2689673 URL: https://github.com/kamailio/kamailio/commit/29c96974fe80b1f19200314231f961f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T15:37:50+01:00 mi_fifo: close reply stream in case of continuing due to no response --- Modified: modules/mi_fifo/fifo_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/29c96974fe80b1f19200314231f961f… Patch: https://github.com/kamailio/kamailio/commit/29c96974fe80b1f19200314231f961f… --- diff --git a/modules/mi_fifo/fifo_fnc.c b/modules/mi_fifo/fifo_fnc.c index eaa6cb7..aa0df20 100644 --- a/modules/mi_fifo/fifo_fnc.c +++ b/modules/mi_fifo/fifo_fnc.c @@ -407,13 +407,17 @@ void mi_fifo_server(FILE *fifo_stream) int line_len; char *file_sep, *command, *file; struct mi_cmd *f; - FILE *reply_stream; + FILE *reply_stream = NULL; while(1) { /* update the local config framework structures */ cfg_update(); - reply_stream = NULL; + + if(reply_stream) { + fclose(reply_stream); + reply_stream = NULL; + } /* commands must look this way ':<command>:[filename]' */ if (mi_read_line(mi_buf,MAX_MI_FIFO_BUFFER,fifo_stream, &line_len)) { @@ -428,7 +432,7 @@ void mi_fifo_server(FILE *fifo_stream) line_len--; mi_buf[line_len]=0; } else break; - } + } if (line_len==0) { LM_DBG("fifo command empty\n"); @@ -525,6 +529,7 @@ void mi_fifo_server(FILE *fifo_stream) free_async_handler(hdl); /* close reply fifo */ fclose(reply_stream); + reply_stream = NULL; /* destroy request tree */ if (mi_cmd) free_mi_tree( mi_cmd ); @@ -542,9 +547,11 @@ void mi_fifo_server(FILE *fifo_stream) consume3: free_async_handler(hdl); - if (reply_stream) consume2: - fclose(reply_stream); + if (reply_stream) { + fclose(reply_stream); + reply_stream = NULL; + } consume1: mi_do_consume(); }

8 years

git:master:d6d15685: core: init structure to 0 for pass fd operations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d6d15685e170693048a92a535620117003fe882c URL: https://github.com/kamailio/kamailio/commit/d6d15685e170693048a92a535620117… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T15:26:53+01:00 core: init structure to 0 for pass fd operations --- Modified: pass_fd.c --- Diff: https://github.com/kamailio/kamailio/commit/d6d15685e170693048a92a535620117… Patch: https://github.com/kamailio/kamailio/commit/d6d15685e170693048a92a535620117…

8 years

git:master:46daf301: app_python: dname is always allocated in system memory

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 46daf3011d077e359274ff3322440d50625ce5e5 URL: https://github.com/kamailio/kamailio/commit/46daf3011d077e359274ff3322440d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T15:21:28+01:00 app_python: dname is always allocated in system memory - pointing it to static string will crash the free at shutdown --- Modified: modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/46daf3011d077e359274ff3322440d5… Patch: https://github.com/kamailio/kamailio/commit/46daf3011d077e359274ff3322440d5… --- diff --git a/modules/app_python/app_python_mod.c b/modules/app_python/app_python_mod.c index 02ff097..9fd6264 100644 --- a/modules/app_python/app_python_mod.c +++ b/modules/app_python/app_python_mod.c @@ -122,8 +122,20 @@ static int mod_init(void) } dname = strdup(dirname(dname_src)); - if (strlen(dname) == 0) - dname = "."; + if(dname==NULL) { + LM_ERR("no more system memory\n"); + return -1; + } + if (strlen(dname) == 0) { + free(dname); + dname = malloc(2); + if(dname==NULL) { + LM_ERR("no more system memory\n"); + return -1; + } + dname[0] = '.'; + dname[1] = '\0'; + } bname = strdup(basename(bname_src)); i = strlen(bname); if (bname[i - 1] == 'c' || bname[i - 1] == 'o')

8 years

git:master:e4d17429: dialog: secure space in case \r\n needs to be added after extra headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e4d17429ce0437fe9ba2ff7fe3e1ef7947b8f97e URL: https://github.com/kamailio/kamailio/commit/e4d17429ce0437fe9ba2ff7fe3e1ef7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T15:08:42+01:00 dialog: secure space in case \r\n needs to be added after extra headers --- Modified: modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/e4d17429ce0437fe9ba2ff7fe3e1ef7… Patch: https://github.com/kamailio/kamailio/commit/e4d17429ce0437fe9ba2ff7fe3e1ef7… --- diff --git a/modules/dialog/dlg_req_within.c b/modules/dialog/dlg_req_within.c index c2f9772..8293b85 100644 --- a/modules/dialog/dlg_req_within.c +++ b/modules/dialog/dlg_req_within.c @@ -329,7 +329,7 @@ static inline int build_extra_hdr(struct dlg_cell * cell, str *extra_hdrs, if(extra_hdrs && extra_hdrs->len>0) str_hdr->len += extra_hdrs->len; - blen = str_hdr->len + 1 /* '\0' */; + blen = str_hdr->len + 3 /* '\r\n\0' */; /* reserve space for callee headers in local requests */ if(dlg_lreq_callee_headers.len>0)

8 years

[kamailio/kamailio] Errors when parsing Diversion header with multiple comma-separated diversions (#841)

by Björn Bylander

Given a Diversion header like the following: ``` Diversion:"Foo Bar"<sip:+9876543211@127.0.0.101;user=phone>;privacy=off;answered-count=2;re ason=deflection;counter=1;answered,"_ somewhere"<sip:+9876543212@127.0.0.101;user=phone>;privacy=off;answered-coun t=1;reason=deflection;counter=1;answered ``` Kamailio 4.4.3 (and probably earlier versions) emit error messages complaining about the comma character. According to RFC 6044 multiple comma-separated diversions in a single Diversion-header is allowed. Full INVITE as an example: ``` INVITE sip:+1234567890@127.0.0.100:5060;user=phone;transport=tcp SIP/2.0 Via:SIP/2.0/TCP 127.0.0.101;branch=z9hG4bKBroadWorks.-1od4eg8-127.0.0.100V5060-0-82844591-13 54681939-1477634439005- From:<sip:+9876543210@127.0.0.101;user=phone>;tag=1354681939-1477634439005- To:<sip:+1234567890@127.0.0.100:5060;user=phone> Call-ID:BW0800390052810161562691307@127.0.0.101 CSeq:82844591 INVITE Contact:<sip:127.0.0.101:5060;transport=tcp> P-Asserted-Identity:<sip:+9876543210@127.0.0.101;user=phone> Privacy:none Diversion:"Foo Bar"<sip:+9876543211@127.0.0.101;user=phone>;privacy=off;answered-count=2;re ason=deflection;counter=1;answered,"_ somewhere"<sip:+9876543212@127.0.0.101;user=phone>;privacy=off;answered-coun t=1;reason=deflection;counter=1;answered Supported:100rel Allow:ACK,BYE,CANCEL,INFO,INVITE,OPTIONS,PRACK,REFER,NOTIFY,UPDATE X-BroadWorks-DNC:network-address="sip:+9876543210@127.0.0.101;user=phone" Accept:application/dtmf-relay,application/media_control+xml,application/sdp, application/x-broadworks-call-center+xml,multipart/mixed Max-Forwards:10 Content-Type:application/sdp Content-Disposition:session;handling=required Content-Length:267 v=0 o=BroadWorks 100442303 1 IN IP4 127.0.0.101 s=- c=IN IP4 127.0.0.102 t=0 0 m=audio 29778 RTP/AVP 8 0 18 101 a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:18 G729/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 a=sendrecv a=maxptime:20 ``` Example log messages: ``` Oct 28 08:00:39 kam1 /usr/sbin/kamailio[14935]: ERROR: <core> [parser/parse_addr_spec.c:488]: parse_to_param(): ERROR parse_to_param : invalid character ',' in status 21: <<;privacy=off;answered-count=2;reason=deflection;counter=1;answered>> Oct 28 08:00:39 kam1 /usr/sbin/kamailio[14935]: ERROR: <core> [parser/parse_addr_spec.c:254]: parse_to_param(): ERROR: parse_to_param :unexpected char ["] in status 21: <<;privacy=off;answered-count=2;reason=deflection;counter=1;answered,>> . Oct 28 08:00:39 kam1 /usr/sbin/kamailio[14935]: ERROR: <core> [parser/parse_addr_spec.c:906]: parse_addr_spec(): ERROR: parse_to: invalid To - unexpected end of header in state 21 Oct 28 08:00:39 kam1 /usr/sbin/kamailio[14935]: ERROR: <core> [parser/parse_diversion.c:69]: parse_diversion_header(): ERROR:parse_diversion_header: bad diversion header Oct 28 08:00:39 kam1 /usr/sbin/kamailio[14935]: ERROR: <core> [lvalue.c:345]: lval_pvar_assign(): non existing right pvar Oct 28 08:00:39 kam1 /usr/sbin/kamailio[14935]: ERROR: <core> [lvalue.c:405]: lval_assign(): assignment failed at pos: (562,21-562,35) ``` The code on line 562 is `$avp(div_user) = $(di{uri.user});`. kamailio -v: ```version: kamailio 4.4.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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.7.2``` uname -a: `Linux hostname 3.2.0-4-amd64 #1 SMP Debian 3.2.81-2 x86_64 GNU/Linux` -- 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/841

8 years

git:master:a311bfba: rtpengine: free addrinfo in case of unknown address family

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a311bfba4c03bc261403d8d06fcec1a396b4284d URL: https://github.com/kamailio/kamailio/commit/a311bfba4c03bc261403d8d06fcec1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T14:07:36+01:00 rtpengine: free addrinfo in case of unknown address family --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a311bfba4c03bc261403d8d06fcec1a… Patch: https://github.com/kamailio/kamailio/commit/a311bfba4c03bc261403d8d06fcec1a… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index afb9315..a3787eb 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -465,6 +465,7 @@ static int get_ip_type(char *str_addr) LM_DBG("%s is an ipv6 addinfos\n", str_addr); } else { LM_DBG("%s is an unknown addinfos format AF=%d\n",str_addr, info->ai_family); + freeaddrinfo(info); return -1; }

8 years

git:master:8084551c: statsd: one more increase for milliseconds buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8084551cee27f7eea3011a0379622009601e0366 URL: https://github.com/kamailio/kamailio/commit/8084551cee27f7eea3011a037962200… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T14:04:39+01:00 statsd: one more increase for milliseconds buffer --- Modified: modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/8084551cee27f7eea3011a037962200… Patch: https://github.com/kamailio/kamailio/commit/8084551cee27f7eea3011a037962200… --- diff --git a/modules/statsd/statsd.c b/modules/statsd/statsd.c index 1a68bea..250bbde 100644 --- a/modules/statsd/statsd.c +++ b/modules/statsd/statsd.c @@ -125,7 +125,7 @@ static int func_time_start(struct sip_msg *msg, char *key) static int func_time_end(struct sip_msg *msg, char *key) { - char unix_time[20]; + char unix_time[24]; char *endptr; long int start_time; int result;

8 years

git:master:f6f6c7f5: statsd: free srv variable in error handling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f6f6c7f55d5d1a60c1beb6091744116a6b85b397 URL: https://github.com/kamailio/kamailio/commit/f6f6c7f55d5d1a60c1beb6091744116… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T14:01:52+01:00 statsd: free srv variable in error handling --- Modified: modules/statsd/lib_statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/f6f6c7f55d5d1a60c1beb6091744116… Patch: https://github.com/kamailio/kamailio/commit/f6f6c7f55d5d1a60c1beb6091744116… --- diff --git a/modules/statsd/lib_statsd.c b/modules/statsd/lib_statsd.c index 878b452..926aa3e 100644 --- a/modules/statsd/lib_statsd.c +++ b/modules/statsd/lib_statsd.c @@ -19,7 +19,7 @@ static StatsConnection statsd_connection = { bool statsd_connect(void){ - struct addrinfo *serverAddr; + struct addrinfo *serverAddr = NULL; int rc; if (statsd_connection.sock > 0){ @@ -34,12 +34,14 @@ bool statsd_connect(void){ LM_ERR( "Statsd: could not initiate server information (%s)\n", gai_strerror(rc)); + if(serverAddr) freeaddrinfo(serverAddr); return false; } statsd_connection.sock = socket(serverAddr->ai_family, SOCK_DGRAM, IPPROTO_UDP); if (statsd_connection.sock < 0 ){ LM_ERR("Statsd: could not create a socket for statsd connection\n"); + if(serverAddr) freeaddrinfo(serverAddr); return false; }

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016