sr-dev February 2014

sr-dev@lists.kamailio.org

38 participants
235 discussions

git:3.3: pkg/kamailio/deb: fix init script

by Victor Seva

Module: sip-router Branch: 3.3 Commit: b5ae856bcd8bb109d818b95633a7bebd114a35ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5ae856… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Feb 18 16:30:28 2014 +0100 pkg/kamailio/deb: fix init script (cherry picked from commit 424ab9dd4abd9b11b7cf4642335652145128fa7c) (cherry picked from commit 5f038ee927c40779296db080afab99ff3da47f05) --- pkg/kamailio/deb/debian/kamailio.init | 14 +++++--------- pkg/kamailio/deb/lenny/kamailio.init | 14 +++++--------- pkg/kamailio/deb/lucid/kamailio.init | 14 +++++--------- pkg/kamailio/deb/precise/kamailio.init | 14 +++++--------- pkg/kamailio/deb/squeeze/kamailio.init | 14 +++++--------- pkg/kamailio/deb/wheezy/kamailio.init | 14 +++++--------- 6 files changed, 30 insertions(+), 54 deletions(-) diff --git a/pkg/kamailio/deb/debian/kamailio.init b/pkg/kamailio/deb/debian/kamailio.init index e8c1765..7c08563 100644 --- a/pkg/kamailio/deb/debian/kamailio.init +++ b/pkg/kamailio/deb/debian/kamailio.init @@ -99,7 +99,7 @@ MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) if test "$DUMP_CORE" = "yes" ; then # set proper ulimit ulimit -c unlimited - + # directory for the core dump files # COREDIR=/home/corefiles # [ -d $COREDIR ] || mkdir $COREDIR @@ -138,18 +138,14 @@ case "$1" in check_kamailio_config create_radius_seqfile - log_daemon_msg "Restarting $DESC: $NAME" - start-stop-daemon --oknodo --stop --quiet --pidfile \ - $PIDFILE --exec $DAEMON + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - $PIDFILE --exec $DAEMON -- $OPTIONS - log_end_msg 0 + $0 start ;; status) log_daemon_msg "Status of $DESC: " - - status_of_porc "$PIDFILE" $NAME $NAME + + status_of_proc -p"$PIDFILE" $NAME $NAME ;; *) N=/etc/init.d/$NAME diff --git a/pkg/kamailio/deb/lenny/kamailio.init b/pkg/kamailio/deb/lenny/kamailio.init index e8c1765..7c08563 100644 --- a/pkg/kamailio/deb/lenny/kamailio.init +++ b/pkg/kamailio/deb/lenny/kamailio.init @@ -99,7 +99,7 @@ MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) if test "$DUMP_CORE" = "yes" ; then # set proper ulimit ulimit -c unlimited - + # directory for the core dump files # COREDIR=/home/corefiles # [ -d $COREDIR ] || mkdir $COREDIR @@ -138,18 +138,14 @@ case "$1" in check_kamailio_config create_radius_seqfile - log_daemon_msg "Restarting $DESC: $NAME" - start-stop-daemon --oknodo --stop --quiet --pidfile \ - $PIDFILE --exec $DAEMON + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - $PIDFILE --exec $DAEMON -- $OPTIONS - log_end_msg 0 + $0 start ;; status) log_daemon_msg "Status of $DESC: " - - status_of_porc "$PIDFILE" $NAME $NAME + + status_of_proc -p"$PIDFILE" $NAME $NAME ;; *) N=/etc/init.d/$NAME diff --git a/pkg/kamailio/deb/lucid/kamailio.init b/pkg/kamailio/deb/lucid/kamailio.init index e8c1765..7c08563 100644 --- a/pkg/kamailio/deb/lucid/kamailio.init +++ b/pkg/kamailio/deb/lucid/kamailio.init @@ -99,7 +99,7 @@ MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) if test "$DUMP_CORE" = "yes" ; then # set proper ulimit ulimit -c unlimited - + # directory for the core dump files # COREDIR=/home/corefiles # [ -d $COREDIR ] || mkdir $COREDIR @@ -138,18 +138,14 @@ case "$1" in check_kamailio_config create_radius_seqfile - log_daemon_msg "Restarting $DESC: $NAME" - start-stop-daemon --oknodo --stop --quiet --pidfile \ - $PIDFILE --exec $DAEMON + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - $PIDFILE --exec $DAEMON -- $OPTIONS - log_end_msg 0 + $0 start ;; status) log_daemon_msg "Status of $DESC: " - - status_of_porc "$PIDFILE" $NAME $NAME + + status_of_proc -p"$PIDFILE" $NAME $NAME ;; *) N=/etc/init.d/$NAME diff --git a/pkg/kamailio/deb/precise/kamailio.init b/pkg/kamailio/deb/precise/kamailio.init index e8c1765..7c08563 100644 --- a/pkg/kamailio/deb/precise/kamailio.init +++ b/pkg/kamailio/deb/precise/kamailio.init @@ -99,7 +99,7 @@ MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) if test "$DUMP_CORE" = "yes" ; then # set proper ulimit ulimit -c unlimited - + # directory for the core dump files # COREDIR=/home/corefiles # [ -d $COREDIR ] || mkdir $COREDIR @@ -138,18 +138,14 @@ case "$1" in check_kamailio_config create_radius_seqfile - log_daemon_msg "Restarting $DESC: $NAME" - start-stop-daemon --oknodo --stop --quiet --pidfile \ - $PIDFILE --exec $DAEMON + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - $PIDFILE --exec $DAEMON -- $OPTIONS - log_end_msg 0 + $0 start ;; status) log_daemon_msg "Status of $DESC: " - - status_of_porc "$PIDFILE" $NAME $NAME + + status_of_proc -p"$PIDFILE" $NAME $NAME ;; *) N=/etc/init.d/$NAME diff --git a/pkg/kamailio/deb/squeeze/kamailio.init b/pkg/kamailio/deb/squeeze/kamailio.init index e8c1765..7c08563 100644 --- a/pkg/kamailio/deb/squeeze/kamailio.init +++ b/pkg/kamailio/deb/squeeze/kamailio.init @@ -99,7 +99,7 @@ MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) if test "$DUMP_CORE" = "yes" ; then # set proper ulimit ulimit -c unlimited - + # directory for the core dump files # COREDIR=/home/corefiles # [ -d $COREDIR ] || mkdir $COREDIR @@ -138,18 +138,14 @@ case "$1" in check_kamailio_config create_radius_seqfile - log_daemon_msg "Restarting $DESC: $NAME" - start-stop-daemon --oknodo --stop --quiet --pidfile \ - $PIDFILE --exec $DAEMON + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - $PIDFILE --exec $DAEMON -- $OPTIONS - log_end_msg 0 + $0 start ;; status) log_daemon_msg "Status of $DESC: " - - status_of_porc "$PIDFILE" $NAME $NAME + + status_of_proc -p"$PIDFILE" $NAME $NAME ;; *) N=/etc/init.d/$NAME diff --git a/pkg/kamailio/deb/wheezy/kamailio.init b/pkg/kamailio/deb/wheezy/kamailio.init index e8c1765..7c08563 100644 --- a/pkg/kamailio/deb/wheezy/kamailio.init +++ b/pkg/kamailio/deb/wheezy/kamailio.init @@ -99,7 +99,7 @@ MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`)) if test "$DUMP_CORE" = "yes" ; then # set proper ulimit ulimit -c unlimited - + # directory for the core dump files # COREDIR=/home/corefiles # [ -d $COREDIR ] || mkdir $COREDIR @@ -138,18 +138,14 @@ case "$1" in check_kamailio_config create_radius_seqfile - log_daemon_msg "Restarting $DESC: $NAME" - start-stop-daemon --oknodo --stop --quiet --pidfile \ - $PIDFILE --exec $DAEMON + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - $PIDFILE --exec $DAEMON -- $OPTIONS - log_end_msg 0 + $0 start ;; status) log_daemon_msg "Status of $DESC: " - - status_of_porc "$PIDFILE" $NAME $NAME + + status_of_proc -p"$PIDFILE" $NAME $NAME ;; *) N=/etc/init.d/$NAME

10 years, 10 months

git:4.0: modules/utils: http_query fixes

by Juha Heinanen

Module: sip-router Branch: 4.0 Commit: e667cf0f35aab18ccd73f5bfe85857ddf3508ef8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e667cf0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Feb 19 01:37:21 2014 +0200 modules/utils: http_query fixes - Credits to Guillaume Bour. --- modules/utils/functions.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/utils/functions.c b/modules/utils/functions.c index aadfdd5..660050d 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -51,7 +51,7 @@ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream) /* Allocate memory and copy */ char* data; - data = (char*)malloc((size* nmemb) + 1); + data = (char*)pkg_malloc((size* nmemb) + 1); if (data == NULL) { LM_ERR("cannot allocate memory for stream\n"); return CURLE_WRITE_ERROR; @@ -76,7 +76,7 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst) CURLcode res; str value; char *url, *at; - char* stream; + char* stream = NULL; long stat; pv_spec_t *dst; pv_value_t val; @@ -112,10 +112,12 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst) res = curl_easy_perform(curl); pkg_free(url); - curl_easy_cleanup(curl); if (res != CURLE_OK) { LM_ERR("failed to perform curl\n"); + curl_easy_cleanup(curl); + if(stream) + pkg_free(stream); return -1; } @@ -131,11 +133,13 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst) } val.rs.s = stream; val.rs.len = at - stream; - LM_DBG("http)query result: %.*s\n", val.rs.len, val.rs.s); + LM_DBG("http_query result: %.*s\n", val.rs.len, val.rs.s); val.flags = PV_VAL_STR; dst = (pv_spec_t *)_dst; dst->setf(_m, &dst->pvp, (int)EQ_T, &val); } + curl_easy_cleanup(curl); + pkg_free(stream); return stat; }

10 years, 10 months

Kamailio 3.3.5: Possible memory leak in select framework?

by Pawel Kuzak

Hi, We are running Kamailio 3.3.5 as a Registrar service. We wanted to increase some logging, so we inserted the following lines into our configuration file: ... # log failed registration route[LOG_REG_DENIED]{ xlog("L_ERR","md=REGISTER, s=DENIED, n=$tU, ct=$sel(contact.uri.hostport), v=$sel(via[1].host)"); } # log successful registration route[LOG_REG_SUCCESS]{ xlog("L_ERR","md=REGISTER, s=OK, n=$tU, ct=$sel(contact.uri.hostport), v=$sel(via[1].host)"); } ... After about 24 hours Kamailio stopped working properly and the following ERROR messages started to appear in the log: ERROR: <core> [lvalue.c:389]: rval expression evaluation failed (141,18-141,57) ERROR: <core> [db_row.c:116]: no private memory left ERROR: db_mysql [km_row.c:58]: could not allocate row ERROR: db_mysql [km_res.c:188]: error while converting row #0 ERROR: db_mysql [km_res.c:217]: error while converting rows ERROR: db_mysql [km_dbase.c:191]: error while converting result ERROR: <core> [db_query.c:134]: error while storing result ERROR: p_usrloc [ul_db_query.c:108]: could not query table location. ERROR: p_usrloc [ul_db_query.c:52]: could not query table location error on id 12, db 1. ERROR: p_usrloc [ul_db.c:199]: error on id 12, db 1, errors occured: 1, threshold: 50 ERROR: <core> [db_row.c:116]: no private memory left ERROR: db_mysql [km_row.c:58]: could not allocate row ERROR: db_mysql [km_res.c:188]: error while converting row #0 ERROR: db_mysql [km_res.c:217]: error while converting rows ERROR: db_mysql [km_dbase.c:191]: error while converting result ERROR: <core> [db_query.c:134]: error while storing result ERROR: p_usrloc [ul_db_query.c:108]: could not query table location. ERROR: p_usrloc [ul_db_query.c:52]: could not query table location error on id 12, db 1. ERROR: <core> [db_row.c:116]: no private memory left ERROR: db_mysql [km_row.c:58]: could not allocate row ERROR: db_mysql [km_res.c:188]: error while converting row #0 ERROR: db_mysql [km_res.c:217]: error while converting rows ERROR: db_mysql [km_dbase.c:191]: error while converting result ERROR: <core> [db_query.c:134]: error while storing result ERROR: p_usrloc [ul_db_query.c:108]: could not query table location. ERROR: p_usrloc [ul_db_query.c:52]: could not query table location error on id 12, db 2. ERROR: p_usrloc [ul_db.c:199]: error on id 12, db 2, errors occured: 0, threshold: 50 ERROR: <core> [db_row.c:116]: no private memory left ERROR: db_mysql [km_row.c:58]: could not allocate row ERROR: db_mysql [km_res.c:188]: error while converting row #0 ERROR: db_mysql [km_res.c:217]: error while converting rows ERROR: db_mysql [km_dbase.c:191]: error while converting result ERROR: <core> [db_query.c:134]: error while storing result ERROR: p_usrloc [ul_db_query.c:108]: could not query table location. ERROR: p_usrloc [ul_db_query.c:52]: could not query table location error on id 12, db 2. ERROR: p_usrloc [udomain.c:433]: db_query failed ERROR: <core> [msg_translator.c:2089]: ERROR: build_res_buf_from_sip_req: out of memory ; needs 484 ERROR: sl [sl.c:270]: failed to reply stateful (tm) ERROR: registrar [reply.c:607]: failed to send 200 OK ERROR: <core> [msg_translator.c:2089]: ERROR: build_res_buf_from_sip_req: out of memory ; needs 530 ERROR: sl [sl_funcs.c:371]: ERROR: sl_reply_error used: I'm terribly sorry, server error occurred (1/SL) We strongly suppose that this memory issue is somehow caused by the above mentioned xlog-lines or the usage of the select framework inside those lines, because if we take out those lines, Kamailio is running smoothly (Currently running for 6 days now). May it be a possible memory leak in the select framework? Some statistics about our Registrar (Interval 24h): - Number of transactions: Average 500, Maximum 1000 - Number of accepted registrations: Average 7500, Maximum 14500 - Used Memory: Average 9MB, Maximum 15MB Regards, Paul

10 years, 10 months

git:master: rtpproxy-ng: increase the receive buffer size to 64k

by Richard Fuchs

Module: sip-router Branch: master Commit: e8f26d65d7229e048fc2f106919322660710e8d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8f26d6… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Mon Feb 17 13:30:21 2014 -0500 rtpproxy-ng: increase the receive buffer size to 64k --- modules/rtpproxy-ng/rtpproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy-ng/rtpproxy.c b/modules/rtpproxy-ng/rtpproxy.c index 1d23675..60f53ce 100644 --- a/modules/rtpproxy-ng/rtpproxy.c +++ b/modules/rtpproxy-ng/rtpproxy.c @@ -1468,7 +1468,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) struct sockaddr_un addr; int fd, len, i, vcnt; char *cp; - static char buf[4096]; + static char buf[0x10000]; struct pollfd fds[1]; struct iovec *v;

10 years, 10 months

msilo changes in 4.1.1?

by Peter Villeneuve

Hi, I've been experimenting with Msilo in Kamailio 4.1.1 and I noticed some things seem to be deprecated when looking at old configuration examples like the one here http://telephonynetworks.blogspot.pt/2012/08/configuracion-de-kamailio-33-c… It seems that #!ifdef WITH_MSILO is no longer supported. At least with me Kamailio doesn't start if I have that in kamailio.cfg. I have to explicitly load msilo.so and all the related module params without #!ifdef WITH_MSILO Can someone confirm that this syntax has indeed been deprecated so I don't spend any more time trying to adapt outdated configuration files to 4.1.1? Thanks

10 years, 10 months

Marketing stats

by Olle E. Johansson

Hi! After a year of working with Kamailio on social media we now have around 400 followers on Twitter, over 250 on Facebook, 220 on G+ and a mixture of groups on LInkedIn - from Openser to SIP-router and Kamailio with a pretty large following. G+ have a page with a news flow and a community group for discussions. I try to publish what's on the Kamailio.org web site as news. In addition, I highlight some features now and then to keep the flow going, regardless of the news flow in the project. We've also worked on and published an article on the IMS functionality on the web site. I think we should work on more of those articles/interviews - like talking about how carrierroute came to existance and how it's used, new modules like mohqueue and the whole webrtc support stuff. I hope to make some time for that kind of articles that I think adds interest and explains more of what we are doing and how Kamailio can be used. Hopefully we can discuss this at Kamailio World! If you have ideas, feel free to contact me on or off list. I think we can use the -doc list for these kind of discussions, it's a pretty empty forum right now. Please don't hesitate to remind me to inform about new functions, events or related stuff in these channels. If you can, inform your friends and followers about these channels to raise interest in Kamailio. We do get questions on these channels too, I have mostly referred to the mailing list, but if you can help in answering I would be happy. I have no stats on how many subscriptions we have on the mailing lists or visits on the web site, that would be interesting. (hint, hint ;-) ) Have a great weekend! /O G+ https://plus.google.com/u/0/b/114984922071338017631/ Facebook https://www.facebook.com/Kamailio Twitter @kamailioproject

10 years, 10 months

Fwd: [SR-Users] websocket.so module not generated

by Hugh Waite

Hello Devs, I was going to answer the question below on sr-users about the websocket module/package. With the exception of OpenSuse > v12, the websocket module is not built into any of the RPM distros on the kamailio download pages. Is this due to the libunistring build-dependancy? Can we update the spec file to make websockets available in as many distributions as possible? Regards, Hugh -------- Original Message -------- Subject: [SR-Users] websocket.so module not generated Date: Fri, 14 Feb 2014 22:36:42 +0100 From: Alvaro Urionabarrenetxea Gomez <alvurion(a)gmail.com> Reply-To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.sip-router.org> To: sr-users(a)lists.sip-router.org Hi. I have a problem when I'm trying to start with my Kamailio server. I have an error about not existing "websocket.so" module. Here is the error: root@kamailio:# /etc/init.d/kamailio start ** Not starting Kamailio SIP server: invalid configuration file!* *** ** 0 (8327) ERROR: <core> [sr_module.c:587]: load_module(): ERROR: load_module: could not find module <websocket> in </usr/local/lib/kamailio/modules/>* *0(8327) : <core> [cfg.y:3408]: yyerror_at(): parse_error in config file /usr/local/etc/kamailio/kamailio.cfg, line 318, column 12-25: failed to load module* *ERROR: bad config file (1 errors)* *** And here is the line 318 in kamailio.cfg: *loadmodule "websocket.so"* I looked for that module in the correspondent folder but isn't there. Can anyone upload the websocket.so file to another mirror, MEGA for example? I tried to generate another time, download another kamailio versions but the error stills there. Much apreciated. Thanks!

10 years, 10 months

git:master: modules/rtpproxy-ng: added setid_avp module param

by Juha Heinanen

Module: sip-router Branch: master Commit: e005b899b23c4d85a1b6072cc19ec6bc24d20c7a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e005b89… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Feb 16 10:56:24 2014 +0200 modules/rtpproxy-ng: added setid_avp module param which can be used (instead of set_rtp_proxy_set function) to select used rtpproxy set --- modules/rtpproxy-ng/README | 127 +++++++++++++++++----------- modules/rtpproxy-ng/doc/rtpproxy-ng.xml | 2 +- modules/rtpproxy-ng/doc/rtpproxy_admin.xml | 33 +++++++ modules/rtpproxy-ng/rtpproxy.c | 81 ++++++++++++++++++ 4 files changed, 191 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e00…

10 years, 10 months

git:4.1: modules/utils: fixed memory leak and possible crash

by Juha Heinanen

Module: sip-router Branch: 4.1 Commit: 01cee458a4f93f8fe13deac8ddf33ebb3f3afd85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01cee45… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Feb 15 04:16:14 2014 +0200 modules/utils: fixed memory leak and possible crash - patch against 4.0 was provided by Guillaume Bour (cherry picked from commit 92b947059dbde8ada3c757d7e6af48d79f9e7e12) --- modules/utils/functions.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/utils/functions.c b/modules/utils/functions.c index 1225ba8..ed1a591 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -52,7 +52,7 @@ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream) /* Allocate memory and copy */ char* data; - data = (char*)malloc((size* nmemb) + 1); + data = (char*)pkg_malloc((size* nmemb) + 1); if (data == NULL) { LM_ERR("cannot allocate memory for stream\n"); return CURLE_WRITE_ERROR; @@ -138,10 +138,12 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) if (_post) { pkg_free(post); } - curl_easy_cleanup(curl); if (res != CURLE_OK) { LM_ERR("failed to perform curl\n"); + curl_easy_cleanup(curl); + if(stream) + pkg_free(stream); return -1; } @@ -157,11 +159,13 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) } val.rs.s = stream; val.rs.len = at - stream; - LM_DBG("http)query result: %.*s\n", val.rs.len, val.rs.s); + LM_DBG("http_query result: %.*s\n", val.rs.len, val.rs.s); val.flags = PV_VAL_STR; dst = (pv_spec_t *)_dst; dst->setf(_m, &dst->pvp, (int)EQ_T, &val); } + curl_easy_cleanup(curl); + pkg_free(stream); return stat; }

10 years, 10 months

git:master: modules/utils: fixed memory leak and possible crash

by Juha Heinanen

Module: sip-router Branch: master Commit: 92b947059dbde8ada3c757d7e6af48d79f9e7e12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92b9470… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Feb 15 04:16:14 2014 +0200 modules/utils: fixed memory leak and possible crash - patch against 4.0 was provided by Guillaume Bour --- modules/utils/functions.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/utils/functions.c b/modules/utils/functions.c index 1225ba8..ed1a591 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -52,7 +52,7 @@ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream) /* Allocate memory and copy */ char* data; - data = (char*)malloc((size* nmemb) + 1); + data = (char*)pkg_malloc((size* nmemb) + 1); if (data == NULL) { LM_ERR("cannot allocate memory for stream\n"); return CURLE_WRITE_ERROR; @@ -138,10 +138,12 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) if (_post) { pkg_free(post); } - curl_easy_cleanup(curl); if (res != CURLE_OK) { LM_ERR("failed to perform curl\n"); + curl_easy_cleanup(curl); + if(stream) + pkg_free(stream); return -1; } @@ -157,11 +159,13 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) } val.rs.s = stream; val.rs.len = at - stream; - LM_DBG("http)query result: %.*s\n", val.rs.len, val.rs.s); + LM_DBG("http_query result: %.*s\n", val.rs.len, val.rs.s); val.flags = PV_VAL_STR; dst = (pv_spec_t *)_dst; dst->setf(_m, &dst->pvp, (int)EQ_T, &val); } + curl_easy_cleanup(curl); + pkg_free(stream); return stat; }

10 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2014