sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
388 discussions

git:master:f59688dc: auth_radius Remove svn id's
by Olle E. Johansson 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: f59688dc6998d31a2bd65b91ad3e8d134f5d38d1 URL: https://github.com/kamailio/kamailio/commit/f59688dc6998d31a2bd65b91ad3e8d1… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-29T09:31:40+02:00 auth_radius Remove svn id's --- Modified: modules/auth_radius/authorize.c Modified: modules/auth_radius/authorize.h Modified: modules/auth_radius/authrad_mod.c Modified: modules/auth_radius/authrad_mod.h Modified: modules/auth_radius/sterman.c Modified: modules/auth_radius/sterman.h --- Diff: https://github.com/kamailio/kamailio/commit/f59688dc6998d31a2bd65b91ad3e8d1… Patch: https://github.com/kamailio/kamailio/commit/f59688dc6998d31a2bd65b91ad3e8d1… --- diff --git a/modules/auth_radius/authorize.c b/modules/auth_radius/authorize.c index f9c45dd..6b76364 100644 --- a/modules/auth_radius/authorize.c +++ b/modules/auth_radius/authorize.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Digest Authentication - Radius support * * Copyright (C) 2001-2003 FhG Fokus diff --git a/modules/auth_radius/authorize.h b/modules/auth_radius/authorize.h index 213b188..1d56c8e 100644 --- a/modules/auth_radius/authorize.h +++ b/modules/auth_radius/authorize.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Digest Authentication - Radius support * * Copyright (C) 2001-2003 FhG Fokus diff --git a/modules/auth_radius/authrad_mod.c b/modules/auth_radius/authrad_mod.c index 94ca865..8d4b2a2 100644 --- a/modules/auth_radius/authrad_mod.c +++ b/modules/auth_radius/authrad_mod.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Digest Authentication - Radius support * * Copyright (C) 2001-2003 FhG Fokus diff --git a/modules/auth_radius/authrad_mod.h b/modules/auth_radius/authrad_mod.h index ac8fe01..d78db8a 100644 --- a/modules/auth_radius/authrad_mod.h +++ b/modules/auth_radius/authrad_mod.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Digest Authentication - Radius support * * Copyright (C) 2001-2003 FhG Fokus diff --git a/modules/auth_radius/sterman.c b/modules/auth_radius/sterman.c index f95fdbc..2a15ccd 100644 --- a/modules/auth_radius/sterman.c +++ b/modules/auth_radius/sterman.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Digest Authentication - Radius support * * Copyright (C) 2001-2003 FhG Fokus diff --git a/modules/auth_radius/sterman.h b/modules/auth_radius/sterman.h index 69ead9e..255007a 100644 --- a/modules/auth_radius/sterman.h +++ b/modules/auth_radius/sterman.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Digest Authentication - Radius support * * Copyright (C) 2001-2003 FhG Fokus

1 0

git:master:c391c09f: http_client TODO update
by Olle E. Johansson 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: c391c09f92904b466b426da49e2268024792bde4 URL: https://github.com/kamailio/kamailio/commit/c391c09f92904b466b426da49e22680… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-29T09:29:55+02:00 http_client TODO update --- Modified: modules/http_client/TODO.txt --- Diff: https://github.com/kamailio/kamailio/commit/c391c09f92904b466b426da49e22680… Patch: https://github.com/kamailio/kamailio/commit/c391c09f92904b466b426da49e22680… --- diff --git a/modules/http_client/TODO.txt b/modules/http_client/TODO.txt index 70ba567..34a368c 100644 --- a/modules/http_client/TODO.txt +++ b/modules/http_client/TODO.txt @@ -45,3 +45,6 @@ The http_client module - todo $curl == URL $curlres == result + +- Option to try connections at module load with CURLOPT_CONNECT_ONLY + just to make sure URLs resolve correctly in DNS and ports are open

1 0

http_aync_client docs missing from web site
by Olle E. Johansson 28 Mar '16

28 Mar '16

The http_async_client README is not linked on the web site. http://kamailio.org/docs/modules/devel/ /O

2 1

git:master:b8ed251f: http_client Document limitation to http and https protocols
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: b8ed251f8f4716393ba07d910d162b6a5bfa2194 URL: https://github.com/kamailio/kamailio/commit/b8ed251f8f4716393ba07d910d162b6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T21:08:05+02:00 http_client Document limitation to http and https protocols --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b8ed251f8f4716393ba07d910d162b6… Patch: https://github.com/kamailio/kamailio/commit/b8ed251f8f4716393ba07d910d162b6… --- diff --git a/modules/http_client/README b/modules/http_client/README index 91fb2d3..9384f35 100644 --- a/modules/http_client/README +++ b/modules/http_client/README @@ -177,6 +177,8 @@ Chapter 1. Admin Guide and get access to parts of the reply. This function has been ported from the utils module and now use the same libcurl functions. + The module is limited to using HTTP and HTTPS protocols. + 2. Dependencies 2.1. Kamailio Modules diff --git a/modules/http_client/doc/http_client_admin.xml b/modules/http_client/doc/http_client_admin.xml index 09cb1e6..924830f 100644 --- a/modules/http_client/doc/http_client_admin.xml +++ b/modules/http_client/doc/http_client_admin.xml @@ -43,6 +43,9 @@ been ported from the utils module and now use the same libcurl functions. </para> + <para> + The module is limited to using HTTP and HTTPS protocols. + </para> </section> <section> <title>Dependencies</title>

1 0

git:master:f19d258d: http_client Restrict protocols for redirects
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: f19d258d646bac9bdb04cc2c059a459abd4b8185 URL: https://github.com/kamailio/kamailio/commit/f19d258d646bac9bdb04cc2c059a459… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T21:06:16+02:00 http_client Restrict protocols for redirects --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/f19d258d646bac9bdb04cc2c059a459… Patch: https://github.com/kamailio/kamailio/commit/f19d258d646bac9bdb04cc2c059a459… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 919839b..89407bb 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -132,6 +132,7 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const /* Limit to HTTP and HTTPS protocols */ res = curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); + res = curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); if (params->post) { char ctype[256];

1 0

git:master:126c9c34: http_client Limit protocols to HTTP and HTTPS
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 126c9c341af5f7cf74279d1a6e757f7602ce7d99 URL: https://github.com/kamailio/kamailio/commit/126c9c341af5f7cf74279d1a6e757f7… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T20:54:17+02:00 http_client Limit protocols to HTTP and HTTPS --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/126c9c341af5f7cf74279d1a6e757f7… Patch: https://github.com/kamailio/kamailio/commit/126c9c341af5f7cf74279d1a6e757f7… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 3d1b576..919839b 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -130,6 +130,9 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const LM_DBG("****** ##### CURL URL [%s] \n", _url); res = curl_easy_setopt(curl, CURLOPT_URL, _url); + /* Limit to HTTP and HTTPS protocols */ + res = curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); + if (params->post) { char ctype[256];

1 0

git:master:191cffa3: http_client Update TODO - remove done items
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 191cffa3bc0bbe1a23ae214cdf0ad76035614ba0 URL: https://github.com/kamailio/kamailio/commit/191cffa3bc0bbe1a23ae214cdf0ad76… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T20:48:50+02:00 http_client Update TODO - remove done items --- Modified: modules/http_client/TODO.txt --- Diff: https://github.com/kamailio/kamailio/commit/191cffa3bc0bbe1a23ae214cdf0ad76… Patch: https://github.com/kamailio/kamailio/commit/191cffa3bc0bbe1a23ae214cdf0ad76… --- diff --git a/modules/http_client/TODO.txt b/modules/http_client/TODO.txt index a4fddc7..70ba567 100644 --- a/modules/http_client/TODO.txt +++ b/modules/http_client/TODO.txt @@ -2,21 +2,11 @@ The http_client module - todo ====================== - connection parameters - timeout=x - DONE read=line/all - Implemented in API, but not in parameter tlsverify=on/off failover=httpcon Other httpcon that can be used for failover in case of 5xx response or timeout - httpredirect - DONE - useragent - DONE -- Make sure modparams work - httpproxy - Not working with curl - tls cert, key, ca - Not working with curl yet - httpredirect - done - timeout - done - maxdatasize - done - - Add XAVP parameter setting before running curl_connect - save fingerprint of cert for trust-on-first-use procedure @@ -26,13 +16,11 @@ The http_client module - todo - function in dialplan - httpcon_exists(object) - pv $curlstatus(object) ?? - this is per process !!! + - can be used to fix the $curlredirect pseudovariable too - Figure out a way to communicate back the content-type of the response. Another pvar arg? - This is per process! -- pv for curl error codes (result < 100) - $curlerror(code) Result string - DONE - - rpc curl.listcon list all connection objects with properties -- Done, but not documented @@ -57,8 +45,3 @@ The http_client module - todo $curl == URL $curlres == result -- 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

Config parser
by Olle E. Johansson 28 Mar '16

28 Mar '16

Hi! Http_client is using the cfg_parser.c core parser to parse the config file. In some cases I would like to set an empty string. Let’s say that I’ve set a default http proxy in modparams and wants to reset it to no proxy in the config file - in this case I would like to write httpproxy= on a line in the config file. In this case I get 0(45371) ERROR: <core> [cfg_parser.c:891]: cfg_parse_str(): http_client.cfg:35:0: Invalid string value ' ', a string expected. Is there a way to allow an empty string? /O

2 2

git:master:68547d50: http_client Add note about empty string in configuration file
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 68547d50668032c1a43e81f2eabf4d2b709ff049 URL: https://github.com/kamailio/kamailio/commit/68547d50668032c1a43e81f2eabf4d2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T20:42:37+02:00 http_client Add note about empty string in configuration file --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/68547d50668032c1a43e81f2eabf4d2… Patch: https://github.com/kamailio/kamailio/commit/68547d50668032c1a43e81f2eabf4d2… --- diff --git a/modules/http_client/README b/modules/http_client/README index 2387c25..91fb2d3 100644 --- a/modules/http_client/README +++ b/modules/http_client/README @@ -525,6 +525,10 @@ tstuff;timeout=12") path and anything else a path relative to the directory of the current Kamailio main config file. + To set a string value to null, in order to override default settings, + you can specify an value of "" - two quotation marks. In order to + disable a http proxy setting you can set the port to zero. + Example 1.16. Set config_file parameter ... modparam("http_client", "config_file", "httpconnections.cfg) diff --git a/modules/http_client/doc/http_client_admin.xml b/modules/http_client/doc/http_client_admin.xml index 6e32845..09cb1e6 100644 --- a/modules/http_client/doc/http_client_admin.xml +++ b/modules/http_client/doc/http_client_admin.xml @@ -536,6 +536,11 @@ modparam("http_client", "httpcon", "apifour=>http://stockholm.example.com/api/ge absolute path and anything else a path relative to the directory of the current &kamailio; main config file. </para> + <para> + To set a string value to null, in order to override default settings, + you can specify an value of "" - two quotation marks. In order to disable + a http proxy setting you can set the port to zero. + </para> <example> <title>Set <varname>config_file</varname> parameter</title> <programlisting format="linespecific">

1 0

git:master:f90a5525: http_client Return CURL error code on CURL failures, like "can't resolve DNS"
by Olle E. Johansson 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: f90a5525244f3b37697c8426613c9b88eb98fb9d URL: https://github.com/kamailio/kamailio/commit/f90a5525244f3b37697c8426613c9b8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-03-28T20:22:23+02:00 http_client Return CURL error code on CURL failures, like "can't resolve DNS" --- Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/f90a5525244f3b37697c8426613c9b8… Patch: https://github.com/kamailio/kamailio/commit/f90a5525244f3b37697c8426613c9b8… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 493c503..3d1b576 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -258,7 +258,7 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const pkg_free(stream.buf); } counter_inc(connfail); - return -1; + return res; } /* HTTP_CODE CHANGED TO CURLINFO_RESPONSE_CODE in curl > 7.10.7 */

1 0

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