aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2013-10-29 15:31:14 +0100
committerHans Nilsson <[email protected]>2013-10-29 15:31:14 +0100
commitf87482d310143b300d1f99783dc7125b4bb23c58 (patch)
tree19e435f63be17b80cbdd722d232a31f378106460 /lib/ssh/doc/src
parentbd2e7c90557b19ce9005fe03f0ded57efe1bbebc (diff)
parentdcd763ba7c4805361f435cc82d98335c2a59e1d1 (diff)
downloadotp-f87482d310143b300d1f99783dc7125b4bb23c58.tar.gz
otp-f87482d310143b300d1f99783dc7125b4bb23c58.tar.bz2
otp-f87482d310143b300d1f99783dc7125b4bb23c58.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/ssh.xml28
1 files changed, 28 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 1e361a4d64..4c0a63566d 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -334,6 +334,20 @@
</func>
<func>
+ <name>peername(ConnectionRef) -> {ok, {Address,Port}} | {error,Error} </name>
+ <fsummary> </fsummary>
+ <type>
+ <v> ConnectionRef = ssh_connection_ref()</v>
+ <v> Address = ip_address()</v>
+ <v> Port = integer()</v>
+ </type>
+ <desc>
+ <p>Returns the address and port for the other end of a connection.
+ </p>
+ </desc>
+ </func>
+
+ <func>
<name>shell(Host) -> </name>
<name>shell(Host, Option) -> </name>
<name>shell(Host, Port, Option) -> _</name>
@@ -353,6 +367,20 @@
</func>
<func>
+ <name>sockname(ConnectionRef) -> {ok, {Address,Port}} | {error,Error} </name>
+ <fsummary> </fsummary>
+ <type>
+ <v> ConnectionRef = ssh_connection_ref()</v>
+ <v> Address = ip_address()</v>
+ <v> Port = integer()</v>
+ </type>
+ <desc>
+ <p>Returns the local address and port number for a connection.
+ </p>
+ </desc>
+ </func>
+
+ <func>
<name>start() -> </name>
<name>start(Type) -> ok | {error, Reason}</name>
<fsummary>Starts the SSH application. </fsummary>