From 67908cf19875dd42f17d4ae6768fe7cf54a05e6c Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Fri, 2 Jan 2026 22:36:41 +0000 Subject: Move handshake from client to server --- src/server/client.zig | 5 +---- src/server/main.zig | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server') diff --git a/src/server/client.zig b/src/server/client.zig index 4207cdf..004b0f9 100644 --- a/src/server/client.zig +++ b/src/server/client.zig @@ -30,13 +30,10 @@ pub fn deinit(self: *Client, alloc: std.mem.Allocator) void { self.* = undefined; } -pub fn start(self: *Client, io: std.Io, alloc: std.mem.Allocator, queue: *std.Io.Queue(Message), server_info: Message.ServerInfo) !void { +pub fn start(self: *Client, io: std.Io, alloc: std.mem.Allocator, queue: *std.Io.Queue(Message)) !void { self.recv_queue = queue; var msgs: [8]Message = undefined; - // Do initial handshake with client - try queue.putOne(io, .{ .info = server_info }); - while (true) { const len = try queue.get(io, &msgs, 1); std.debug.assert(len <= msgs.len); diff --git a/src/server/main.zig b/src/server/main.zig index 4ade64d..4c1093f 100644 --- a/src/server/main.zig +++ b/src/server/main.zig @@ -67,7 +67,7 @@ pub fn main(alloc: std.mem.Allocator, server_config: ServerInfo) !void { defer server_task.cancel(io) catch {}; while (keep_running.load(.monotonic)) { - try io.sleep(.fromMilliseconds(10), .awake); + try io.sleep(.fromMilliseconds(1), .awake); } std.debug.print("\n", .{}); @@ -179,7 +179,10 @@ fn handleConnection( } else |_| {} } - var client_task = try io.concurrent(Client.start, .{ &client, io, server_allocator, &queue, server.info }); + // Do initial handshake with client + try queue.putOne(io, .{ .info = server.info }); + + var client_task = try io.concurrent(Client.start, .{ &client, io, server_allocator, &queue }); defer client_task.cancel(io) catch {}; // Messages are owned by the server after they are received from the client -- cgit