diff options
author | Araq <rumpf_a@web.de> | 2014-03-24 18:42:31 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2014-03-24 18:42:31 +0100 |
commit | bf2f6397c807991f09dd8325c1f860869a1a73b6 (patch) | |
tree | c1c6bb517689c6305583367843d74f0647aec7cf /lib/pure/net.nim | |
parent | 907e1b80b2a3a64cbd60f98c221cd662988d74aa (diff) | |
parent | e8c50640d7a4d386197b8508c82b26f5563060cb (diff) | |
download | Nim-bf2f6397c807991f09dd8325c1f860869a1a73b6.tar.gz |
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
Diffstat (limited to 'lib/pure/net.nim')
-rw-r--r-- | lib/pure/net.nim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pure/net.nim b/lib/pure/net.nim index d40f0949b..2461ece1b 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -347,7 +347,7 @@ type ETimeout* = object of ESynch -proc newSocket(fd: TSocketHandle, isBuff: bool): PSocket = +proc createSocket(fd: TSocketHandle, isBuff: bool): PSocket = assert fd != osInvalidSocket new(result) result.fd = fd @@ -355,15 +355,15 @@ proc newSocket(fd: TSocketHandle, isBuff: bool): PSocket = if isBuff: result.currPos = 0 -proc socket*(domain: TDomain = AF_INET, typ: TType = SOCK_STREAM, +proc newSocket*(domain: TDomain = AF_INET, typ: TType = SOCK_STREAM, protocol: TProtocol = IPPROTO_TCP, buffered = true): PSocket = ## Creates a new socket. ## ## If an error occurs EOS will be raised. - let fd = rawsockets.socket(domain, typ, protocol) + let fd = newRawSocket(domain, typ, protocol) if fd == osInvalidSocket: osError(osLastError()) - result = newSocket(fd, buffered) + result = createSocket(fd, buffered) when defined(ssl): CRYPTO_malloc_init() |