aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-06-01 16:09:35 +0200
committerHans Nilsson <[email protected]>2016-06-01 18:59:22 +0200
commit3b769cfe66b81467d756fe670fe25e2fd984fdba (patch)
tree989aff103a1fd3ae2c4e499b9dbd7ab5548fa6fa /lib/ssh/doc/src
parentd7d109ca8ab68d7a62772305d543123233d4eea4 (diff)
downloadotp-3b769cfe66b81467d756fe670fe25e2fd984fdba.tar.gz
otp-3b769cfe66b81467d756fe670fe25e2fd984fdba.tar.bz2
otp-3b769cfe66b81467d756fe670fe25e2fd984fdba.zip
ssh: daemon taking open socket as input
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/ssh.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 501ca36b09..e6c54d27bf 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -351,8 +351,9 @@
<func>
<name>daemon(Port) -> </name>
<name>daemon(Port, Options) -> </name>
- <name>daemon(HostAddress, Port, Options) -> {ok,
- ssh_daemon_ref()} | {error, atom()}</name>
+ <name>daemon(HostAddress, Port, Options) -> </name>
+ <name>daemon(TcpSocket) -> </name>
+ <name>daemon(TcpSocket, Options) -> {ok, ssh_daemon_ref()} | {error, atom()}</name>
<fsummary>Starts a server listening for SSH connections
on the given port.</fsummary>
<type>
@@ -361,6 +362,8 @@
<v>Options = [{Option, Value}]</v>
<v>Option = atom()</v>
<v>Value = term()</v>
+ <v>TcpSocket = port()</v>
+ <d>The socket is supposed to be from <seealso marker="kernel:gen_tcp#connect-3">gen_tcp:connect</seealso> or <seealso marker="kernel:gen_tcp#accept-1">gen_tcp:accept</seealso> with option <c>{active,false}</c></d>
</type>
<desc>
<p>Starts a server listening for SSH connections on the given