zambyte/zaprus
1
0
Fork 0
mirror of https://git.robbyzambito.me/zaprus synced 2026-02-04 16:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use writer instead of RawSocket in Client

Browse Source
This commit is contained in:
Robby Zambito
2025-09-09 22:27:09 -04:00
parent 74b0c9ef1f
commit c673401c2a
4 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Client.zig
View File

@@ -2,13 +2,13 @@ const base64Enc = std.base64.Base64Encoder.init(std.base64.standard_alphabet_cha
const base64Dec = std.base64.Base64Decoder.init(std.base64.standard_alphabet_chars, '=');
rand: Random,
socket: gcat.nic.RawSocket,
writer: *std.Io.Writer,
const Self = @This();
const max_message_size = 2048;
pub fn init(interface_name: [:0]const u8) !Self {
pub fn init(writer: *std.Io.Writer) !Self {
var prng = Random.DefaultPrng.init(blk: {
var seed: u64 = undefined;
try posix.getrandom(mem.asBytes(&seed));
@@ -16,16 +16,14 @@ pub fn init(interface_name: [:0]const u8) !Self {
});
const rand = prng.random();
const socket: gcat.nic.RawSocket = try .init(interface_name);
return .{
.rand = rand,
.socket = socket,
.writer = writer,
};
}
pub fn deinit(self: *Self) void {
self.socket.deinit();
self.writer.flush() catch {};
}
/// Used for relay messages and connection handshake.
@@ -70,16 +68,14 @@ fn broadcastInitialInterestMessage(self: *Self, msg_bytes: []align(@alignOf(Sapr
const saprus_start_byte = 42;
@memcpy(packet_bytes[saprus_start_byte .. saprus_start_byte + msg_bytes.len], msg_bytes);
try self.socket.linkLayer().send(packet_bytes[0 .. saprus_start_byte + msg_bytes.len]);
const writer = self.writer;
_ = try writer.write(packet_bytes[0 .. saprus_start_byte + msg_bytes.len]);
try writer.flush();
}
// fn broadcastSaprusMessage(msg_bytes: []align(@alignOf(SaprusMessage)) u8) !void {}
fn broadcastSaprusMessage(msg_bytes: []align(@alignOf(SaprusMessage)) u8, udp_port: u16) !void {
if (false) {
var foo: gcat.nic.RawSocket = try .init("enp7s0"); // /proc/net/dev
defer foo.deinit();
}
const msg: *SaprusMessage = try .bytesAsValue(msg_bytes);
try msg.networkFromNativeEndian();
defer msg.nativeFromNetworkEndian() catch unreachable;
@@ -194,4 +190,3 @@ const posix = std.posix;
const mem = std.mem;
const network = @import("network");
const gcat = @import("gatorcat");