diff options
author | Micael Karlberg <[email protected]> | 2019-03-18 17:13:08 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2019-03-18 17:13:08 +0100 |
commit | f972ddc263b95346ba88aca171d59f1ee2adfa69 (patch) | |
tree | 80d9b79e85db9d9a1adf771d3a87ba9e3bf6b20a | |
parent | 1c329d9b3600356caf75636df7fd40eb8221c43d (diff) | |
download | otp-f972ddc263b95346ba88aca171d59f1ee2adfa69.tar.gz otp-f972ddc263b95346ba88aca171d59f1ee2adfa69.tar.bz2 otp-f972ddc263b95346ba88aca171d59f1ee2adfa69.zip |
[kernel|test] IPV6 adjustments
-rw-r--r-- | lib/kernel/test/gen_sctp_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl index a0ae792ba9..e4c489bd10 100644 --- a/lib/kernel/test/gen_sctp_SUITE.erl +++ b/lib/kernel/test/gen_sctp_SUITE.erl @@ -1459,11 +1459,11 @@ do_open_and_connect(ServerAddresses, AddressToConnectTo) -> do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun). %% do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) -> - ServerFamily = get_family_by_addrs(ServerAddresses), + {ServerFamily, ServerOpts} = get_family_by_addrs(ServerAddresses), io:format("Serving ~p addresses: ~p~n", [ServerFamily, ServerAddresses]), S1 = ok(gen_sctp:open(0, [{ip,Addr} || Addr <- ServerAddresses] ++ - [ServerFamily])), + [ServerFamily|ServerOpts])), ok = gen_sctp:listen(S1, true), P1 = ok(inet:port(S1)), ClientFamily = get_family_by_addr(AddressToConnectTo), @@ -1493,9 +1493,9 @@ do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) -> %% If at least one of the addresses is an ipv6 address, return inet6, else inet. get_family_by_addrs(Addresses) -> case lists:usort([get_family_by_addr(Addr) || Addr <- Addresses]) of - [inet, inet6] -> inet6; - [inet] -> inet; - [inet6] -> inet6 + [inet, inet6] -> {inet6, [{ipv6_v6only, false}]}; + [inet] -> {inet, []}; + [inet6] -> {inet6, []} end. get_family_by_addr(Addr) when tuple_size(Addr) =:= 4 -> inet; |