diff options
| author | Raimo Niskanen <[email protected]> | 2018-09-17 15:42:01 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-09-17 15:42:01 +0200 |
| commit | d6a08843e473da6eebbab0b0e7312efc978108ee (patch) | |
| tree | f5069e18553ae965852bb3ae36005e03788611d6 /lib/kernel/src/gen_tcp.erl | |
| parent | 0aeb5144e03637698e261d49696e5cadfa537dd0 (diff) | |
| parent | 6053725bb54f7302d3698d0df100eb01c4df4f12 (diff) | |
| download | otp-d6a08843e473da6eebbab0b0e7312efc978108ee.tar.gz otp-d6a08843e473da6eebbab0b0e7312efc978108ee.tar.bz2 otp-d6a08843e473da6eebbab0b0e7312efc978108ee.zip | |
Merge branch 'raimo/receive-TOS-TCLASS/ERIERL-187/OTP-15145' into maint
* raimo/receive-TOS-TCLASS/ERIERL-187/OTP-15145:
Write testcases for recvtos and friends
Fix term buffer overflow bug
Fix documentation due to feedback
Implement socket option recvtos and friends
Diffstat (limited to 'lib/kernel/src/gen_tcp.erl')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index c61411e814..7f7833ec23 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -62,7 +62,14 @@ {show_econnreset, boolean()} | {sndbuf, non_neg_integer()} | {tos, non_neg_integer()} | + {tclass, non_neg_integer()} | + {ttl, non_neg_integer()} | + {recvtos, boolean()} | + {recvtclass, boolean()} | + {recvttl, boolean()} | {ipv6_v6only, boolean()}. +-type pktoptions_value() :: + {pktoptions, inet:ancillary_data()}. -type option_name() :: active | buffer | @@ -81,6 +88,7 @@ nodelay | packet | packet_size | + pktoptions | priority | {raw, Protocol :: non_neg_integer(), @@ -94,6 +102,12 @@ show_econnreset | sndbuf | tos | + tclass | + ttl | + recvtos | + recvtclass | + recvttl | + pktoptions | ipv6_v6only. -type connect_option() :: {ip, inet:socket_address()} | @@ -119,7 +133,7 @@ -type socket() :: port(). -export_type([option/0, option_name/0, connect_option/0, listen_option/0, - socket/0]). + socket/0, pktoptions_value/0]). %% %% Connect a socket |