File 1702-ssh-code-reformatted.patch of Package erlang
From 1af0f846b7cce0d3679862dfe08ed66aa31c9f8d Mon Sep 17 00:00:00 2001
From: Jakub Witczak <kuba@erlang.org>
Date: Mon, 21 Oct 2024 11:31:38 +0200
Subject: [PATCH 2/3] ssh: code reformatted
---
lib/ssh/src/ssh.erl | 16 ++--------------
lib/ssh/src/ssh_acceptor.erl | 2 +-
lib/ssh/src/ssh_acceptor_sup.erl | 2 +-
lib/ssh/test/ssh_basic_SUITE.erl | 7 +------
lib/ssh/test/ssh_protocol_SUITE.erl | 3 ---
5 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 8efbe54342..fdff8042eb 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -553,13 +553,10 @@ daemon(Socket, UserOptions) ->
{error,SockError} ->
{error,SockError}
end;
-
{error,OptionError} ->
{error,OptionError}
end.
-
-
-doc """
daemon(HostAddress, Port, Options)
@@ -590,8 +587,7 @@ The rules for handling the two address passing options are:
is set to the value of the 'ip'-option
""".
-spec daemon(any | inet:ip_address(), inet:port_number(), daemon_options()) -> {ok,daemon_ref()} | {error,term()}
- ;(socket, open_socket(), daemon_options()) -> {ok,daemon_ref()} | {error,term()}
- .
+ ;(socket, open_socket(), daemon_options()) -> {ok,daemon_ref()} | {error,term()}.
daemon(Host0, Port0, UserOptions0)
when 0 =< Port0, Port0 =< 65535, Host0 == any ;
@@ -642,7 +638,6 @@ daemon(Host0, Port0, UserOptions0)
OptionError = {error,_} ->
OptionError
end;
-
daemon(_, _, _) ->
{error, badarg}.
@@ -1225,13 +1220,11 @@ fp_fmt(b64, Bin) ->
%%--------------------------------------------------------------------
%% The handle_daemon_args/2 function basically only sets the ip-option in Opts
%% so that it is correctly set when opening the listening socket.
-
handle_daemon_args(any, Opts) ->
case proplists:get_value(ip, Opts) of
undefined -> {any, Opts};
IP -> {IP, Opts}
end;
-
handle_daemon_args(IPaddr, Opts) when is_tuple(IPaddr) ; IPaddr == loopback ->
case proplists:get_value(ip, Opts) of
undefined -> {IPaddr, [{ip,IPaddr}|Opts]};
@@ -1239,7 +1232,6 @@ handle_daemon_args(IPaddr, Opts) when is_tuple(IPaddr) ; IPaddr == loopback ->
IP -> {IPaddr, [{ip,IPaddr}|Opts--[{ip,IP}]]} %% Backward compatibility
end.
-%%%----------------------------------------------------------------
valid_socket_to_use(Socket, {tcp,_,_}) ->
%% Is this tcp-socket a valid socket?
try {is_tcp_socket(Socket),
@@ -1274,15 +1266,13 @@ close_listen_socket(ListenSocket, Options) ->
transport_connect(Host, Port, SocketOpts, Options) ->
{_, Callback, _} = ?GET_OPT(transport, Options),
Callback:connect(Host, Port, SocketOpts, ?GET_OPT(connect_timeout,Options)).
-
-%%%----------------------------------------------------------------
+
-doc false.
is_host(X, Opts) ->
try is_host1(mangle_connect_address(X, Opts))
catch
_:_ -> false
end.
-
is_host1(L) when is_list(L) -> true; %% "string()"
is_host1(T) when tuple_size(T)==4 -> lists:all(fun(I) -> 0=<I andalso I=<255 end,
@@ -1291,7 +1281,6 @@ is_host1(T) when tuple_size(T)==16 -> lists:all(fun(I) -> 0=<I andalso I=<65535
tuple_to_list(T));
is_host1(loopback) -> true.
-%%%----------------------------------------------------------------
mangle_connect_address(A, #{socket_options := SockOpts}) ->
mangle_connect_address(A, SockOpts);
mangle_connect_address(A, SockOpts) ->
@@ -1312,7 +1301,6 @@ mangle_connect_address1(A, _) ->
_ -> A
end.
-%%%----------------------------------------------------------------
mangle_tunnel_address(any) -> <<"">>;
mangle_tunnel_address(loopback) -> <<"localhost">>;
mangle_tunnel_address({0,0,0,0}) -> <<"">>;
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index 60a0f52c46..62528d2e71 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -29,7 +29,7 @@
-export([start_link/3,
number_of_connections/1]).
-%% spawn export
+%% spawn export
-export([acceptor_init/4, acceptor_loop/6]).
-behaviour(ssh_dbg).
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl
index 74fb5ed71c..9b710dc44c 100644
--- a/lib/ssh/src/ssh_acceptor_sup.erl
+++ b/lib/ssh/src/ssh_acceptor_sup.erl
@@ -20,7 +20,7 @@
%%
%%----------------------------------------------------------------------
-%% Purpose: The acceptor supervisor for ssh servers hangs under
+%% Purpose: The acceptor supervisor for ssh servers hangs under
%% ssh_system_sup.
%%----------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index d889bcabf0..c41a200f30 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -136,13 +136,9 @@ groups() ->
known_hosts,
ssh_file_is_host_key,
ssh_file_is_host_key_misc,
- ssh_file_is_auth_key
- ]},
-
+ ssh_file_is_auth_key]},
{key_cb, [?PARALLEL], [key_callback, key_callback_options]},
-
{internal_error, [?PARALLEL], [internal_error]},
-
{login_bad_pwd_no_retry, [?PARALLEL], [login_bad_pwd_no_retry1,
login_bad_pwd_no_retry2,
login_bad_pwd_no_retry3,
@@ -1520,7 +1516,6 @@ check_error(Error) -> ct:fail(Error).
basic_test(Config) ->
ClientOpts = proplists:get_value(client_opts, Config),
ServerOpts = proplists:get_value(server_opts, Config),
-
{Pid, Host, Port} = ssh_test_lib:daemon(ServerOpts),
CM = ssh_test_lib:connect(Host, Port, ClientOpts),
ok = ssh:close(CM),
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index 5e685aaeb4..58d1b7c310 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -1002,9 +1002,7 @@ client_close_after_hello(Config0) ->
]},
{send, hello}
]) || _ <- lists:seq(1,MaxSessions+100)],
-
ct:log("=== Tried to start ~p sessions.", [length(Cs)]),
-
ssh_info:print(fun ct:log/2),
{Parents, Conns, Handshakers} =
ssh_test_lib:find_handshake_parent(ssh_test_lib:server_port(Config)),
@@ -1161,7 +1159,6 @@ check_std_daemon_works(Config, Line) ->
server_user_password(Config) -> server_user_password(1, Config).
server_user_password(N, Config) -> lists:nth(N, ?v(user_passwords,Config)).
-
std_connect(Config) ->
std_connect({ssh_test_lib:server_host(Config),
--
2.43.0
