diff --git a/quicp2p.nim b/quicp2p.nim index e597852..ae2f9d0 100644 --- a/quicp2p.nim +++ b/quicp2p.nim @@ -66,10 +66,12 @@ proc onReceiveReset(stream: ptr quicly_stream_t, err: cint) {.cdecl.} = proc onServerReceive(stream: ptr quicly_stream_t, offset: csize_t, src: pointer, len: csize_t) {.cdecl.} = - echo "onServerReceive" if quicly_streambuf_ingress_receive(stream, offset, src, len) != 0: return let input = quicly_streambuf_ingress_get(stream) + var msg = newString(input.len) + copyMem(addr msg[0], input.base, input.len) + echo &"received message from client: \"{msg}\"" if quicly_sendstate_is_open(addr stream.sendstate) != 0 and input.len > 0: discard quicly_streambuf_egress_write(stream, input.base, input.len) if quicly_recvstate_transfer_complete(addr stream.recvstate) != 0: @@ -78,13 +80,12 @@ proc onServerReceive(stream: ptr quicly_stream_t, offset: csize_t, src: pointer, proc onClientReceive(stream: ptr quicly_stream_t, offset: csize_t, src: pointer, len: csize_t) {.cdecl.} = - echo "onClientReceive" if quicly_streambuf_ingress_receive(stream, offset, src, len) != 0: return let input = quicly_streambuf_ingress_get(stream) let msg = newString(input.len) copyMem(msg.cstring, input.base, input.len) - echo "received message from server: ", msg + echo &"received message from server: \"{msg}\"" if quicly_recvstate_transfer_complete(addr stream.recvstate) != 0: discard quicly_close(stream.conn, 0, "") quicly_streambuf_ingress_shift(stream, input.len) @@ -111,13 +112,11 @@ proc usage() = proc onServerStreamOpen(self: ptr quicly_stream_open_t, stream: ptr quicly_stream_t): cint {.cdecl.} = - echo "onServerStreamOpen" result = quicly_streambuf_create(stream, sizeof(quicly_streambuf_t).csize_t) stream.callbacks = addr streamCallbacksServer proc onClientStreamOpen(self: ptr quicly_stream_open_t, stream: ptr quicly_stream_t): cint {.cdecl.} = - echo "onClientStreamOpen" result = quicly_streambuf_create(stream, sizeof(quicly_streambuf_t).csize_t) stream.callbacks = addr streamCallbacksClient let msg = "hello server" @@ -139,10 +138,8 @@ proc handleMsg(ctx: QuicP2PContext, msg: string, peerAddr: ptr SockAddr, conn = c break if conn != nil: - echo "quicly_receive" discard quicly_receive(conn, nil, peerAddr, addr decoded) elif isServer: - echo "quicly_accept" discard quicly_accept(addr conn, addr ctx.quiclyCtx, nil, peerAddr, addr decoded, nil, addr ctx.nextCid, nil) ctx.connections.add(conn) @@ -187,7 +184,6 @@ proc sendPackets(ctx: QuicP2PContext) = case sendResult: of 0: if dgramCount > 0: - echo &"sending {dgramCount} datagrams" for j in 0 .. dgramCount - 1: var sockLen = quicly_get_socklen(addr dstAddr.sa) # TODO: replace asyncdispatch.sendTo with asyncnet.sendTo (Nim 1.4 required) @@ -209,7 +205,6 @@ proc receive(ctx: QuicP2PContext, isServer: bool) {.async.} = let msgLen = await recvFromInto(ctx.sock.getFd().AsyncFD, msg.cstring, msg.len, cast[ptr SockAddr](addr peerAddr), addr peerAddrLen) - echo &"received {msgLen} bytes" msg.setLen(msgLen) if msg.len > 0: handleMsg(ctx, msg, cast[ptr SockAddr](addr peerAddr), isServer)