Added basic AF_UNIX support to asyncnet. #9877
Conversation
|
Docgen fails with nativesockets.nim(487, 37) Error: undeclared identifier: 'nativeAfUnix' |
lib/pure/net.nim
Outdated
| @@ -948,7 +948,7 @@ proc setSockOpt*(socket: Socket, opt: SOBool, value: bool, level = SOL_SOCKET) { | |||
| setSockOptInt(socket.fd, cint(level), toCInt(opt), valuei) | |||
|
|
|||
| when defined(posix) and not defined(nimdoc): | |||
| proc makeUnixAddr(path: string): Sockaddr_un = | |||
| proc makeUnixAddr*(path: string): Sockaddr_un = | |||
There was a problem hiding this comment.
I think this should be moved to nativesockets
| raise newException(IOError, "Unknown socket family in getAddrString") | ||
| when defined(posix): | ||
| if sockAddr.sa_family.cint == nativeAfUnix: | ||
| return "unix" |
There was a problem hiding this comment.
This is fine, but I would give it its own elif branch above and check for posix there. That way you can give a big more meaningful error like "Unix socket family not supported on Windows".
There was a problem hiding this comment.
But this requires nativeAfUnix to be defined also for non posix, but what value should it get here?
There was a problem hiding this comment.
Okay, that's fine. Another thing regarding this proc, shouldn't it return the Unix socket file path?
There was a problem hiding this comment.
Not sure what the semantics of this function are, is it supposed to be the Nim implementation of getsockname()?
There was a problem hiding this comment.
I believe so. Based on the other code in this function it should return the string representation of a SockAddr, "unix" isn't specific enough.
There was a problem hiding this comment.
Funny, sun_path seems not to be filled in by the kernel after accepting a unix socket...
I'm not sure this can be done here. I need the socket itself to get the peer address with getsockname(), but the sockAddr passed to getAddrString simply does not contain the info after doing the accept().
lib/pure/asyncnet.nim
Outdated
| @@ -622,6 +622,45 @@ proc bindAddr*(socket: AsyncSocket, port = Port(0), address = "") {. | |||
| raiseOSError(osLastError()) | |||
| freeAddrInfo(aiList) | |||
|
|
|||
| when defined(posix) and not defined(nimdoc): | |||
There was a problem hiding this comment.
These procedures shouldn't be behind a not defined(nimdoc). It would be nice to also give them docs and specify they are only available for POSIX.
There was a problem hiding this comment.
In fact, you'll need to do something like:
when defined(posix):
# Implementation
elif defined(nimdoc):
proc connectUnix*(socket: AsyncSocket, path: string): Future[void] =
## ...
discard| result = retFuture | ||
|
|
||
| proc cb(fd: AsyncFD): bool = | ||
| let ret = SocketHandle(fd).getSockOptInt(cint(SOL_SOCKET), cint(SO_ERROR)) |
There was a problem hiding this comment.
Where did you get this code from?
There was a problem hiding this comment.
Stolen from doConnect() in asynccommon
some code duplication because the doConnect() from asynccommon.nim only works with addrInfo which does not make sense for AF_UNIX. Also needed to export makeUnixAddr() from net.nim.
Unfortunately this required some code duplication because the doConnect() from asynccommon.nim only works with addrInfo which does not make sense for AF_UNIX.
Also needed to export makeUnixAddr() from net.nim.