From 7b07520adb0191ec70869357aab27b29ee4b94f7 Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Fri, 4 Apr 2025 22:09:06 -0400 Subject: Move sendRelay logic to Saprus struct --- src/saprus_relay.zig | 40 +++++----------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) (limited to 'src/saprus_relay.zig') diff --git a/src/saprus_relay.zig b/src/saprus_relay.zig index 0df66e9..17ea8ea 100644 --- a/src/saprus_relay.zig +++ b/src/saprus_relay.zig @@ -13,7 +13,7 @@ pub fn main() !void { _ = dba.deinit(); }; - var gpa = if (is_debug) dba.allocator() else std.heap.smp_allocator; + const gpa = if (is_debug) dba.allocator() else std.heap.smp_allocator; const args = try std.process.argsAlloc(gpa); defer std.process.argsFree(gpa, args); @@ -27,38 +27,10 @@ pub fn main() !void { try message.append(' '); } - const msg = SaprusMessage{ - .relay = .{ - .header = .{ .dest = .{ 255, 255, 255, 255 } }, - .payload = if (message.items.len > 0) message.items else "Hello darkness my old friend", - }, - }; - - const msg_bytes = try msg.toBytes(gpa); - defer gpa.free(msg_bytes); - - try network.init(); - defer network.deinit(); + try Saprus.init(); + defer Saprus.deinit(); - var sock = try network.Socket.create(.ipv4, .udp); - defer sock.close(); - - try sock.setBroadcast(true); - - // Bind to 0.0.0.0:0 - const bind_addr = network.EndPoint{ - .address = network.Address{ .ipv4 = network.Address.IPv4.any }, - .port = 0, - }; - - const dest_addr = network.EndPoint{ - .address = network.Address{ .ipv4 = network.Address.IPv4.broadcast }, - .port = 8888, - }; - - try sock.bind(bind_addr); - - _ = try sock.sendTo(dest_addr, msg_bytes); + try Saprus.sendRelay(if (message.items.len > 0) message.items else "Hello darkness my old friend", gpa); } const builtin = @import("builtin"); @@ -66,6 +38,4 @@ const std = @import("std"); const DebugAllocator = std.heap.DebugAllocator(.{}); const ArrayList = std.ArrayList; -const network = @import("network"); - -const SaprusMessage = @import("./saprus_message.zig").SaprusMessage; +const Saprus = @import("./saprus.zig"); -- cgit