aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/src
diff options
context:
space:
mode:
Diffstat (limited to 'lib/orber/src')
-rw-r--r--lib/orber/src/orber.erl14
-rw-r--r--lib/orber/src/orber_env.erl26
-rw-r--r--lib/orber/src/orber_iiop_net.erl6
-rw-r--r--lib/orber/src/orber_iiop_pm.erl8
4 files changed, 27 insertions, 27 deletions
diff --git a/lib/orber/src/orber.erl b/lib/orber/src/orber.erl
index 4e43d42638..5ab240e046 100644
--- a/lib/orber/src/orber.erl
+++ b/lib/orber/src/orber.erl
@@ -36,7 +36,7 @@
-export([start/0, start/1, stop/0, install/1, install/2, orber_nodes/0, iiop_port/0,
domain/0, iiop_ssl_port/0, iiop_out_ports/0, iiop_out_ports_random/0,
iiop_out_ports_attempts/0,
- ssl_server_opts/0, ssl_client_opts/0, set_ssl_client_opts/1,
+ ssl_server_options/0, ssl_client_options/0, set_ssl_client_options/1,
ssl_server_certfile/0, ssl_client_certfile/0, set_ssl_client_certfile/1,
ssl_server_verify/0, ssl_client_verify/0, set_ssl_client_verify/1,
ssl_server_depth/0, ssl_client_depth/0, set_ssl_client_depth/1,
@@ -525,14 +525,14 @@ iiop_ssl_port() ->
nat_iiop_ssl_port() ->
orber_env:nat_iiop_ssl_port().
-ssl_server_opts() ->
- orber_env:ssl_server_opts().
+ssl_server_options() ->
+ orber_env:ssl_server_options().
-ssl_client_opts() ->
- orber_env:ssl_client_opts().
+ssl_client_options() ->
+ orber_env:ssl_client_options().
-set_ssl_client_opts(Value) ->
- orber_env:set_ssl_client_opts(Value).
+set_ssl_client_options(Value) ->
+ orber_env:set_ssl_client_options(Value).
ssl_server_certfile() ->
orber_env:ssl_server_certfile().
diff --git a/lib/orber/src/orber_env.erl b/lib/orber/src/orber_env.erl
index 8fb3908710..b96c4ea7de 100644
--- a/lib/orber/src/orber_env.erl
+++ b/lib/orber/src/orber_env.erl
@@ -51,7 +51,7 @@
get_local_interceptors/0, get_cached_interceptors/0,
set_interceptors/1, is_lightweight/0, get_lightweight_nodes/0, secure/0,
iiop_ssl_backlog/0, iiop_ssl_port/0, nat_iiop_ssl_port/0, nat_iiop_ssl_port/1,
- ssl_server_opts/0, ssl_client_opts/0, set_ssl_client_opts/1,
+ ssl_server_options/0, ssl_client_options/0, set_ssl_client_options/1,
ssl_server_certfile/0, ssl_client_certfile/0, set_ssl_client_certfile/1,
ssl_server_verify/0, ssl_client_verify/0, set_ssl_client_verify/1,
ssl_server_depth/0, ssl_client_depth/0, set_ssl_client_depth/1,
@@ -101,7 +101,7 @@
ssl_client_cachetimeout, ssl_server_cachetimeout, orber_debug_level,
iiop_packet_size, iiop_in_keepalive, iiop_out_keepalive,
iiop_ssl_in_keepalive, iiop_ssl_out_keepalive, iiop_ssl_accept_timeout,
- ssl_server_opts, ssl_client_opts]).
+ ssl_server_options, ssl_client_options]).
%% The 'flags' parameter must be first in the list.
%-define(ENV_KEYS,
@@ -926,16 +926,16 @@ nat_iiop_ssl_port(LocalPort) ->
-1
end.
-ssl_server_opts() ->
- case application:get_env(orber, ssl_server_opts) of
+ssl_server_options() ->
+ case application:get_env(orber, ssl_server_options) of
{ok, V1} when is_list(V1) ->
V1;
_ ->
[]
end.
-ssl_client_opts() ->
- case application:get_env(orber, ssl_client_opts) of
+ssl_client_options() ->
+ case application:get_env(orber, ssl_client_options) of
{ok, V1} when is_list(V1) ->
V1;
_ ->
@@ -961,16 +961,16 @@ check_ssl_opts([binary |T], Acc) ->
check_ssl_opts([_ |T], Acc) ->
check_ssl_opts(T, Acc).
-set_ssl_client_opts(Value) when is_list(Value) ->
+set_ssl_client_options(Value) when is_list(Value) ->
case check_ssl_opts(Value) of
ok ->
ok;
{error, List} ->
exit(lists:flatten(
- io_lib:format("TCP options ~p is not allowed in set_ssl_client_opts()",
+ io_lib:format("TCP options ~p is not allowed in set_ssl_client_options()",
[List])))
end,
- put(ssl_client_opts, Value), ok.
+ put(ssl_client_options, Value), ok.
ssl_server_certfile() ->
case application:get_env(orber, ssl_server_certfile) of
@@ -1369,10 +1369,10 @@ configure(iiop_ssl_port, Value, Status) when is_integer(Value) ->
do_safe_configure(iiop_ssl_port, Value, Status);
%% New SSL options
-configure(ssl_server_opts, Value, Status) when is_list(Value) ->
- do_safe_configure(ssl_server_opts, Value, Status);
-configure(ssl_client_opts, Value, Status) when is_list(Value) ->
- do_safe_configure(ssl_client_opts, Value, Status);
+configure(ssl_server_options, Value, Status) when is_list(Value) ->
+ do_safe_configure(ssl_server_options, Value, Status);
+configure(ssl_client_options, Value, Status) when is_list(Value) ->
+ do_safe_configure(ssl_client_options, Value, Status);
%% Old SSL options
configure(ssl_server_certfile, Value, Status) when is_list(Value) ->
diff --git a/lib/orber/src/orber_iiop_net.erl b/lib/orber/src/orber_iiop_net.erl
index 5620b5d94f..55caa5dd33 100644
--- a/lib/orber/src/orber_iiop_net.erl
+++ b/lib/orber/src/orber_iiop_net.erl
@@ -163,8 +163,8 @@ get_options(normal, _Options) ->
[];
get_options(ssl, Options) ->
SSLOpts =
- case orber_tb:keysearch(ssl_server_opts, Options,
- orber_env:ssl_server_opts()) of
+ case orber_tb:keysearch(ssl_server_options, Options,
+ orber_env:ssl_server_options()) of
[] ->
Verify = orber_tb:keysearch(ssl_server_verify, Options,
orber_env:ssl_server_verify()),
@@ -511,6 +511,6 @@ check_old_ssl_server_options(Options) ->
_:_ ->
io:format("hej\n",[]),
error_logger:warning_report([{application, orber},
- "Ignoring deprecated ssl server options used together with the ssl_server_opts"])
+ "Ignoring deprecated ssl server options used together with the ssl_server_options"])
end.
diff --git a/lib/orber/src/orber_iiop_pm.erl b/lib/orber/src/orber_iiop_pm.erl
index d86de36939..3c8c7a09f4 100644
--- a/lib/orber/src/orber_iiop_pm.erl
+++ b/lib/orber/src/orber_iiop_pm.erl
@@ -109,7 +109,7 @@ connect(Host, Port, SocketType, Timeout, Chars, Wchars, Ctx)
get_ssl_socket_options([]) ->
SSLOpts =
- case orber_env:ssl_client_opts() of
+ case orber_env:ssl_client_options() of
[] ->
[{verify, orber_env:ssl_client_verify()},
{depth, orber_env:ssl_client_depth()},
@@ -137,8 +137,8 @@ get_ssl_socket_options([#'IOP_ServiceContext'
{context_id=?ORBER_GENERIC_CTX_ID,
context_data = {configuration, Options}}|_]) ->
SSLOpts =
- case orber_tb:keysearch(ssl_client_opts, Options,
- orber_env:ssl_client_opts()) of
+ case orber_tb:keysearch(ssl_client_options, Options,
+ orber_env:ssl_client_options()) of
[] ->
Verify = orber_tb:keysearch(ssl_client_verify, Options,
orber_env:ssl_client_verify()),
@@ -878,7 +878,7 @@ check_old_ssl_client_options(Options) ->
catch
_:_ ->
error_logger:warning_report([{application, orber},
- "Ignoring deprecated ssl client options used together with the ssl_client_opts"])
+ "Ignoring deprecated ssl client options used together with the ssl_client_options"])
end.