sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

git:master:1f195edf: core: mem/f_malloc - implemented mallocxz() and reallocxf()
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 1f195edf75e907fc6347d5646b724cede5733170 URL: https://github.com/kamailio/kamailio/commit/1f195edf75e907fc6347d5646b724ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T11:15:12+02:00 core: mem/f_malloc - implemented mallocxz() and reallocxf() --- Modified: src/core/mem/f_malloc.c Modified: src/core/mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/1f195edf75e907fc6347d5646b724ce… Patch: https://github.com/kamailio/kamailio/commit/1f195edf75e907fc6347d5646b724ce…

1 0

git:master:9ea86b94: core: mem - new functions for pkg/shm - mallocxz() and reallocxf()
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 9ea86b94b2e26b21f4e3041e6298fd475797ceb3 URL: https://github.com/kamailio/kamailio/commit/9ea86b94b2e26b21f4e3041e6298fd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T10:42:59+02:00 core: mem - new functions for pkg/shm - mallocxz() and reallocxf() - pkg_mallocxz(size) / shm_mallocxz(size) - same as the corresponding malloc function, but the allocated buffer is filled with 0. It is equivalent of { p=malloc(size); if(p) memset(p, 0, size); } - pkg_reallocxf(p, size)/shm_reallocxf(p, size) - same as the corresponding realloc functions, but the old pointer is always freed, even if the realloc operation fails. The BSDs have reallocf() --- Modified: src/core/mem/memapi.h Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/9ea86b94b2e26b21f4e3041e6298fd4… Patch: https://github.com/kamailio/kamailio/commit/9ea86b94b2e26b21f4e3041e6298fd4…

1 0

git:master:179a6e69: tm: terminate local uac buffers with 0
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 179a6e699a1021efa55d1ea097ceeb7a12575cc5 URL: https://github.com/kamailio/kamailio/commit/179a6e699a1021efa55d1ea097ceeb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T10:08:10+02:00 tm: terminate local uac buffers with 0 - received message buffer is terminated with 0 and many functions expect that, so use of them in event_route[tm:local-request] may have ended up in wrong behavior --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/179a6e699a1021efa55d1ea097ceeb7… Patch: https://github.com/kamailio/kamailio/commit/179a6e699a1021efa55d1ea097ceeb7… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index c4ab254076..feb7513bfd 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1633,6 +1633,8 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, assert(w-buf == *len); #endif + memapp(w, "\0", 1); + pkg_free(via.s); return buf;

1 0

git:master:453f45af: xmlrpc: handle realloc failure
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 453f45af78190dad79bdc4f787ba5a18ca7f6392 URL: https://github.com/kamailio/kamailio/commit/453f45af78190dad79bdc4f787ba5a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T09:52:09+02:00 xmlrpc: handle realloc failure --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/453f45af78190dad79bdc4f787ba5a1… Patch: https://github.com/kamailio/kamailio/commit/453f45af78190dad79bdc4f787ba5a1… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 61b73d0993..bac1567ed6 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -1841,6 +1841,7 @@ static int rpc_struct_printf(struct rpc_struct* s, char* member_name, { int n, buf_size; char* buf; + char* buf0; va_list ap; str st, name; struct xmlrpc_reply* reply; @@ -1890,11 +1891,12 @@ static int rpc_struct_printf(struct rpc_struct* s, char* member_name, } else { /* glibc 2.0 */ buf_size *= 2; /* twice the old size */ } - if ((buf = mxr_realloc(buf, buf_size)) == 0) { + if ((buf0 = mxr_realloc(buf, buf_size)) == 0) { set_fault(reply, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); goto err; } + buf = buf0; } return 0; err:

1 0

git:master:1d06db87: Merge pull request #1204 from dunst0/fix/app_sqlang
by GitHub 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 1d06db87f88841f4aa540b4f1554bed31da2ec25 URL: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-07T21:57:13+02:00 Merge pull request #1204 from dunst0/fix/app_sqlang app_sqlang: fix static make and gcc in Makefiles --- Modified: src/modules/app_sqlang/Makefile Modified: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Modified: src/modules/app_sqlang/squirrel/squirrel/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… Patch: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… --- diff --git a/src/modules/app_sqlang/Makefile b/src/modules/app_sqlang/Makefile index 9766b2d845..153f414884 100644 --- a/src/modules/app_sqlang/Makefile +++ b/src/modules/app_sqlang/Makefile @@ -20,11 +20,11 @@ endif include ../../Makefile.modules libsquirrel.a: - make -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" $(MKSQLANG) libsqstdlib.a: - make -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsqstdlib.a" $(MKSQLANG) app_sqlang.so: libsquirrel.a libsqstdlib.a diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile index 14c33948ea..cc1fbe94fb 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile +++ b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile @@ -27,16 +27,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o diff --git a/src/modules/app_sqlang/squirrel/squirrel/Makefile b/src/modules/app_sqlang/squirrel/squirrel/Makefile index ce9359d2e9..cda7d248a5 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/Makefile +++ b/src/modules/app_sqlang/squirrel/squirrel/Makefile @@ -36,16 +36,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o

1 0

git:master:d8ab359f: app_sqlang: fix static make and gcc in Makefiles
by Rick Barenthin 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: d8ab359faa67586abd118af8c067aa2671470a43 URL: https://github.com/kamailio/kamailio/commit/d8ab359faa67586abd118af8c067aa2… Author: Rick Barenthin <dunst0(a)gmail.com> Committer: Rick Barenthin <dunst0(a)gmail.com> Date: 2017-08-03T11:34:35+02:00 app_sqlang: fix static make and gcc in Makefiles - app_sqlang now uses $(MAKE) and $(CC) variables in Makefiles, so it builds on systems with gnu make named different then make and compiles with different compiler than gcc --- Modified: src/modules/app_sqlang/Makefile Modified: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Modified: src/modules/app_sqlang/squirrel/squirrel/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d8ab359faa67586abd118af8c067aa2… Patch: https://github.com/kamailio/kamailio/commit/d8ab359faa67586abd118af8c067aa2… --- diff --git a/src/modules/app_sqlang/Makefile b/src/modules/app_sqlang/Makefile index 9766b2d845..153f414884 100644 --- a/src/modules/app_sqlang/Makefile +++ b/src/modules/app_sqlang/Makefile @@ -20,11 +20,11 @@ endif include ../../Makefile.modules libsquirrel.a: - make -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" $(MKSQLANG) libsqstdlib.a: - make -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsqstdlib.a" $(MKSQLANG) app_sqlang.so: libsquirrel.a libsqstdlib.a diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile index 14c33948ea..cc1fbe94fb 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile +++ b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile @@ -27,16 +27,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o diff --git a/src/modules/app_sqlang/squirrel/squirrel/Makefile b/src/modules/app_sqlang/squirrel/squirrel/Makefile index ce9359d2e9..cda7d248a5 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/Makefile +++ b/src/modules/app_sqlang/squirrel/squirrel/Makefile @@ -36,16 +36,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o

1 0

git:master:25f21809: textops: Fix 'offset exceeds message size' crash.
by codyherzog 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 25f2180999dafb807068313c4a329a163dd99f92 URL: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… Author: codyherzog <cherzog(a)intouchhealth.com> Committer: codyherzog <cherzog(a)intouchhealth.com> Date: 2017-08-07T12:46:27-07:00 textops: Fix 'offset exceeds message size' crash. Ensure that buffer is null terminated when subst_run() function is used. --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… Patch: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 5048fbae5d..655f638154 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -682,12 +682,19 @@ static int subst_helper_f(sip_msg_t* msg, struct subst_expr* se) int off; int ret; int nmatches; + char c; begin=get_header(msg); /* start after first line to avoid replacing * the uri */ off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = msg->buf[msg->len]; + msg->buf[msg->len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + msg->buf[msg->len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s: replacing at offset %d [%.*s] with [%.*s]\n", @@ -826,6 +833,7 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) int ret; int nmatches; str body; + char c; body.s = get_body(msg); if (body.s==0) { @@ -842,7 +850,13 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = body.s[body.len]; + body.s[body.len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + body.s[body.len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s replacing at offset %d [%.*s] with [%.*s]\n",

1 0

git:master:8c428bfa: Merge pull request #1206 from codyherzog/master
by GitHub 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 8c428bfae9e51989734d3c1535bcac24581cfe15 URL: https://github.com/kamailio/kamailio/commit/8c428bfae9e51989734d3c1535bcac2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-07T21:56:15+02:00 Merge pull request #1206 from codyherzog/master textops: Fix 'offset exceeds message size' crash. --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8c428bfae9e51989734d3c1535bcac2… Patch: https://github.com/kamailio/kamailio/commit/8c428bfae9e51989734d3c1535bcac2… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 5048fbae5d..655f638154 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -682,12 +682,19 @@ static int subst_helper_f(sip_msg_t* msg, struct subst_expr* se) int off; int ret; int nmatches; + char c; begin=get_header(msg); /* start after first line to avoid replacing * the uri */ off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = msg->buf[msg->len]; + msg->buf[msg->len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + msg->buf[msg->len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s: replacing at offset %d [%.*s] with [%.*s]\n", @@ -826,6 +833,7 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) int ret; int nmatches; str body; + char c; body.s = get_body(msg); if (body.s==0) { @@ -842,7 +850,13 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = body.s[body.len]; + body.s[body.len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + body.s[body.len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s replacing at offset %d [%.*s] with [%.*s]\n",

1 0

[kamailio/kamailio] textops: Fix 'offset exceeds message size' crash. (#1206)
by codyherzog 07 Aug '17

07 Aug '17

Ensure that buffer is null terminated when subst_run() function is used. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1206 -- Commit Summary -- * textops: Fix 'offset exceeds message size' crash. -- File Changes -- M src/modules/textops/textops.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1206.patch https://github.com/kamailio/kamailio/pull/1206.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/1206

2 2

git:master:9ce38204: http_client: proper free for curl params in case of failover connection
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 9ce38204d8a59e5d83cc50a2c809d1306346f9b7 URL: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T14:54:00+02:00 http_client: proper free for curl params in case of failover connection --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… Patch: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 1bdae25df7..ca26998606 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -464,12 +464,15 @@ int curl_get_redirect(struct sip_msg* _m, const str *connection, str* result) /*! Run a query based on a connection definition */ -int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* url, str* result, const char *contenttype, const str* post, int failover) +int curl_con_query_url_f(struct sip_msg* _m, const str *connection, + const str* url, str* result, const char *contenttype, + const str* post, int failover) { curl_con_t *conn = NULL; curl_con_pkg_t *pconn = NULL; char *urlbuf = NULL; char *postdata = NULL; + char *failovercon = NULL; curl_query_t query_params; unsigned int maxdatasize = default_maxdatasize; @@ -495,7 +498,6 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u LM_DBG("******** CURL Connection found %.*s\n", connection->len, connection->s); maxdatasize = conn->maxdatasize; - if (url && (url->len > 0) && (url->s != NULL)) { int url_len = conn->schema.len + 3 + conn->url.len + 1 + url->len + 1; urlbuf = pkg_malloc(url_len); @@ -552,7 +554,10 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u query_params.oneline = 0; query_params.maxdatasize = maxdatasize; query_params.http_proxy_port = conn->http_proxy_port; - query_params.failovercon = conn->failover.s ? as_asciiz(&conn->failover) : NULL; + if(conn->failover.s) { + failovercon = as_asciiz(&conn->failover); + } + query_params.failovercon = failovercon; query_params.pconn = pconn; if (conn->http_proxy) { query_params.http_proxy = conn->http_proxy; @@ -567,14 +572,19 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u int counter = failover + 1; if (counter >= 2) { LM_DBG("**** No more failovers - returning failure\n"); - return (res - 1000); + res = (res - 1000); + goto error; } /* Time for failover */ - return curl_con_query_url_f(_m, &conn->failover, url, result, contenttype, post, counter); + res = curl_con_query_url_f(_m, &conn->failover, url, result, + contenttype, post, counter); } - LM_DBG("***** #### ***** CURL DONE : %s \n", urlbuf); + LM_DBG("***** #### ***** CURL DONE: %s (%d)\n", urlbuf, res); error: + if (failovercon != NULL) { + pkg_free(failovercon); + } if (urlbuf != NULL) { pkg_free(urlbuf); }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017