aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2018-07-20 12:28:19 +0200
committerMicael Karlberg <[email protected]>2018-09-18 14:50:18 +0200
commit3f1d17f3031b71ca6ff1f8e051859ad55e55822b (patch)
tree3939712ac67454970e3fa3501705aa5e9cd4ede5 /erts/doc
parentbd36af21717b138c91724128e592b3fc587bb07a (diff)
downloadotp-3f1d17f3031b71ca6ff1f8e051859ad55e55822b.tar.gz
otp-3f1d17f3031b71ca6ff1f8e051859ad55e55822b.tar.bz2
otp-3f1d17f3031b71ca6ff1f8e051859ad55e55822b.zip
[socket-nif] Add support for socket (level socket) option(s) [rcv|snd]timeo
Added support for socket level socket option RCVTIMEO and SNDTIMEO. These are both a little strange, at least on linux. See the man pages for more info. OTP-14831
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/socket.xml9
-rw-r--r--erts/doc/src/socket_usage.xml18
2 files changed, 25 insertions, 2 deletions
diff --git a/erts/doc/src/socket.xml b/erts/doc/src/socket.xml
index fe23eaa138..14a21823b8 100644
--- a/erts/doc/src/socket.xml
+++ b/erts/doc/src/socket.xml
@@ -117,6 +117,9 @@
<name name="sctp_socket_option"/>
</datatype>
<datatype>
+ <name name="timeval"/>
+ </datatype>
+ <datatype>
<name name="ip_tos_flag"/>
</datatype>
<datatype>
@@ -146,6 +149,12 @@
<datatype>
<name name="sctp_rtoinfo"/>
</datatype>
+ <datatype>
+ <name name="uint16"/>
+ </datatype>
+ <datatype>
+ <name name="uint32"/>
+ </datatype>
</datatypes>
<funcs>
diff --git a/erts/doc/src/socket_usage.xml b/erts/doc/src/socket_usage.xml
index e90e682e39..221561c3e2 100644
--- a/erts/doc/src/socket_usage.xml
+++ b/erts/doc/src/socket_usage.xml
@@ -114,7 +114,7 @@
<cell>integer()</cell>
<cell>yes</cell>
<cell>yes</cell>
- <cell>may require admin capability</cell>
+ <cell>require admin capability</cell>
</row>
<row>
<cell>domain</cell>
@@ -174,7 +174,14 @@
</row>
<row>
<cell>rcvbuf</cell>
- <cell>integer()</cell>
+ <cell>non_neg_integer()</cell>
+ <cell>yes</cell>
+ <cell>yes</cell>
+ <cell>none</cell>
+ </row>
+ <row>
+ <cell>rcvtimeo</cell>
+ <cell>timeval()</cell>
<cell>yes</cell>
<cell>yes</cell>
<cell>none</cell>
@@ -200,6 +207,13 @@
<cell>yes</cell>
<cell>none</cell>
</row>
+ <row>
+ <cell>sndtimeo</cell>
+ <cell>timeval()</cell>
+ <cell>yes</cell>
+ <cell>yes</cell>
+ <cell>none</cell>
+ </row>
</table>
<p>Options for level <c>ip</c>: </p>