diff options
| author | Hans Nilsson <[email protected]> | 2018-04-26 11:50:11 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-27 10:30:25 +0200 |
| commit | d2f4de0a8e36e6a25cfd7446ea6fc3623b7f1495 (patch) | |
| tree | a8008982b59d5870118a4e1d328536b71c2e679b /lib/ssh/src/ssh_connection.erl | |
| parent | 8b50978cdc82d404f68384e1aadf7685a9d86af4 (diff) | |
| download | otp-d2f4de0a8e36e6a25cfd7446ea6fc3623b7f1495.tar.gz otp-d2f4de0a8e36e6a25cfd7446ea6fc3623b7f1495.tar.bz2 otp-d2f4de0a8e36e6a25cfd7446ea6fc3623b7f1495.zip | |
ssh: ssh_daemon_channel replaced by ssh_server_channel
Diffstat (limited to 'lib/ssh/src/ssh_connection.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index 0a07ea778d..cff9ec3a61 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -822,14 +822,14 @@ start_channel(Cb, Id, Args, SubSysSup, Exec, Opts) -> ChannelSup = ssh_subsystem_sup:channel_supervisor(SubSysSup), case max_num_channels_not_exceeded(ChannelSup, Opts) of true -> - ssh_daemon_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec); + ssh_server_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec); false -> throw(max_num_channels_exceeded) end. max_num_channels_not_exceeded(ChannelSup, Opts) -> MaxNumChannels = ?GET_OPT(max_channels, Opts), - NumChannels = length([x || {_,_,worker,[ssh_daemon_channel]} <- + NumChannels = length([x || {_,_,worker,[ssh_server_channel]} <- supervisor:which_children(ChannelSup)]), %% Note that NumChannels is BEFORE starting a new one NumChannels < MaxNumChannels. |