diff options
| author | Hans Nilsson <[email protected]> | 2018-04-27 10:31:01 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-27 10:31:01 +0200 |
| commit | 82ac72abf72c25fb092486e50ddac700bec17341 (patch) | |
| tree | 06b0de823c66c64ade945049d30c5cbda854bd9f /lib/ssh/src/ssh.erl | |
| parent | 56e88f364a32b471b03e2364c2eb84783642ad88 (diff) | |
| parent | c2ca477c85e0e88732f634ddfb01ac675a97dddb (diff) | |
| download | otp-82ac72abf72c25fb092486e50ddac700bec17341.tar.gz otp-82ac72abf72c25fb092486e50ddac700bec17341.tar.bz2 otp-82ac72abf72c25fb092486e50ddac700bec17341.zip | |
Merge branch 'hans/ssh/channel_maintenance/OTP-15041'
* hans/ssh/channel_maintenance/OTP-15041:
ssh: ssh_channel replaced by ssh_client_channel
ssh: ssh_daemon_channel replaced by ssh_server_channel
ssh: Use ssh_daemon_channel_sup and ssh_damon_channel
ssh: Create doc for the ssh_daemon_channel behaviour
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 209f53d249..7ddb1ca5be 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -426,9 +426,9 @@ start_shell({ok, ConnectionRef}) -> Args = [{channel_cb, ssh_shell}, {init_args,[ConnectionRef, ChannelId]}, {cm, ConnectionRef}, {channel_id, ChannelId}], - {ok, State} = ssh_channel:init([Args]), + {ok, State} = ssh_client_channel:init([Args]), try - ssh_channel:enter_loop(State) + ssh_client_channel:enter_loop(State) catch exit:normal -> ok |