status-im
/
nim-chronos
mirror of https://github.com/status-im/nim-chronos.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix duplicates in getAddrInfo().

This commit is contained in:
cheatfate 2018-06-07 21:27:39 +03:00
parent 3842120217
commit 3ad36cc4c1
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
asyncdispatch2/transports/common.nim
View File

@ -167,21 +167,18 @@ proc resolveTAddress*(address: string,
## ##
## If hostname address is detected, then network address translation via DNS ## If hostname address is detected, then network address translation via DNS
## will be performed. ## will be performed.
var
ta: TransportAddress
ap: Port
result = newSeq[TransportAddress]() result = newSeq[TransportAddress]()
var parts = address.rsplit(":", maxsplit = 1) var parts = address.rsplit(":", maxsplit = 1)
doAssert(len(parts) == 2, "Format is <address>:<port>!") doAssert(len(parts) == 2, "Format is <address>:<port>!")
let port = parseInt(parts[1]) let port = parseInt(parts[1])
doAssert(port >= 0 and port < 65536, "Illegal port number!") doAssert(port >= 0 and port < 65536, "Illegal port number!")
if parts[0][0] == '[' and parts[0][^1] == ']': if parts[0][0] == '[' and parts[0][^1] == ']':
ta = TransportAddress(address: parseIpAddress(parts[0][1..^2]), let ta = TransportAddress(address: parseIpAddress(parts[0][1..^2]),
port: Port(port)) port: Port(port))
result.add(ta) result.add(ta)
else: else:
if isIpAddress(parts[0]): if isIpAddress(parts[0]):
ta = TransportAddress(address: parseIpAddress(parts[0]), let ta = TransportAddress(address: parseIpAddress(parts[0]),
port: Port(port)) port: Port(port))
result.add(ta) result.add(ta)
else: else:
@ -190,8 +187,12 @@ proc resolveTAddress*(address: string,
var aiList = getAddrInfo(parts[0], Port(port), domain) var aiList = getAddrInfo(parts[0], Port(port), domain)
var it = aiList var it = aiList
while it != nil: while it != nil:
var ta: TransportAddress
fromSockAddr(cast[ptr Sockaddr_storage](it.ai_addr)[], fromSockAddr(cast[ptr Sockaddr_storage](it.ai_addr)[],
SockLen(it.ai_addrlen), ta.address, ta.port) SockLen(it.ai_addrlen), ta.address, ta.port)
# For some reason getAddrInfo() sometimes returns duplicate addresses,
# for example getAddrInfo(`localhost`) returns `127.0.0.1` twice.
if ta notin result:
result.add(ta) result.add(ta)
it = it.ai_next it = it.ai_next
freeAddrInfo(aiList) freeAddrInfo(aiList)
@ -204,10 +205,9 @@ proc resolveTAddress*(address: string, port: Port,
## ##
## If hostname address is detected, then network address translation via DNS ## If hostname address is detected, then network address translation via DNS
## will be performed. ## will be performed.
var ta: TransportAddress
result = newSeq[TransportAddress]() result = newSeq[TransportAddress]()
if isIpAddress(address): if isIpAddress(address):
ta = TransportAddress(address: parseIpAddress(address), port: port) let ta = TransportAddress(address: parseIpAddress(address), port: port)
result.add(ta) result.add(ta)
else: else:
var domain = if family == IpAddressFamily.IPv4: Domain(AF_INET) else: var domain = if family == IpAddressFamily.IPv4: Domain(AF_INET) else:
@ -215,8 +215,12 @@ proc resolveTAddress*(address: string, port: Port,
var aiList = getAddrInfo(address, port, domain) var aiList = getAddrInfo(address, port, domain)
var it = aiList var it = aiList
while it != nil: while it != nil:
var ta: TransportAddress
fromSockAddr(cast[ptr Sockaddr_storage](it.ai_addr)[], fromSockAddr(cast[ptr Sockaddr_storage](it.ai_addr)[],
SockLen(it.ai_addrlen), ta.address, ta.port) SockLen(it.ai_addrlen), ta.address, ta.port)
# For some reason getAddrInfo() sometimes returns duplicate addresses,
# for example getAddrInfo(`localhost`) returns `127.0.0.1` twice.
if ta notin result:
result.add(ta) result.add(ta)
it = it.ai_next it = it.ai_next
freeAddrInfo(aiList) freeAddrInfo(aiList)