diff --git a/man7/ip.7 b/man7/ip.7 index 21ac3ba32..e367833aa 100644 --- a/man7/ip.7 +++ b/man7/ip.7 @@ -654,7 +654,7 @@ files or using the interface. .\" .TP -.B ip_always_defrag " (Boolean)" +.BR ip_always_defrag " (Boolean)" [New with kernel 2.2.13; in earlier kernel version the feature was controlled at compile time by the .B CONFIG_IP_ALWAYS_DEFRAG @@ -737,7 +737,6 @@ Time in seconds to keep an IPv6 fragment in memory. .BR ip6frag_secret_interval " (integer; default 600)" Regeneration interval (in seconds) of the hash secret (or lifetime for the hash secret) for IPv6 fragments. -Default: 600 .TP .BR ipfrag_high_thresh " (integer), " ipfrag_low_thresh " (integer)" If the amount of queued IP fragments reaches diff --git a/man7/tcp.7 b/man7/tcp.7 index 867578d20..06b5e7f57 100644 --- a/man7/tcp.7 +++ b/man7/tcp.7 @@ -121,7 +121,9 @@ ioctl), otherwise it can be only received when the .B MSG_OOB flag is set for -.BR sendmsg (2). +.BR recv (2) +or +.BR recvmsg (2). Linux 2.4 introduced a number of changes for improved throughput and scaling, as well as enhanced functionality. @@ -691,15 +693,24 @@ is returned. Returns true (i.e., .I value is non-zero) if the inbound data stream is at the urgent mark. -This is normally used together with -.BR SO_OOBINLINE : -if +.sp +If the +.BR SO_OOBINLINE +socket option is set, and .B SIOCATMARK -indicates we are at the urgent mark, then the +returns true, then the next read from the socket will return the urgent data. -Note that When -.B SO_OOBINLINE -is set, a read never reads across the urgent mark. +If the +.BR SO_OOBINLINE +socket option is not set, and +.B SIOCATMARK +returns true, then the +next read from the socket will return the bytes following +the urgent data (to actually read the urgent data requires the +.B recv(MSG_OOB) +flag). +.sp +Note that a read never reads across the urgent mark. A program can thus advance up to the mark by performing reads (requesting any number of bytes) and testing .B SIOCATMARK