aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2018-08-01 19:42:32 +0200
committerMicael Karlberg <[email protected]>2018-09-18 14:50:18 +0200
commit90a150771faa3cf01e82919b0c17854de9987783 (patch)
tree5ad6c69f9ec4e569bba3da11df10d379faaba537 /erts/doc
parent25c38eff5c1e8d4dc6325afa62031874e23262dc (diff)
downloadotp-90a150771faa3cf01e82919b0c17854de9987783.tar.gz
otp-90a150771faa3cf01e82919b0c17854de9987783.tar.bz2
otp-90a150771faa3cf01e82919b0c17854de9987783.zip
[socket-nif] Processing of more cmsg headers
Added processing or more cmsg headers (for more options). Now (also) supports: socket:timestamp. Also various fixes and cleanups. For some reason calling getopt(Sock, 0, {13, int}) (or similar) fails with badarg even though the nif-function (nif_getopt) actually returns a valid value (for instance: {ok, 0}). OTP-14831
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/socket.xml26
-rw-r--r--erts/doc/src/socket_usage.xml2
2 files changed, 26 insertions, 2 deletions
diff --git a/erts/doc/src/socket.xml b/erts/doc/src/socket.xml
index 53d1516f1e..2fb922408b 100644
--- a/erts/doc/src/socket.xml
+++ b/erts/doc/src/socket.xml
@@ -120,7 +120,7 @@
<name name="timeval"/>
</datatype>
<datatype>
- <name name="ip_tos_flag"/>
+ <name name="ip_tos"/>
</datatype>
<datatype>
<name name="ip_mreq"/>
@@ -138,6 +138,9 @@
<name name="ip_msfilter"/>
</datatype>
<datatype>
+ <name name="ip_pktinfo"/>
+ </datatype>
+ <datatype>
<name name="ipv6_mreq"/>
</datatype>
<datatype>
@@ -156,6 +159,27 @@
<name name="sctp_rtoinfo"/>
</datatype>
<datatype>
+ <name name="msghdr_flag"/>
+ </datatype>
+ <datatype>
+ <name name="msghdr_flags"/>
+ </datatype>
+ <datatype>
+ <name name="msghdr"/>
+ </datatype>
+ <datatype>
+ <name name="cmsghdr_level"/>
+ </datatype>
+ <datatype>
+ <name name="cmsghdr_type"/>
+ </datatype>
+ <datatype>
+ <name name="cmsghdr_data"/>
+ </datatype>
+ <datatype>
+ <name name="cmsghdr"/>
+ </datatype>
+ <datatype>
<name name="uint16"/>
</datatype>
<datatype>
diff --git a/erts/doc/src/socket_usage.xml b/erts/doc/src/socket_usage.xml
index 933341bd35..b7459e97fa 100644
--- a/erts/doc/src/socket_usage.xml
+++ b/erts/doc/src/socket_usage.xml
@@ -444,7 +444,7 @@
<cell>ip_tos()</cell>
<cell>yes</cell>
<cell>yes</cell>
- <cell>may require admin capability</cell>
+ <cell>some high-priority levels may require superuser capability</cell>
</row>
<row>
<cell>transparent</cell>