jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix connectUnix/bindUnix with abstract socket paths

Browse source 
The only way to make this work for both abstract and non-abstract
sockets is to send the kernel an incomplete structure.

Reported by Epictek on the forum.
This commit is contained in:
LemonBoy 2018-09-15 17:54:58 +02:00
commit a2a06d43f2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/posix/posix_other.nim
View file

@ -410,7 +410,7 @@ else:
type type
Socklen* {.importc: "socklen_t", header: "<sys/socket.h>".} = cuint Socklen* {.importc: "socklen_t", header: "<sys/socket.h>".} = cuint
TSa_Family* {.importc: "sa_family_t", header: "<sys/socket.h>".} = cint TSa_Family* {.importc: "sa_family_t", header: "<sys/socket.h>".} = cushort
SockAddr* {.importc: "struct sockaddr", header: "<sys/socket.h>", SockAddr* {.importc: "struct sockaddr", header: "<sys/socket.h>",
pure, final.} = object ## struct sockaddr pure, final.} = object ## struct sockaddr

4
lib/pure/net.nim
View file

@ -964,7 +964,7 @@ when defined(posix) or defined(nimdoc):
when not defined(nimdoc): when not defined(nimdoc):
var socketAddr = makeUnixAddr(path) var socketAddr = makeUnixAddr(path)
if socket.fd.connect(cast[ptr SockAddr](addr socketAddr), if socket.fd.connect(cast[ptr SockAddr](addr socketAddr),
sizeof(socketAddr).Socklen) != 0'i32: (sizeof(socketAddr.sun_family) + path.len).Socklen) != 0'i32:
raiseOSError(osLastError()) raiseOSError(osLastError())
proc bindUnix*(socket: Socket, path: string) = proc bindUnix*(socket: Socket, path: string) =
@ -973,7 +973,7 @@ when defined(posix) or defined(nimdoc):
when not defined(nimdoc): when not defined(nimdoc):
var socketAddr = makeUnixAddr(path) var socketAddr = makeUnixAddr(path)
if socket.fd.bindAddr(cast[ptr SockAddr](addr socketAddr), if socket.fd.bindAddr(cast[ptr SockAddr](addr socketAddr),
sizeof(socketAddr).Socklen) != 0'i32: (sizeof(socketAddr.sun_family) + path.len).Socklen) != 0'i32:
raiseOSError(osLastError()) raiseOSError(osLastError())
when defined(ssl): when defined(ssl):