diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-11-14 10:33:11 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-11-14 10:33:11 +0100 |
| commit | 19aedb5c0cb956e51b24fbba4923520efe7bf54b (patch) | |
| tree | 5f38b856389ccfb43c83b7be5e33529b699e6574 /lib/ssh/src/ssh_connect.hrl | |
| parent | c46240c78fbce1b8b026f975d80b397209ac4968 (diff) | |
| parent | 7efe1b6dd3215261777b5f335b4f92dfca7cea42 (diff) | |
| download | otp-19aedb5c0cb956e51b24fbba4923520efe7bf54b.tar.gz otp-19aedb5c0cb956e51b24fbba4923520efe7bf54b.tar.bz2 otp-19aedb5c0cb956e51b24fbba4923520efe7bf54b.zip | |
Merge branch 'ia/ssh/one-connection-process/OTP-11363' into maint
* ia/ssh/one-connection-process/OTP-11363:
ssh: Logging fun and document enhancement
ssh: Add CLI test case
ssh: Quicker shutdown of an ssh dameon
ssh: Add option to disallow CLI
ssh: Simplify handling of connection attributes (e.i. user and sockname)
ssh: Make inet option configurable and remove ipv6_disabled option
ssh: Eliminate test case failure due to timing issues in test case code
ssh: Enhance error handling
ssh: Merge connection_manager and connection_handler processes
ssh: Remove use of process dictionary
Diffstat (limited to 'lib/ssh/src/ssh_connect.hrl')
| -rw-r--r-- | lib/ssh/src/ssh_connect.hrl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl index 932b0642f1..8421b07167 100644 --- a/lib/ssh/src/ssh_connect.hrl +++ b/lib/ssh/src/ssh_connect.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2012. All Rights Reserved. +%% Copyright Ericsson AB 2005-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -21,6 +21,8 @@ %%% Description : SSH connection protocol +-type channel_id() :: integer(). + -define(DEFAULT_PACKET_SIZE, 32768). -define(DEFAULT_WINDOW_SIZE, 2*?DEFAULT_PACKET_SIZE). -define(DEFAULT_TIMEOUT, 5000). @@ -260,6 +262,7 @@ port, options, exec, + system_supervisor, sub_system_supervisor, connection_supervisor }). |