diff options
| author | Erlang/OTP <[email protected]> | 2014-10-23 10:53:04 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-10-23 10:53:04 +0200 |
| commit | c530f3d4f851ab3844b67e4ccfbe724910bed4bd (patch) | |
| tree | 64cabc24e1492c4efe434f7ef120561bc630dac4 /lib/ssh/src/ssh_acceptor.erl | |
| parent | 5d49d05c3604f764736b10cfb287818d4b41efda (diff) | |
| parent | b7f24722a7346ae48b2d8d7a29dea9d381e669b7 (diff) | |
| download | otp-c530f3d4f851ab3844b67e4ccfbe724910bed4bd.tar.gz otp-c530f3d4f851ab3844b67e4ccfbe724910bed4bd.tar.bz2 otp-c530f3d4f851ab3844b67e4ccfbe724910bed4bd.zip | |
Merge branch 'hans/ssh/scanning/OTP-12247' into maint-17
* hans/ssh/scanning/OTP-12247:
ssh: fix ssh.appup.src.
ssh: Corrected appup
ssh: fix .app and .appup errors
ssh: remove supervisors for crashed connection worker
ssh: Print supervisor tree (on demand).
ssh: prepare for release
ssh: avoid terminated but not deleted children to be counted.
ssh: simple info function (ssh_info:print/0).
ssh: Gracefully handle bad handshake messages
ssh: reduce amount of printouts
ssh: Fix port scanner problems
Diffstat (limited to 'lib/ssh/src/ssh_acceptor.erl')
| -rw-r--r-- | lib/ssh/src/ssh_acceptor.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl index 7302196674..6c443eeb9c 100644 --- a/lib/ssh/src/ssh_acceptor.erl +++ b/lib/ssh/src/ssh_acceptor.erl @@ -22,7 +22,8 @@ -module(ssh_acceptor). %% Internal application API --export([start_link/5]). +-export([start_link/5, + number_of_connections/1]). %% spawn export -export([acceptor_init/6, acceptor_loop/6]). @@ -140,5 +141,6 @@ handle_error(Reason) -> number_of_connections(SystemSup) -> length([X || {R,X,supervisor,[ssh_subsystem_sup]} <- supervisor:which_children(SystemSup), + is_pid(X), is_reference(R) ]). |