Merge branch 'master' of github.com:Araq/Nimrod

This commit is contained in:
Araq 2012-09-23 09:02:33 +02:00
commit bad34033de

View file

@ -1227,8 +1227,9 @@ proc recvFrom*(socket: TSocket, data: var string, length: int,
var addrLen = sizeof(sockAddress).TSockLen var addrLen = sizeof(sockAddress).TSockLen
result = recvFrom(socket.fd, cstring(data), length.cint, flags.cint, result = recvFrom(socket.fd, cstring(data), length.cint, flags.cint,
cast[ptr TSockAddr](addr(sockAddress)), addr(addrLen)) cast[ptr TSockAddr](addr(sockAddress)), addr(addrLen))
if result != -1: if result != -1:
data.setLen(result)
address = $inet_ntoa(sockAddress.sin_addr) address = $inet_ntoa(sockAddress.sin_addr)
port = ntohs(sockAddress.sin_port).TPort port = ntohs(sockAddress.sin_port).TPort