diff options
| author | Ulf Wiger <ulf@feuerlabs.com> | 2016-02-08 18:36:15 +0100 |
|---|---|---|
| committer | Ulf Wiger <ulf@feuerlabs.com> | 2016-02-09 22:11:57 +0100 |
| commit | 5929d0cd60dee38226b43316101f30e17d1c4bcb (patch) | |
| tree | 076211d03c015b39cf73b5f8c5f05e037539ad5f /components | |
| parent | 83e57a5094f212caca239b33f4b4e120e10c8fa9 (diff) | |
| download | rvi_core-5929d0cd60dee38226b43316101f30e17d1c4bcb.tar.gz | |
minor bug fixes & tests for tls/noverify
Diffstat (limited to 'components')
| -rw-r--r-- | components/dlink_tls/src/dlink_tls_conn.erl | 5 | ||||
| -rw-r--r-- | components/dlink_tls/src/dlink_tls_rpc.erl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/components/dlink_tls/src/dlink_tls_conn.erl b/components/dlink_tls/src/dlink_tls_conn.erl index 447581d..4629e55 100644 --- a/components/dlink_tls/src/dlink_tls_conn.erl +++ b/components/dlink_tls/src/dlink_tls_conn.erl @@ -421,12 +421,13 @@ do_upgrade(Sock, client, CompSpec) -> ?debug("TLS Opts = ~p", [Opts]), {DoVerify, ssl:connect(Sock, Opts)}; do_upgrade(Sock, server, CompSpec) -> - {DoVerify, Opts} = tls_opts(client, CompSpec), + {DoVerify, Opts} = tls_opts(server, CompSpec), ?debug("TLS Opts = ~p", [Opts]), {DoVerify, ssl:ssl_accept(Sock, Opts)}. tls_opts(Role, CompSpec) -> - TlsOpts = rvi_common:get_value(tls_opts, [], CompSpec), + {ok, ServerOpts} = get_module_config(server_opts, [], CompSpec), + TlsOpts = rvi_common:get_value(tls_opts, ServerOpts, CompSpec), Opt = fun(K) -> opt(K, TlsOpts, fun() -> ok(setup:get_env(rvi_core, K)) diff --git a/components/dlink_tls/src/dlink_tls_rpc.erl b/components/dlink_tls/src/dlink_tls_rpc.erl index 014d854..6a90129 100644 --- a/components/dlink_tls/src/dlink_tls_rpc.erl +++ b/components/dlink_tls/src/dlink_tls_rpc.erl @@ -222,7 +222,7 @@ connect_remote(IP, Port, CompSpec) -> not_found -> %% Setup a new outbound connection {ok, Timeout} = rvi_common:get_module_config( - dlink_tls, ?MODULE, connect_timeout, 10000, CompSpec), + data_link, ?MODULE, connect_timeout, 10000, CompSpec), ?info("dlink_tls:connect_remote(): Connecting ~p:~p (TO=~p", [IP, Port, Timeout]), log("new connection", [], CompSpec), |