sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
388 discussions

git:master:8c037d7c: http_client update TODO based on feedback from filipix in issue #541
by Olle E. Johansson 30 Mar '16

30 Mar '16

Module: kamailio Branch: master Commit: 8c037d7c0b10f32de5eacbab46e2f2a38c593aa7 URL: https://github.com/kamailio/kamailio/commit/8c037d7c0b10f32de5eacbab46e2f2a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T09:17:54+02:00 http_client update TODO based on feedback from filipix in issue #541 --- Modified: modules/http_client/TODO.txt --- Diff: https://github.com/kamailio/kamailio/commit/8c037d7c0b10f32de5eacbab46e2f2a… Patch: https://github.com/kamailio/kamailio/commit/8c037d7c0b10f32de5eacbab46e2f2a… --- diff --git a/modules/http_client/TODO.txt b/modules/http_client/TODO.txt index 34a368c..da2609d 100644 --- a/modules/http_client/TODO.txt +++ b/modules/http_client/TODO.txt @@ -48,3 +48,6 @@ The http_client module - todo - Option to try connections at module load with CURLOPT_CONNECT_ONLY just to make sure URLs resolve correctly in DNS and ports are open + +- Make it possible to define modparams in any order. For now, httpcon definitions only use default + values from modparam's defined on lines above in the config file. (issue #541)

1 0

[kamailio] module http_client - support setting default http proxy (#541)
by filiplx 30 Mar '16

30 Mar '16

The code on master branch is _almost_ done. What's missing is this: /** * functions.c * curL_query_url() */ if (default_http_proxy != NULL) { res |= curl_easy_setopt(curl, CURLOPT_PROXY, default_http_proxy); } if (default_http_proxy_port > 0) { res |= curl_easy_setopt(curl, CURLOPT_PROXYPORT, default_http_proxy_port); } --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/541

3 17

git:4.4:dc828be6: http_client Add configurable authentication methods
by Olle E. Johansson 30 Mar '16

30 Mar '16

Module: kamailio Branch: 4.4 Commit: dc828be6da416b8bb1ba8fbcc52942221782314e URL: https://github.com/kamailio/kamailio/commit/dc828be6da416b8bb1ba8fbcc529422… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T09:00:12+02:00 http_client Add configurable authentication methods Attempt to fix issue #515 (cherry picked from commit 4bf3a517991b374308b033b85c82058c37e4e90a) --- 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/dc828be6da416b8bb1ba8fbcc529422… Patch: https://github.com/kamailio/kamailio/commit/dc828be6da416b8bb1ba8fbcc529422…

1 0

git:4.4:37e59b5d: http_client Debug http_proxy and add http_proxy usage to the http_client_query function
by Olle E. Johansson 30 Mar '16

30 Mar '16

Module: kamailio Branch: 4.4 Commit: 37e59b5d1d3d12a2358d24fc5e37f2f55ee2e41a URL: https://github.com/kamailio/kamailio/commit/37e59b5d1d3d12a2358d24fc5e37f2f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T08:56:25+02:00 http_client Debug http_proxy and add http_proxy usage to the http_client_query function (cherry picked from commit 34ffef464fbb26c3526990a0bf8b9c5d1cd4ee97) --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/37e59b5d1d3d12a2358d24fc5e37f2f… Patch: https://github.com/kamailio/kamailio/commit/37e59b5d1d3d12a2358d24fc5e37f2f… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 7bd1564..546ffc4 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -183,8 +183,11 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const } if (params->http_proxy != NULL) { + LM_DBG("****** ##### CURL proxy [%s] \n", params->http_proxy); res |= curl_easy_setopt(curl, CURLOPT_PROXY, params->http_proxy); - } + } else { + LM_DBG("****** ##### CURL proxy NOT SET \n"); + } if (params->http_proxy_port > 0) { res |= curl_easy_setopt(curl, CURLOPT_PROXYPORT, params->http_proxy_port); @@ -381,7 +384,12 @@ int curl_con_query_url(struct sip_msg* _m, const str *connection, const str* url query_params.oneline = 0; query_params.maxdatasize = maxdatasize; query_params.http_proxy_port = conn->http_proxy_port; - query_params.http_proxy = conn->http_proxy; + if (conn->http_proxy) { + query_params.http_proxy = conn->http_proxy; + LM_DBG("****** ##### CURL proxy [%s] \n", query_params.http_proxy); + } else { + LM_DBG("**** Curl HTTP_proxy not set \n"); + } res = curL_query_url(_m, urlbuf, result, &query_params); @@ -423,6 +431,8 @@ int http_query(struct sip_msg* _m, char* _url, str* _dst, char* _post) query_params.http_follow_redirect = default_http_follow_redirect; query_params.oneline = 1; query_params.maxdatasize = 0; + query_params.http_proxy = as_asciiz(&default_http_proxy); + query_params.http_proxy_port = default_http_proxy_port; res = curL_query_url(_m, _url, _dst, &query_params);

1 0

git:4.4:cb26fbd8: http_client Add error parsing for DNS issues with http_proxy
by Olle E. Johansson 30 Mar '16

30 Mar '16

Module: kamailio Branch: 4.4 Commit: cb26fbd82c9594bd670beb27cb3ee1b99603b6c6 URL: https://github.com/kamailio/kamailio/commit/cb26fbd82c9594bd670beb27cb3ee1b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T08:54:56+02:00 http_client Add error parsing for DNS issues with http_proxy (cherry picked from commit 438f91b8b5a43516d8904f23be2fa9898fdc465c) --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/cb26fbd82c9594bd670beb27cb3ee1b… Patch: https://github.com/kamailio/kamailio/commit/cb26fbd82c9594bd670beb27cb3ee1b… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 3068176..7bd1564 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -219,6 +219,8 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const LM_WARN("failed to connect() to host\n"); } else if ( res == CURLE_COULDNT_RESOLVE_HOST ) { LM_WARN("couldn't resolve host\n"); + } else if ( res == CURLE_COULDNT_RESOLVE_PROXY ) { + LM_WARN("couldn't resolve http_proxy host\n"); } else { LM_ERR("failed to perform curl (%d)\n", res); }

1 0

git:4.4:78bc6803: Merge branch '4.4' of https://github.com/kamailio/kamailio into 4.4
by Olle E. Johansson 30 Mar '16

30 Mar '16

Module: kamailio Branch: 4.4 Commit: 78bc680355075304e6e93d91347a564ac8eed20f URL: https://github.com/kamailio/kamailio/commit/78bc680355075304e6e93d91347a564… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T08:53:57+02:00 Merge branch '4.4' of https://github.com/kamailio/kamailio into 4.4 * '4.4' of https://github.com/kamailio/kamailio: (32 commits) Update hep.c core: mem - updated defines to pkg mod stats Makefile.defs: version set to 4.4.0-rc2 Makefile.defs: re-enable pkg malloc topos: reused stored branch attributes in case of retransmission http_async_client: use pkg-config for libevent compile flags detection mem: shm - updated macros for mod stats api uuid: detect if pkg-config knows about uuid lib mem/tlsf_malloc: updates to use new api names for module stats mem/q_malloc: updates to use new api names for module stats mem/f_malloc: updates to use new api names for module stats core: mem/shm - use module stats fields for init of managers core: mem/pkg - use module stats fields for init of managers q core - mem: renamed api fields for module stats to repleft the purpose tm: coherent indentation p_usrloc: free allocated items in case of no more memory during domain add core: mem - export pkg api even when using system malloc presence: remove jumping to error from error in update_presentity() http_client: check first if pointer is not exceeding limit usrloc: if no location record loaded from db, then no attrs to look up ... --- Modified: Makefile.defs Modified: lib/srdb1/schema/location.xml Modified: lib/trie/dtrie.c Modified: mem/f_malloc.c Modified: mem/memapi.h Modified: mem/pkg.c Modified: mem/pkg.h Modified: mem/q_malloc.c Modified: mem/shm.c Modified: mem/shm.h Modified: mem/tlsf_malloc.c Modified: modules/cnxcc/Makefile Modified: modules/crypto/crypto_mod.c Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatcher.c Modified: modules/http_async_client/Makefile Modified: modules/http_client/curlcon.c Modified: modules/ndb_redis/Makefile Modified: modules/ndb_redis/redis_client.c Modified: modules/p_usrloc/dlist.c Modified: modules/presence/presentity.c Modified: modules/seas/encode_msg.c Modified: modules/sipcapture/hep.c Modified: modules/tm/tm.c Modified: modules/topos/tps_msg.c Modified: modules/usrloc/udomain.c Modified: modules/uuid/Makefile Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/78bc680355075304e6e93d91347a564… Patch: https://github.com/kamailio/kamailio/commit/78bc680355075304e6e93d91347a564…

1 0

git:4.4:00a01a4d: http_client Fix typo
by Olle E. Johansson 30 Mar '16

30 Mar '16

Module: kamailio Branch: 4.4 Commit: 00a01a4d7eb736a0ee481e10e2e8fe876e5edbeb URL: https://github.com/kamailio/kamailio/commit/00a01a4d7eb736a0ee481e10e2e8fe8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T08:53:06+02:00 http_client Fix typo ...and compile before commit... (cherry picked from commit 7a23fd2c9ec66332097b639d4bedde52731e2bae) --- Modified: modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/00a01a4d7eb736a0ee481e10e2e8fe8… Patch: https://github.com/kamailio/kamailio/commit/00a01a4d7eb736a0ee481e10e2e8fe8… --- diff --git a/modules/http_client/curlcon.c b/modules/http_client/curlcon.c index aa61860..d85c8aa 100644 --- a/modules/http_client/curlcon.c +++ b/modules/http_client/curlcon.c @@ -184,6 +184,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; @@ -432,6 +433,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; @@ -453,8 +455,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:4.4:fadd19ed: http_client Add note about empty string in configuration file
by Olle E. Johansson 30 Mar '16

30 Mar '16

Module: kamailio Branch: 4.4 Commit: fadd19ed1832d88fdeea7df267557419191447f9 URL: https://github.com/kamailio/kamailio/commit/fadd19ed1832d88fdeea7df26755741… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-30T08:52:24+02:00 http_client Add note about empty string in configuration file (cherry picked from commit 68547d50668032c1a43e81f2eabf4d2b709ff049) --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fadd19ed1832d88fdeea7df26755741… Patch: https://github.com/kamailio/kamailio/commit/fadd19ed1832d88fdeea7df26755741…

1 0

[kamailio] Improve detection of anonymous proxies. (#550)
by Sergey Okhapkin 29 Mar '16

29 Mar '16

Anonymous proxies in mmdb2 database have no "country" attribute, but "registered_country" attribute only. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/550 -- Commit Summary -- * Improve detection of anonymous proxies. -- File Changes -- M modules/geoip2/geoip2_pv.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/550.patch https://github.com/kamailio/kamailio/pull/550.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/550

2 2

git:master:c49011c2: geoip2: Improve detection of addresses used by anonymous proxies
by Daniel-Constantin Mierla 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: c49011c2cc63d35bca6904748da166814a792fc9 URL: https://github.com/kamailio/kamailio/commit/c49011c2cc63d35bca6904748da1668… Author: Sergey Okhapkin <root(a)west2.callwithus.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-29T23:21:46+02:00 geoip2: Improve detection of addresses used by anonymous proxies --- Modified: modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/c49011c2cc63d35bca6904748da1668… Patch: https://github.com/kamailio/kamailio/commit/c49011c2cc63d35bca6904748da1668… --- diff --git a/modules/geoip2/geoip2_pv.c b/modules/geoip2/geoip2_pv.c index 69bd719..e239d96 100644 --- a/modules/geoip2/geoip2_pv.c +++ b/modules/geoip2/geoip2_pv.c @@ -407,7 +407,11 @@ int pv_get_geoip2(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); if(MMDB_get_value(&gpv->item->r.record.entry, &entry_data, "country","iso_code", NULL - ) != MMDB_SUCCESS) + ) != MMDB_SUCCESS + && MMDB_get_value(&gpv->item->r.record.entry, &entry_data, + "registered_country","iso_code", NULL + ) != MMDB_SUCCESS + ) return pv_get_null(msg, param, res); if(entry_data.has_data && entry_data.type == MMDB_DATA_TYPE_UTF8_STRING) { gpv->item->r.country.s = (char *)entry_data.utf8_string;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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