diff options
| author | Raimo Niskanen <[email protected]> | 2012-10-31 09:17:15 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-10-31 09:17:15 +0100 |
| commit | 0a42a8be1604a29bfefd62e54a2e8453e237fd73 (patch) | |
| tree | ba3754c1ab72ba52f31a7d8f06781cfa9d5eea87 /lib/kernel/src/gen_tcp.erl | |
| parent | 465be6cd854681093971c2bb0d678993168f4a3e (diff) | |
| parent | 7028c8e756129cbb7898798fc81a16de3625709f (diff) | |
| download | otp-0a42a8be1604a29bfefd62e54a2e8453e237fd73.tar.gz otp-0a42a8be1604a29bfefd62e54a2e8453e237fd73.tar.bz2 otp-0a42a8be1604a29bfefd62e54a2e8453e237fd73.zip | |
Merge branch 'raimo/IPV6_V6ONLY/OTP-8928'
* raimo/IPV6_V6ONLY/OTP-8928:
kernel: Document socket option ipv6_v6only
kernel: Add test cases for socket option ipv6_v6only
erts,kernel: Implement socket option ipv6_v6only in erlang code
erts: Implement socket option IPV6_V6ONLY
erts: Add configure test for IPV6_V6ONLY
Diffstat (limited to 'lib/kernel/src/gen_tcp.erl')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index e6dfdadb03..22e6aa5bc8 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -57,7 +57,8 @@ {send_timeout, non_neg_integer() | infinity} | {send_timeout_close, boolean()} | {sndbuf, non_neg_integer()} | - {tos, non_neg_integer()}. + {tos, non_neg_integer()} | + {ipv6_v6only, boolean()}. -type option_name() :: active | buffer | @@ -85,7 +86,8 @@ send_timeout | send_timeout_close | sndbuf | - tos. + tos | + ipv6_v6only. -type connect_option() :: {ip, inet:ip_address()} | {fd, Fd :: non_neg_integer()} | |