Skip to content

Update for 1.6 issue #23956 #24909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: version-1-6
Choose a base branch
from
Open

Update for 1.6 issue #23956 #24909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/pure/asyncnet.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ when defined(posix) and not useNimNetLite:

var socketAddr = makeUnixAddr(path)
let ret = socket.fd.connect(cast[ptr SockAddr](addr socketAddr),
(sizeof(socketAddr.sun_family) + path.len).SockLen)
(offsetOf(socketAddr, sun_path) + path.len + 1).SockLen)
if ret == 0:
# Request to connect completed immediately.
retFuture.complete()
Expand All @@ -697,7 +697,7 @@ when defined(posix) and not useNimNetLite:
when not defined(nimdoc):
var socketAddr = makeUnixAddr(path)
if socket.fd.bindAddr(cast[ptr SockAddr](addr socketAddr),
(sizeof(socketAddr.sun_family) + path.len).SockLen) != 0'i32:
(offsetOf(socketAddr, sun_path) + path.len + 1).SockLen) != 0'i32:
raiseOSError(osLastError())

elif defined(nimdoc):
Expand Down
4 changes: 2 additions & 2 deletions lib/pure/net.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,7 @@ when defined(nimdoc) or (defined(posix) and not useNimNetLite):
when not defined(nimdoc):
var socketAddr = makeUnixAddr(path)
if socket.fd.connect(cast[ptr SockAddr](addr socketAddr),
(sizeof(socketAddr.sun_family) + path.len).SockLen) != 0'i32:
(offsetOf(socketAddr, sun_path) + path.len + 1).SockLen) != 0'i32:
raiseOSError(osLastError())

proc bindUnix*(socket: Socket, path: string) =
Expand All @@ -1322,7 +1322,7 @@ when defined(nimdoc) or (defined(posix) and not useNimNetLite):
when not defined(nimdoc):
var socketAddr = makeUnixAddr(path)
if socket.fd.bindAddr(cast[ptr SockAddr](addr socketAddr),
(sizeof(socketAddr.sun_family) + path.len).SockLen) != 0'i32:
(offsetOf(socketAddr, sun_path) + path.len + 1).SockLen) != 0'i32:
raiseOSError(osLastError())

when defineSsl:
Expand Down
Loading