sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

git:master:7a23fd2c: http_client Fix typo
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 7a23fd2c9ec66332097b639d4bedde52731e2bae URL: https://github.com/kamailio/kamailio/commit/7a23fd2c9ec66332097b639d4bedde5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T19:56:36+02:00 http_client Fix typo ...and compile before commit... --- Modified: modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/7a23fd2c9ec66332097b639d4bedde5… Patch: https://github.com/kamailio/kamailio/commit/7a23fd2c9ec66332097b639d4bedde5… --- diff --git a/modules/http_client/curlcon.c b/modules/http_client/curlcon.c index a4a0aef..b0eafb4 100644 --- a/modules/http_client/curlcon.c +++ b/modules/http_client/curlcon.c @@ -186,6 +186,7 @@ int curl_parse_param(char *val) unsigned int verify_peer = default_tls_verify_peer; unsigned int verify_host = default_tls_verify_host; unsigned int tlsversion = default_tls_version; + unsigned int authmethod = default_authmethod; str in; char *p; @@ -434,6 +435,7 @@ int curl_parse_param(char *val) cc->username = username.s ? as_asciiz(&username) : NULL; cc->password = password.s ? as_asciiz(&password) : NULL; cc->schema = schema; + cc->authmethod = authmethod; cc->failover = failover; cc->useragent = as_asciiz(&useragent); cc->url = url; @@ -455,8 +457,8 @@ int curl_parse_param(char *val) LM_DBG("cname: [%.*s] url: [%.*s] username [%s] password [%s] failover [%.*s] timeout [%d] useragent [%s] maxdatasize [%d]\n", cc->name.len, cc->name.s, cc->url.len, cc->url.s, cc->username ? cc->username : "", cc->password ? cc->password : "", cc->failover.len, cc->failover.s, cc->timeout, cc->useragent, cc->maxdatasize); - LM_DBG("cname: [%.*s] client_cert [%s] client_key [%s] ciphersuites [%s] tlsversion [%d] verify_peer [%d] verify_host [%d]\n", - cc->name.len, cc->name.s, cc->clientcert, cc->clientkey, cc->ciphersuites, cc->tlsversion, cc->verify_peer, cc->verify_host); + LM_DBG("cname: [%.*s] client_cert [%s] client_key [%s] ciphersuites [%s] tlsversion [%d] verify_peer [%d] verify_host [%d] authmethod [%d]\n", + cc->name.len, cc->name.s, cc->clientcert, cc->clientkey, cc->ciphersuites, cc->tlsversion, cc->verify_peer, cc->verify_host, cc->authmethod); if (cc->http_proxy_port > 0) { LM_DBG("cname: [%.*s] http_proxy [%s] http_proxy_port [%d]\n", cc->name.len, cc->name.s, cc->http_proxy, cc->http_proxy_port);

1 0

git:master:3d0898a7: http_client Adding default value of authmetod to README
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 3d0898a713e956568551186391fbe1c9e7eb8ac6 URL: https://github.com/kamailio/kamailio/commit/3d0898a713e956568551186391fbe1c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T19:49:50+02:00 http_client Adding default value of authmetod to README --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d0898a713e956568551186391fbe1c… Patch: https://github.com/kamailio/kamailio/commit/3d0898a713e956568551186391fbe1c… --- diff --git a/modules/http_client/README b/modules/http_client/README index dd34360..2387c25 100644 --- a/modules/http_client/README +++ b/modules/http_client/README @@ -416,6 +416,8 @@ modparam("http_client", "tlsversion", 6) * 8 - NTLM authentication * 16 - HTTP Digest with IE flavour + Default value is 3 - BASIC and Digest authentication. + This is also configurable per connection in the http_client configuration file. diff --git a/modules/http_client/doc/http_client_admin.xml b/modules/http_client/doc/http_client_admin.xml index 30b4b9e..6e32845 100644 --- a/modules/http_client/doc/http_client_admin.xml +++ b/modules/http_client/doc/http_client_admin.xml @@ -384,6 +384,7 @@ modparam("http_client", "tlsversion", 6) <listitem><para>8 - NTLM authentication</para></listitem> <listitem><para>16 - HTTP Digest with IE flavour</para></listitem> </itemizedlist> + Default value is 3 - BASIC and Digest authentication. </para> <para> This is also configurable per connection in the http_client configuration file.

1 0

git:master:3019a561: http_client Update README with new options (authmethod, httpproxy, httpproxyport)
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 3019a5618bdcc1fa2442c143133278d0988db797 URL: https://github.com/kamailio/kamailio/commit/3019a5618bdcc1fa2442c143133278d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T19:18:09+02:00 http_client Update README with new options (authmethod, httpproxy, httpproxyport) --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3019a5618bdcc1fa2442c143133278d… Patch: https://github.com/kamailio/kamailio/commit/3019a5618bdcc1fa2442c143133278d…

1 0

git:master:4bf3a517: http_client Add configurable authentication methods
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 4bf3a517991b374308b033b85c82058c37e4e90a URL: https://github.com/kamailio/kamailio/commit/4bf3a517991b374308b033b85c82058… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T19:09:21+02:00 http_client Add configurable authentication methods Attempt to fix issue #515 --- Modified: modules/http_client/README Modified: modules/http_client/curlcon.c Modified: modules/http_client/doc/http_client_admin.xml Modified: modules/http_client/functions.c Modified: modules/http_client/http_client.c Modified: modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/4bf3a517991b374308b033b85c82058… Patch: https://github.com/kamailio/kamailio/commit/4bf3a517991b374308b033b85c82058…

1 0

git:4.4:24d31da6: core: mem - updated defines to pkg mod stats
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: 4.4 Commit: 24d31da6fea5f177a43b492853362d56e9298ef6 URL: https://github.com/kamailio/kamailio/commit/24d31da6fea5f177a43b492853362d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T14:39:39+02:00 core: mem - updated defines to pkg mod stats (cherry picked from commit 69f9328ddd959a70de8b94152704326dcca6a8cc) --- Modified: mem/pkg.h --- Diff: https://github.com/kamailio/kamailio/commit/24d31da6fea5f177a43b492853362d5… Patch: https://github.com/kamailio/kamailio/commit/24d31da6fea5f177a43b492853362d5… --- diff --git a/mem/pkg.h b/mem/pkg.h index eb07bd2..c107117 100644 --- a/mem/pkg.h +++ b/mem/pkg.h @@ -48,8 +48,8 @@ void pkg_print_manager(void); # define pkg_info(mi) _pkg_root.xinfo(_pkg_root.mem_block, mi) # define pkg_available() _pkg_root.xavailable(_pkg_root.mem_block) # define pkg_sums() _pkg_root.xsums(_pkg_root.mem_block) -# define pkg_mod_get_stats(x) _pkg_root.xstats(_pkg_root.mem_block, x) -# define pkg_mod_free_stats(x) _pkg_root.xfstats(x) +# define pkg_mod_get_stats(x) _pkg_root.xmodstats(_pkg_root.mem_block, x) +# define pkg_mod_free_stats(x) _pkg_root.xfmodstats(x) #else /*PKG_MALLOC*/ /* use system allocator */

1 0

git:master:69f9328d: core: mem - updated defines to pkg mod stats
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 69f9328ddd959a70de8b94152704326dcca6a8cc URL: https://github.com/kamailio/kamailio/commit/69f9328ddd959a70de8b94152704326… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-28T14:39:02+02:00 core: mem - updated defines to pkg mod stats --- Modified: mem/pkg.h --- Diff: https://github.com/kamailio/kamailio/commit/69f9328ddd959a70de8b94152704326… Patch: https://github.com/kamailio/kamailio/commit/69f9328ddd959a70de8b94152704326… --- diff --git a/mem/pkg.h b/mem/pkg.h index eb07bd2..c107117 100644 --- a/mem/pkg.h +++ b/mem/pkg.h @@ -48,8 +48,8 @@ void pkg_print_manager(void); # define pkg_info(mi) _pkg_root.xinfo(_pkg_root.mem_block, mi) # define pkg_available() _pkg_root.xavailable(_pkg_root.mem_block) # define pkg_sums() _pkg_root.xsums(_pkg_root.mem_block) -# define pkg_mod_get_stats(x) _pkg_root.xstats(_pkg_root.mem_block, x) -# define pkg_mod_free_stats(x) _pkg_root.xfstats(x) +# define pkg_mod_get_stats(x) _pkg_root.xmodstats(_pkg_root.mem_block, x) +# define pkg_mod_free_stats(x) _pkg_root.xfmodstats(x) #else /*PKG_MALLOC*/ /* use system allocator */

1 0

git:master:83458239: modules/ims_charging: fix for incorrectly adding duplicate host and realm AVP
by Richard Good 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 83458239f17a626518f449e32496ff707e4c6da9 URL: https://github.com/kamailio/kamailio/commit/83458239f17a626518f449e32496ff7… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-03-28T12:24:12+02:00 modules/ims_charging: fix for incorrectly adding duplicate host and realm AVP --- Modified: modules/ims_charging/Ro_data.c Modified: modules/ims_charging/ccr.c Modified: modules/ims_charging/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/83458239f17a626518f449e32496ff7… Patch: https://github.com/kamailio/kamailio/commit/83458239f17a626518f449e32496ff7… --- diff --git a/modules/ims_charging/Ro_data.c b/modules/ims_charging/Ro_data.c index 801a358..63a1f5d 100644 --- a/modules/ims_charging/Ro_data.c +++ b/modules/ims_charging/Ro_data.c @@ -180,9 +180,15 @@ Ro_CCR_t * new_Ro_CCR(int32_t acc_record_type, str * user_name, ims_information_ mem_new(x, sizeof (Ro_CCR_t), pkg); - str_dup(x->origin_host, cfg.origin_host, pkg); - str_dup(x->origin_realm, cfg.origin_realm, pkg); - str_dup(x->destination_realm, cfg.destination_realm, pkg); + if (cfg.origin_host.s && cfg.origin_host.len > 0) + str_dup(x->origin_host, cfg.origin_host, pkg); + + if (cfg.origin_realm.s && cfg.origin_realm.len >0) + str_dup(x->origin_realm, cfg.origin_realm, pkg); + + if (cfg.destination_realm.s && cfg.destination_realm.len > 0) + str_dup(x->destination_realm, cfg.destination_realm, pkg); + x->acct_record_type = acc_record_type; if (user_name) { diff --git a/modules/ims_charging/ccr.c b/modules/ims_charging/ccr.c index 99ab727..a2fa489 100644 --- a/modules/ims_charging/ccr.c +++ b/modules/ims_charging/ccr.c @@ -208,10 +208,18 @@ AAAMessage * Ro_write_CCR_avps(AAAMessage * ccr, Ro_CCR_t* x) { if (!ccr) return 0; - if (!cdp_avp->base.add_Origin_Host(&(ccr->avpList), x->origin_host, 0)) goto error; - if (!cdp_avp->base.add_Origin_Realm(&(ccr->avpList), x->origin_realm, 0)) goto error; - if (!ro_add_destination_realm_avp(ccr, x->destination_realm)) goto error; - + if (x->origin_host.s && x->origin_host.len > 0) { + if (!cdp_avp->base.add_Origin_Host(&(ccr->avpList), x->origin_host, 0)) goto error; + } + + if (x->origin_realm.s && x->origin_realm.len > 0) { + if (!cdp_avp->base.add_Origin_Realm(&(ccr->avpList), x->origin_realm, 0)) goto error; + } + + if (x->destination_realm.s && x->destination_realm.len > 0) { + if (!ro_add_destination_realm_avp(ccr, x->destination_realm)) goto error; + } + if (!cdp_avp->base.add_Accounting_Record_Type(&(ccr->avpList), x->acct_record_type)) goto error; if (!cdp_avp->base.add_Accounting_Record_Number(&(ccr->avpList), x->acct_record_number)) goto error; diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index ecc6d4b..34035d8 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -55,9 +55,9 @@ int ro_db_mode = DB_MODE_NONE; char *domain = "location"; -client_ro_cfg cfg = { str_init("scscf.ims.smilecoms.com"), - str_init("ims.smilecoms.com"), - str_init("ims.smilecoms.com"), +client_ro_cfg cfg = { str_init(""), + str_init(""), + str_init(""), 0 }; @@ -67,8 +67,6 @@ struct dlg_binds dlgb; cdp_avp_bind_t *cdp_avp; struct tm_binds tmb; -char* rx_dest_realm_s = "ims.smilecoms.com"; -str rx_dest_realm; /* Only used if we want to force the Ro peer usually this is configured at a stack level and the first request uses realm routing */ //char* rx_forced_peer_s = ""; str ro_forced_peer;

1 0

git:master:e3f788ea: http_client Improve curl error handling
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: e3f788ea94c52e09a9b1f0b2e3242fe4991df3b0 URL: https://github.com/kamailio/kamailio/commit/e3f788ea94c52e09a9b1f0b2e3242fe… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T12:21:23+02:00 http_client Improve curl error handling --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/e3f788ea94c52e09a9b1f0b2e3242fe… Patch: https://github.com/kamailio/kamailio/commit/e3f788ea94c52e09a9b1f0b2e3242fe… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 15a91f3..7e26844 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -221,9 +221,33 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const if (res == CURLE_COULDNT_CONNECT) { LM_WARN("failed to connect() to host\n"); } else if ( res == CURLE_COULDNT_RESOLVE_HOST ) { - LM_WARN("couldn't resolve host\n"); + LM_WARN("Couldn't resolve host\n"); } else if ( res == CURLE_COULDNT_RESOLVE_PROXY ) { - LM_WARN("couldn't resolve http_proxy host\n"); + LM_WARN("Couldn't resolve http_proxy host\n"); + } else if ( res == CURLE_UNSUPPORTED_PROTOCOL ) { + LM_WARN("URL Schema not supported by curl\n"); + } else if ( res == CURLE_URL_MALFORMAT ) { + LM_WARN("Malformed URL used in http_client\n"); + } else if ( res == CURLE_OUT_OF_MEMORY ) { + LM_WARN("Curl library out of memory\n"); + } else if ( res == CURLE_OPERATION_TIMEDOUT ) { + LM_WARN("Curl library timed out on request\n"); + } else if ( res == CURLE_SSL_CONNECT_ERROR ) { + LM_WARN("TLS error in curl connection\n"); + } else if ( res == CURLE_SSL_CERTPROBLEM ) { + LM_WARN("TLS local certificate error\n"); + } else if ( res == CURLE_SSL_CIPHER ) { + LM_WARN("TLS cipher error\n"); + } else if ( res == CURLE_SSL_CACERT ) { + LM_WARN("TLS server certificate validation error (No valid CA cert)\n"); + } else if ( res == CURLE_SSL_CACERT_BADFILE ) { + LM_WARN("TLS CA certificate read error \n"); + } else if ( res == CURLE_SSL_ISSUER_ERROR ) { + LM_WARN("TLS issuer certificate check error \n"); + } else if ( res == CURLE_PEER_FAILED_VERIFICATION ) { + LM_WARN("TLS verification error\n"); + } else if ( res == CURLE_TOO_MANY_REDIRECTS ) { + LM_WARN("Too many redirects\n"); } else { LM_ERR("failed to perform curl (%d)\n", res); }

1 0

git:master:d04b1265: http_client Add a note to TODO list
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: d04b126571c430c67826a21977ed9c9fdeb08dca URL: https://github.com/kamailio/kamailio/commit/d04b126571c430c67826a21977ed9c9… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T12:12:20+02:00 http_client Add a note to TODO list --- Modified: modules/http_client/TODO.txt --- Diff: https://github.com/kamailio/kamailio/commit/d04b126571c430c67826a21977ed9c9… Patch: https://github.com/kamailio/kamailio/commit/d04b126571c430c67826a21977ed9c9… --- diff --git a/modules/http_client/TODO.txt b/modules/http_client/TODO.txt index bb66e9c..a4fddc7 100644 --- a/modules/http_client/TODO.txt +++ b/modules/http_client/TODO.txt @@ -59,3 +59,6 @@ The http_client module - todo - API for other modules - done by Hugh Waite - Needs documentation + +- Look into graceful failure when we can't resolve host. Right now we return -1 and fail + without returning a failure code.

1 0

git:master:4cd5d66d: http_client fix bad formatting.
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 4cd5d66dd6b899dc76cd33c6702426ea36d3d4d2 URL: https://github.com/kamailio/kamailio/commit/4cd5d66dd6b899dc76cd33c6702426e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T12:10:08+02:00 http_client fix bad formatting. --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/4cd5d66dd6b899dc76cd33c6702426e… Patch: https://github.com/kamailio/kamailio/commit/4cd5d66dd6b899dc76cd33c6702426e… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 546ffc4..15a91f3 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -258,31 +258,31 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const if (download_size > 0) { - if (params->oneline) { - /* search for line feed */ - at = memchr(stream.buf, (char)10, download_size); - datasize = (double) (at - stream.buf); - LM_DBG(" -- curl download size cut to first line: %d \n", (int) datasize); - } - if (at == NULL) { - if (params->maxdatasize && ((unsigned int) download_size) > params->maxdatasize) { - /* Limit at maximum data size */ - datasize = (double) params->maxdatasize; - LM_DBG(" -- curl download size cut to maxdatasize : %d \n", (int) datasize); - } else { - /* Limit at actual downloaded data size */ - datasize = (double) download_size; - LM_DBG(" -- curl download size cut to download_size : %d \n", (int) datasize); - //at = stream.buf + (unsigned int) download_size; + if (params->oneline) { + /* search for line feed */ + at = memchr(stream.buf, (char)10, download_size); + datasize = (double) (at - stream.buf); + LM_DBG(" -- curl download size cut to first line: %d \n", (int) datasize); + } + if (at == NULL) { + if (params->maxdatasize && ((unsigned int) download_size) > params->maxdatasize) { + /* Limit at maximum data size */ + datasize = (double) params->maxdatasize; + LM_DBG(" -- curl download size cut to maxdatasize : %d \n", (int) datasize); + } else { + /* Limit at actual downloaded data size */ + datasize = (double) download_size; + LM_DBG(" -- curl download size cut to download_size : %d \n", (int) datasize); + //at = stream.buf + (unsigned int) download_size; + } } - } /* Create a STR object */ rval.s = stream.buf; rval.len = datasize; /* Duplicate string to return */ pkg_str_dup(_dst, &rval); - LM_DBG("curl query result: Length %d %.*s \n", rval.len, rval.len, rval.s); + LM_DBG("curl query result: Length %d %.*s \n", rval.len, rval.len, rval.s); } else { _dst->s = NULL; _dst->len = 0;

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016