Software / code / prosody
Changeset
12409:9f0baf15e792
net.resolvers.basic: Alternate IP address family targets, per RFC 8305
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 18 Mar 2022 16:10:26 +0000 |
| parents | 12408:acfc51b9530c |
| children | 12410:596625eed326 |
| files | net/resolvers/basic.lua |
| diffstat | 1 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/resolvers/basic.lua Fri Mar 18 16:09:22 2022 +0000 +++ b/net/resolvers/basic.lua Fri Mar 18 16:10:26 2022 +0000 @@ -42,8 +42,16 @@ local function merge_targets(ipv4_targets, ipv6_targets) local result = { secure = ipv4_targets.secure and ipv6_targets.secure }; - t_move(ipv6_targets, 1, #ipv6_targets, 1, result); - t_move(ipv4_targets, 1, #ipv4_targets, #result+1, result); + local common_length = math.min(#ipv4_targets, #ipv6_targets); + for i = 1, common_length do + table.insert(result, ipv6_targets[i]); + table.insert(result, ipv4_targets[i]); + end + if common_length < #ipv4_targets then + t_move(ipv4_targets, common_length+1, #ipv4_targets, common_length+1, result); + elseif common_length < #ipv6_targets then + t_move(ipv6_targets, common_length+1, #ipv6_targets, common_length+1, result); + end return result; end
