diff options
| author | bptato <nincsnevem662@gmail.com> | 2025-04-17 01:29:17 +0200 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2025-04-17 01:29:17 +0200 |
| commit | 02559816e02863c72ab15650fc460860904cedf1 (patch) | |
| tree | a91f63218df2f491b5aeac06f44531a488d0d496 | |
| parent | b58a595149048eb223eda8ef83fb02fc168ad376 (diff) | |
| download | chawan-02559816e02863c72ab15650fc460860904cedf1.tar.gz | |
loader: use pipes in network streams
Turns out we don't actually have a reliable mechanism to detect broken
streams - if a pipe is broken, well, it's broken, but that's about all
we know. It seems UNIX sockets didn't trigger the code path, but pipes
do now, and it was causing issues (reporting some correctly ended
streams as broken).
This is not fixable with the current protocol, so for now, I've just
made onError do the same as onRead at EOF.
| -rw-r--r-- | src/server/loader.nim | 22 | ||||
| -rw-r--r-- | src/server/loaderiface.nim | 2 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/server/loader.nim b/src/server/loader.nim index 7510b8c1..361ebfd1 100644 --- a/src/server/loader.nim +++ b/src/server/loader.nim @@ -1402,19 +1402,18 @@ proc setupRequestDefaults(request: Request; config: LoaderClientConfig; proc load(ctx: var LoaderContext; stream: SocketStream; request: Request; client: ClientHandle; config: LoaderClientConfig) = - var sv {.noinit.}: array[2, cint] + var pipev {.noinit.}: array[2, cint] var fail = false stream.withPacketWriter w: - #TODO use pipe? - if socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sv) == 0: + if pipe(pipev) == 0: w.swrite(true) - w.sendFd(sv[1]) + w.sendFd(pipev[0]) else: fail = true w.swrite(false) if not fail: - discard close(sv[1]) - let stream = newSocketStream(sv[0]) + discard close(pipev[0]) + let stream = newSocketStream(pipev[1]) stream.setBlocking(false) let credentials = config.includeCredentials(request, request.url) let handle = ctx.newInputHandle(stream, client, request.url, credentials) @@ -1618,17 +1617,16 @@ proc tee(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle; r.sread(targetPid) let outputIn = ctx.findOutput(sourceId, client) let target = ctx.clientMap.getOrDefault(targetPid) - var sv {.noinit.}: array[2, cint] + var pipev {.noinit.}: array[2, cint] #TODO use pipe? - if target != nil and outputIn != nil and - socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sv) == 0: - let ostream = newSocketStream(sv[0]) + if target != nil and outputIn != nil and pipe(pipev) == 0: + let ostream = newSocketStream(pipev[1]) ostream.setBlocking(false) let output = ctx.tee(outputIn, ostream, target) stream.withPacketWriter w: w.swrite(output.outputId) - w.sendFd(sv[1]) - discard close(sv[1]) + w.sendFd(pipev[0]) + discard close(pipev[0]) else: stream.withPacketWriter w: w.swrite(-1) diff --git a/src/server/loaderiface.nim b/src/server/loaderiface.nim index c3f7d9e6..aa4599a0 100644 --- a/src/server/loaderiface.nim +++ b/src/server/loaderiface.nim @@ -365,7 +365,7 @@ proc onRead*(loader: FileLoader; fd: int) = proc onError*(loader: FileLoader; data: OngoingData) = let response = data.response if response.onFinish != nil: - response.onFinish(response, false) + response.onFinish(response, true) response.onFinish = nil response.close() |