diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-12-14 09:44:10 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-12-14 09:44:10 +0100 |
| commit | 70892a1e03e441b24f879a9bb5f124defbab2e16 (patch) | |
| tree | deb09395eec02ee31efda4415070113a29d89128 /lib/ssh/test | |
| parent | 33124ad120c10e5057f25753a9d4b56f265b53dd (diff) | |
| parent | 671cf55d2388ef3c30f8e0e6b3e5ec824b02da09 (diff) | |
| download | otp-70892a1e03e441b24f879a9bb5f124defbab2e16.tar.gz otp-70892a1e03e441b24f879a9bb5f124defbab2e16.tar.bz2 otp-70892a1e03e441b24f879a9bb5f124defbab2e16.zip | |
Merge branch 'ia/ssh/add_users_guide/OTP-7786'
* ia/ssh/add_users_guide/OTP-7786:
ssh: Document and clean up SSH behaviours
ssh: Add Users Guide and enhance man pages
ssh: Added User's Guide framework and minor enhancements
Diffstat (limited to 'lib/ssh/test')
| -rw-r--r-- | lib/ssh/test/ssh_echo_server.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_echo_server.erl b/lib/ssh/test/ssh_echo_server.erl index 739aabe6fb..007b00c373 100644 --- a/lib/ssh/test/ssh_echo_server.erl +++ b/lib/ssh/test/ssh_echo_server.erl @@ -21,7 +21,7 @@ %%% Description: Example ssh server -module(ssh_echo_server). --behaviour(ssh_channel). +-behaviour(ssh_subsytem). -record(state, { n, id, @@ -50,7 +50,7 @@ handle_ssh_msg({ssh_cm, CM, {data, ChannelId, 0, Data}}, #state{n = N} = State) end; handle_ssh_msg({ssh_cm, _ConnectionManager, {data, _ChannelId, 1, Data}}, State) -> - error_logger:format("ssh: STDERR: ~s\n", [binary_to_list(Data)]), + error_logger:format(standard_error, " ~p~n", [binary_to_list(Data)]), {ok, State}; handle_ssh_msg({ssh_cm, _ConnectionManager, {eof, _ChannelId}}, State) -> |