sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
302 discussions

[kamailio] cnxcc: change some log levels from INFO to DBG (#494)

by Federico Cabiddu

When using redis as cnxcc backend, too much log is printed, specially all the logs related to the periodic user's wallet check. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/494 -- Commit Summary -- * cnxcc: change some log levels from INFO to DBG -- File Changes -- M modules/cnxcc/cnxcc_check.c (2) M modules/cnxcc/cnxcc_redis.c (8) M modules/cnxcc/cnxcc_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/494.patch https://github.com/kamailio/kamailio/pull/494.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/494

8 years, 10 months

git:master:1b6fe67e: Merge pull request #481 from kamailio/tmp/hpw_curl_improvements

by Hugh Waite

Module: kamailio Branch: master Commit: 1b6fe67edf5fd3fedb759f1cc837b1148bc341c2 URL: https://github.com/kamailio/kamailio/commit/1b6fe67edf5fd3fedb759f1cc837b11… Author: Hugh Waite <que273(a)users.noreply.github.com> Committer: Hugh Waite <que273(a)users.noreply.github.com> Date: 2016-02-02T11:05:07Z Merge pull request #481 from kamailio/tmp/hpw_curl_improvements curl: Add various curl and TLS options to curl module - client key/certificate - cacert - sslversion - cipher suites - verify_host and verify_peer --- Modified: modules/curl/curl.c Modified: modules/curl/curl.h Modified: modules/curl/curlcon.c Modified: modules/curl/doc/curl_admin.xml Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/1b6fe67edf5fd3fedb759f1cc837b11… Patch: https://github.com/kamailio/kamailio/commit/1b6fe67edf5fd3fedb759f1cc837b11…

8 years, 10 months

git:master:2f020509: curl: Ensure all values of verify_host are valid

by Hugh Waite

Module: kamailio Branch: master Commit: 2f0205093803cbd3761e6ae0384b548c19b4e3e4 URL: https://github.com/kamailio/kamailio/commit/2f0205093803cbd3761e6ae0384b548… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-02-02T10:15:22Z curl: Ensure all values of verify_host are valid - verify_host=1 is deprecated, automatically use 2 --- Modified: modules/curl/curlcon.c Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/2f0205093803cbd3761e6ae0384b548… Patch: https://github.com/kamailio/kamailio/commit/2f0205093803cbd3761e6ae0384b548… --- diff --git a/modules/curl/curlcon.c b/modules/curl/curlcon.c index 85a0142..5c947f5 100644 --- a/modules/curl/curlcon.c +++ b/modules/curl/curlcon.c @@ -326,10 +326,6 @@ int curl_parse_param(char *val) LM_DBG("curl connection [%.*s]: verifyhost bad value. Using default\n", name.len, name.s); verify_host = default_tls_verify_host; } - if (verify_host != 0 && verify_host != 1) { - LM_DBG("curl connection [%.*s]: verifyhost bad value. Using default\n", name.len, name.s); - verify_host = default_tls_verify_host; - } LM_DBG("curl [%.*s] - verifyhost [%d]\n", pit->name.len, pit->name.s, verify_host); } else if(pit->name.len==10 && strncmp(pit->name.s, "sslversion", 10)==0) { if(str2int(&tok, &sslversion)!=0) { diff --git a/modules/curl/functions.c b/modules/curl/functions.c index 1b530d6..754bbb3 100644 --- a/modules/curl/functions.c +++ b/modules/curl/functions.c @@ -181,7 +181,7 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const } res |= curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, (long) params->verify_peer); - res |= curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, (long) params->verify_host); + res |= curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, (long) params->verify_host?2:0); res |= curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long) 1); res |= curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long) params->timeout);

8 years, 10 months

git:master:d9b5cdab: curl: Use correct modparam type for string params

by Hugh Waite

Module: kamailio Branch: master Commit: d9b5cdab809ac32b63589f270561cda17abaadb2 URL: https://github.com/kamailio/kamailio/commit/d9b5cdab809ac32b63589f270561cda… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-01-26T12:45:33Z curl: Use correct modparam type for string params --- Modified: modules/curl/curl.c --- Diff: https://github.com/kamailio/kamailio/commit/d9b5cdab809ac32b63589f270561cda… Patch: https://github.com/kamailio/kamailio/commit/d9b5cdab809ac32b63589f270561cda… --- diff --git a/modules/curl/curl.c b/modules/curl/curl.c index 79da671..0895039 100644 --- a/modules/curl/curl.c +++ b/modules/curl/curl.c @@ -140,16 +140,16 @@ static param_export_t params[] = { {"connection_timeout", PARAM_INT, &default_connection_timeout}, {"curlcon", PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param}, {"tlscacert", PARAM_STRING, &default_tls_cacert }, - {"tlsclientcert", PARAM_STRING, &default_tls_clientcert }, - {"tlsclientkey", PARAM_STRING, &default_tls_clientkey }, - {"tlscipherlist", PARAM_STRING, &default_cipher_suite_list }, + {"tlsclientcert", PARAM_STR, &default_tls_clientcert }, + {"tlsclientkey", PARAM_STR, &default_tls_clientkey }, + {"tlscipherlist", PARAM_STR, &default_cipher_suite_list }, {"tlsversion", PARAM_INT, &default_tls_version }, {"tlsverifypeer", PARAM_INT, &default_tls_verify_peer }, {"tlsverifyhost", PARAM_INT, &default_tls_verify_host }, {"httpproxyport", PARAM_INT, &default_http_proxy_port }, {"httpproxy", PARAM_STRING, &default_http_proxy}, {"httpredirect", PARAM_INT, &default_http_follow_redirect }, - {"useragent", PARAM_STRING, &default_useragent }, + {"useragent", PARAM_STR, &default_useragent }, {"maxdatasize", PARAM_INT, &default_maxdatasize }, {0, 0, 0} };

8 years, 10 months

git:master:5ff78824: Merge remote branch 'origin/master' into tmp/hpw_curl_improvements

by Hugh Waite

Module: kamailio Branch: master Commit: 5ff788247f7baffa0cabce01255f6eba0702b5c5 URL: https://github.com/kamailio/kamailio/commit/5ff788247f7baffa0cabce01255f6eb… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-01-21T15:13:30Z Merge remote branch 'origin/master' into tmp/hpw_curl_improvements --- Added: modules/cfgt/Makefile Added: modules/cfgt/README Added: modules/cfgt/cfgt.c Added: modules/cfgt/cfgt.h Added: modules/cfgt/cfgt_int.c Added: modules/cfgt/cfgt_int.h Added: modules/cfgt/cfgt_json.c Added: modules/cfgt/cfgt_json.h Added: modules/cfgt/cfgt_mod.c Added: modules/cfgt/cfgt_mod.h Added: modules/cfgt/doc/Makefile Added: modules/cfgt/doc/cfgt.xml Added: modules/cfgt/doc/cfgt_admin.xml Added: modules/crypto/Makefile Added: modules/crypto/README Added: modules/crypto/crypto_mod.c Added: modules/crypto/doc/Makefile Added: modules/crypto/doc/crypto.xml Added: modules/crypto/doc/crypto_admin.xml Added: modules/rtpengine/rtpengine_hash.c Added: modules/rtpengine/rtpengine_hash.h Modified: Makefile.defs Modified: Makefile.groups Modified: dprint.c Modified: dprint.h Modified: events.c Modified: events.h Modified: forward.h Modified: ip_addr.h Modified: lib/srdb1/schema/uacreg.xml Modified: modules/auth_radius/authrad_mod.c Modified: modules/auth_radius/authrad_mod.h Modified: modules/auth_radius/doc/auth_radius.xml Modified: modules/auth_radius/doc/auth_radius_admin.xml Modified: modules/auth_radius/sterman.c Modified: modules/carrierroute/cr_fifo.c Modified: modules/cdp/routing.c Modified: modules/cnxcc/cnxcc.c Modified: modules/cnxcc/cnxcc.h Modified: modules/curl/TODO.txt Modified: modules/curl/curl_api.h Modified: modules/db_mysql/km_dbase.c Modified: modules/db_text/dbt_base.c Modified: modules/db_text/dbt_lib.c Modified: modules/db_text/dbt_raw_util.c Modified: modules/db_text/dbtext.c Modified: modules/db_text/dbtext.h Modified: modules/debugger/Makefile Modified: modules/debugger/README Modified: modules/debugger/debugger_api.c Modified: modules/debugger/debugger_api.h Modified: modules/debugger/debugger_mod.c Modified: modules/debugger/doc/debugger_admin.xml Modified: modules/dispatcher/README Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/doc/dispatcher.cfg Modified: modules/dmq_usrloc/usrloc_sync.c Modified: modules/htable/htable.c Modified: modules/ims_auth/cxdx_mar.c Modified: modules/ims_charging/dialog.c Modified: modules/ims_charging/dialog.h Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/ims_ro.h Modified: modules/ims_charging/mod.c Modified: modules/ims_charging/ro_session_hash.c Modified: modules/ims_charging/ro_session_hash.h Modified: modules/ims_charging/ro_timer.c Modified: modules/ims_qos/rx_str.c Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/registrar_notify.h Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/udomain.h Modified: modules/ims_usrloc_scscf/usrloc.h Modified: modules/matrix/README Modified: modules/matrix/doc/matrix_admin.xml Modified: modules/nat_traversal/nat_traversal.c Modified: modules/ndb_mongodb/README Modified: modules/ndb_mongodb/doc/ndb_mongodb_admin.xml Modified: modules/permissions/README Modified: modules/permissions/doc/permissions_admin.xml Modified: modules/permissions/hash.c Modified: modules/permissions/hash.h Modified: modules/permissions/permissions.c Modified: modules/presence/notify.c Modified: modules/presence/publish.c Modified: modules/presence_dialoginfo/add_events.c Modified: modules/presence_dialoginfo/notify_body.c Modified: modules/presence_xml/notify_body.c Modified: modules/registrar/reg_mod.c Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/siptrace/README Modified: modules/siptrace/doc/siptrace_admin.xml Modified: modules/siptrace/siptrace.c Modified: modules/smsops/doc/smsops_admin.xml Modified: modules/statsd/lib_statsd.c Modified: modules/statsd/lib_statsd.h Modified: modules/tcpops/tcpops.c Modified: modules/tcpops/tcpops.h Modified: modules/tcpops/tcpops_mod.c Modified: modules/tls/README Modified: modules/tls/doc/rpc.xml Modified: modules/tm/h_table.c Modified: modules/tm/h_table.h Modified: modules/tm/t_funcs.c Modified: modules/tm/t_funcs.h Modified: modules/tm/t_fwd.c Modified: modules/tm/t_reply.c Modified: modules/tm/t_serial.c Modified: modules/tm/t_stats.c Modified: modules/tm/t_stats.h Modified: modules/tmx/doc/tmx_admin.xml Modified: modules/tmx/tmx_mod.c Modified: modules/topoh/topoh_mod.c Modified: modules/tsilo/ts_append.c Modified: modules/tsilo/ts_handlers.c Modified: modules/tsilo/ts_hash.c Modified: modules/uac/README Modified: modules/uac/doc/uac_admin.xml Modified: modules/uac/uac.c Modified: modules/uac/uac_reg.c Modified: modules/uac/uac_send.c Modified: modules/utils/utils.c Modified: modules/websocket/Makefile Modified: parser/msg_parser.c Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: receive.c Modified: socket_info.c Modified: tcp_read.c Modified: utils/kamctl/db_berkeley/kamailio/uacreg Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/dbtext/kamailio/uacreg Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamdbctl Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/uac-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uac-table --- Diff: https://github.com/kamailio/kamailio/commit/5ff788247f7baffa0cabce01255f6eb… Patch: https://github.com/kamailio/kamailio/commit/5ff788247f7baffa0cabce01255f6eb…

8 years, 10 months

git:master:eb067dd3: curl: Implement additional TLS parameters

by Hugh Waite

Module: kamailio Branch: master Commit: eb067dd33603099eb1fc92438834c302e3a00195 URL: https://github.com/kamailio/kamailio/commit/eb067dd33603099eb1fc92438834c30… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-01-21T14:51:04Z curl: Implement additional TLS parameters - Add per-connection useragent param - Add sslversion modparam - Add per-connection sslversion param - Add per-connection client cert/key/ciphers - Ensure all strings are null-terminated for libcurl --- Modified: modules/curl/curl.c Modified: modules/curl/curl.h Modified: modules/curl/curlcon.c Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/eb067dd33603099eb1fc92438834c30… Patch: https://github.com/kamailio/kamailio/commit/eb067dd33603099eb1fc92438834c30…

8 years, 10 months

git:master:64764ff9: curl: Add curl verifyhost option

by Hugh Waite

Module: kamailio Branch: master Commit: 64764ff9ce7d117a95d7a0d1d1edf232965d8def URL: https://github.com/kamailio/kamailio/commit/64764ff9ce7d117a95d7a0d1d1edf23… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-01-20T17:36:04Z curl: Add curl verifyhost option - Renamed verifyserver to verifypeer to match libcurl - Added default verifyhost modparam - Added per-connection verifyhost override --- Modified: modules/curl/curl.c Modified: modules/curl/curl.h Modified: modules/curl/curlcon.c Modified: modules/curl/doc/curl_admin.xml Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/64764ff9ce7d117a95d7a0d1d1edf23… Patch: https://github.com/kamailio/kamailio/commit/64764ff9ce7d117a95d7a0d1d1edf23…

8 years, 10 months

git:master:2d7a803d: curl: Add client key/certificate to curl_connect

by Hugh Waite

Module: kamailio Branch: master Commit: 2d7a803d4dbd947c4d015e3cca8ec354876effd1 URL: https://github.com/kamailio/kamailio/commit/2d7a803d4dbd947c4d015e3cca8ec35… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-01-19T18:45:49Z curl: Add client key/certificate to curl_connect - Use the client key, certificate and cacert modparams when provided - Use the verifyserver modparam (default enabled) - Implement per-connection verifyserver parameter - Add ciphersuites modparam to override libcurl defaults --- Modified: modules/curl/curl.c Modified: modules/curl/curl.h Modified: modules/curl/curlcon.c Modified: modules/curl/doc/curl_admin.xml Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/2d7a803d4dbd947c4d015e3cca8ec35… Patch: https://github.com/kamailio/kamailio/commit/2d7a803d4dbd947c4d015e3cca8ec35…

8 years, 10 months

[kamailio] curl: Add client key/certificate to curl_connect (#481)

by Hugh Waite

This latest commit implements some of the TODO's in the curl module. - default client_cert, client_key, cacert and verifyserver modparams implemented - added a cipher_suites modparam so the default list provided by libcurl can be overridden (e.g. enabling elliptic-curve ciphers) - added per-connection value for verifyserver Here are some followup questions for @oej or anyone else who may use the curl module. Should the [verify_host](http://curl.haxx.se/libcurl/c/CURLOPT_SSL_VERIFYHOST.html) parameter be configurable as well as verify_peer? Is the intention to make the client cert/key configurable per-connection? If we add more parameters to the curlcon modparam, it will easily get unmanageable. I suggest two modparams, curlcon and curlcon_param. The first sets up the url and parameters (this is unchanged). The second will add parameters to a curlcon that is already defined. E.g. ``` modparam("curl", "curlcon", "apione=>https://myserver.example.com/url;timeout=12") modparam("curl", "curlcon_param", "apione=>verifyserver=1") modparam("curl", "curlcon_param", "apione=>clientkey=/var/certs/myserver.example.com.pem") ``` Any thoughts? Have I missed anything else in this area? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/481 -- Commit Summary -- * curl: Add client key/certificate to curl_connect -- File Changes -- M modules/curl/curl.c (2) M modules/curl/curl.h (6) M modules/curl/curlcon.c (24) M modules/curl/doc/curl_admin.xml (26) M modules/curl/functions.c (113) -- Patch Links -- https://github.com/kamailio/kamailio/pull/481.patch https://github.com/kamailio/kamailio/pull/481.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/481

8 years, 10 months

git:tmp/hpw_curl_improvements:2f020509: curl: Ensure all values of verify_host are valid

by Hugh Waite

Module: kamailio Branch: tmp/hpw_curl_improvements Commit: 2f0205093803cbd3761e6ae0384b548c19b4e3e4 URL: https://github.com/kamailio/kamailio/commit/2f0205093803cbd3761e6ae0384b548… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-02-02T10:15:22Z curl: Ensure all values of verify_host are valid - verify_host=1 is deprecated, automatically use 2 --- Modified: modules/curl/curlcon.c Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/2f0205093803cbd3761e6ae0384b548… Patch: https://github.com/kamailio/kamailio/commit/2f0205093803cbd3761e6ae0384b548… --- diff --git a/modules/curl/curlcon.c b/modules/curl/curlcon.c index 85a0142..5c947f5 100644 --- a/modules/curl/curlcon.c +++ b/modules/curl/curlcon.c @@ -326,10 +326,6 @@ int curl_parse_param(char *val) LM_DBG("curl connection [%.*s]: verifyhost bad value. Using default\n", name.len, name.s); verify_host = default_tls_verify_host; } - if (verify_host != 0 && verify_host != 1) { - LM_DBG("curl connection [%.*s]: verifyhost bad value. Using default\n", name.len, name.s); - verify_host = default_tls_verify_host; - } LM_DBG("curl [%.*s] - verifyhost [%d]\n", pit->name.len, pit->name.s, verify_host); } else if(pit->name.len==10 && strncmp(pit->name.s, "sslversion", 10)==0) { if(str2int(&tok, &sslversion)!=0) { diff --git a/modules/curl/functions.c b/modules/curl/functions.c index 1b530d6..754bbb3 100644 --- a/modules/curl/functions.c +++ b/modules/curl/functions.c @@ -181,7 +181,7 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, const } res |= curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, (long) params->verify_peer); - res |= curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, (long) params->verify_host); + res |= curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, (long) params->verify_host?2:0); res |= curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long) 1); res |= curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long) params->timeout);

8 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016