diff options
| author | Raimo Niskanen <[email protected]> | 2016-06-09 09:27:05 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-06-09 09:27:05 +0200 |
| commit | 2da08a037e4315a1010769b22610ca81462d813d (patch) | |
| tree | ce14def3320bcbdf897a4a7a4a52f65db490c8d4 /lib/kernel/src/gen_tcp.erl | |
| parent | 7f2a5750d896febf39a51c488f57c4235e34a040 (diff) | |
| parent | 16e895198a541ccbbbe6c970bd9572cf347a9c77 (diff) | |
| download | otp-2da08a037e4315a1010769b22610ca81462d813d.tar.gz otp-2da08a037e4315a1010769b22610ca81462d813d.tar.bz2 otp-2da08a037e4315a1010769b22610ca81462d813d.zip | |
Merge branch 'raimo/uds-support/OTP-13643'
* raimo/uds-support/OTP-13643:
Document the local (unix) address family
Remove internal state BOUND from inet_drv
Diffstat (limited to 'lib/kernel/src/gen_tcp.erl')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index 2b3afcd44c..1a21541b7c 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -96,17 +96,17 @@ tos | ipv6_v6only. -type connect_option() :: - {ip, inet:ip_address()} | + {ip, inet:socket_address()} | {fd, Fd :: non_neg_integer()} | - {ifaddr, inet:ip_address()} | + {ifaddr, inet:socket_address()} | inet:address_family() | {port, inet:port_number()} | {tcp_module, module()} | option(). -type listen_option() :: - {ip, inet:ip_address()} | + {ip, inet:socket_address()} | {fd, Fd :: non_neg_integer()} | - {ifaddr, inet:ip_address()} | + {ifaddr, inet:socket_address()} | inet:address_family() | {port, inet:port_number()} | {backlog, B :: non_neg_integer()} | @@ -122,7 +122,7 @@ %% -spec connect(Address, Port, Options) -> {ok, Socket} | {error, Reason} when - Address :: inet:ip_address() | inet:hostname(), + Address :: inet:socket_address() | inet:hostname(), Port :: inet:port_number(), Options :: [connect_option()], Socket :: socket(), @@ -133,7 +133,7 @@ connect(Address, Port, Opts) -> -spec connect(Address, Port, Options, Timeout) -> {ok, Socket} | {error, Reason} when - Address :: inet:ip_address() | inet:hostname(), + Address :: inet:socket_address() | inet:hostname(), Port :: inet:port_number(), Options :: [connect_option()], Timeout :: timeout(), |