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

Fix checksum issue

Browse Source
This commit is contained in:
Robby Zambito
2026-01-24 10:38:52 -05:00
parent a81c4b3175
commit 157afa13b1
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Client.zig
View File

@@ -95,12 +95,15 @@ pub fn connect(self: Client, io: Io, payload: []const u8) !SaprusConnection {
}, },
}; };
log.debug("Setting bpf filter to port {}", .{connection.connection.src});
try self.socket.attachSaprusPortFilter(connection.connection.src); try self.socket.attachSaprusPortFilter(connection.connection.src);
log.debug("bpf set", .{});
var connection_buf: [2048]u8 = undefined; var connection_buf: [2048]u8 = undefined;
var connection_bytes = connection.toBytes(&connection_buf); var connection_bytes = connection.toBytes(&connection_buf);
headers.setPayloadLen(connection_bytes.len); headers.setPayloadLen(connection_bytes.len);
log.debug("Building full message", .{});
var full_msg = blk: { var full_msg = blk: {
var msg_buf: [2048]u8 = undefined; var msg_buf: [2048]u8 = undefined;
var msg_w: Writer = .fixed(&msg_buf); var msg_w: Writer = .fixed(&msg_buf);
@@ -108,17 +111,21 @@ pub fn connect(self: Client, io: Io, payload: []const u8) !SaprusConnection {
msg_w.writeAll(connection_bytes) catch unreachable; msg_w.writeAll(connection_bytes) catch unreachable;
break :blk msg_w.buffered(); break :blk msg_w.buffered();
}; };
log.debug("Built full message. Sending message", .{});
try self.socket.send(full_msg); try self.socket.send(full_msg);
var res_buf: [4096]u8 = undefined; var res_buf: [4096]u8 = undefined;
// Ignore response from sentinel, just accept that we got one. // Ignore response from sentinel, just accept that we got one.
log.debug("Awaiting handshake response", .{});
_ = try self.socket.receive(&res_buf); _ = try self.socket.receive(&res_buf);
try io.sleep(.fromMilliseconds(40), .real); try io.sleep(.fromMilliseconds(40), .real);
headers.udp.dst_port = udp_dest_port; headers.udp.dst_port = udp_dest_port;
headers.ip.id = rand.int(u16); headers.ip.id = rand.int(u16);
headers.setPayloadLen(connection_bytes.len);
log.debug("Building final handshake message", .{});
full_msg = blk: { full_msg = blk: {
var msg_buf: [2048]u8 = undefined; var msg_buf: [2048]u8 = undefined;
var msg_w: Writer = .fixed(&msg_buf); var msg_w: Writer = .fixed(&msg_buf);
@@ -140,3 +147,4 @@ const EthIpUdp = @import("./EthIpUdp.zig").EthIpUdp;
const std = @import("std"); const std = @import("std");
const Io = std.Io; const Io = std.Io;
const Writer = std.Io.Writer; const Writer = std.Io.Writer;
const log = std.log;

12
src/Connection.zig
View File

@@ -14,12 +14,16 @@ pub fn init(socket: RawSocket, headers: EthIpUdp, connection: SaprusMessage) Con
pub fn next(self: Connection, io: Io, buf: []u8) ![]const u8 { pub fn next(self: Connection, io: Io, buf: []u8) ![]const u8 {
_ = io; _ = io;
log.debug("Awaiting connection message", .{});
const res = try self.socket.receive(buf); const res = try self.socket.receive(buf);
log.debug("Received {} byte connection message", .{res.len});
const connection_res = blk: { const connection_res = blk: {
const msg: SaprusMessage = try .parse(res[42..]); const msg: SaprusMessage = try .parse(res[42..]);
break :blk msg.connection; break :blk msg.connection;
}; };
log.debug("Payload was {s}", .{connection_res.payload});
return connection_res.payload; return connection_res.payload;
} }
@@ -29,14 +33,16 @@ pub fn send(self: *Connection, io: Io, buf: []const u8) !void {
break :blk io_source.interface(); break :blk io_source.interface();
}; };
log.debug("Sending connection message", .{});
self.connection.connection.payload = buf; self.connection.connection.payload = buf;
const connection_bytes = blk: { const connection_bytes = blk: {
var connection_bytes: [2048]u8 = undefined; var connection_bytes: [2048]u8 = undefined;
break :blk self.connection.toBytes(&connection_bytes); break :blk self.connection.toBytes(&connection_bytes);
}; };
self.headers.setPayloadLen(connection_bytes.len);
self.headers.ip.id = rand.int(u16); self.headers.ip.id = rand.int(u16);
self.headers.setPayloadLen(connection_bytes.len);
const full_msg = blk: { const full_msg = blk: {
var msg_buf: [2048]u8 = undefined; var msg_buf: [2048]u8 = undefined;
@@ -47,12 +53,16 @@ pub fn send(self: *Connection, io: Io, buf: []const u8) !void {
}; };
try self.socket.send(full_msg); try self.socket.send(full_msg);
log.debug("Sent {} byte connection message", .{full_msg.len});
} }
const std = @import("std"); const std = @import("std");
const Io = std.Io; const Io = std.Io;
const Writer = std.Io.Writer; const Writer = std.Io.Writer;
const log = std.log;
const SaprusMessage = @import("./message.zig").Message; const SaprusMessage = @import("./message.zig").Message;
const EthIpUdp = @import("./EthIpUdp.zig").EthIpUdp; const EthIpUdp = @import("./EthIpUdp.zig").EthIpUdp;

3
src/main.zig
View File

@@ -100,7 +100,9 @@ pub fn main(init: std.process.Init) !void {
if (flags.connect != null) { if (flags.connect != null) {
reconnect: while (true) { reconnect: while (true) {
log.debug("Starting connection", .{});
var connection = try client.connect(init.io, flags.connect.?); var connection = try client.connect(init.io, flags.connect.?);
log.debug("Connection started", .{});
while (true) { while (true) {
var res_buf: [2048]u8 = undefined; var res_buf: [2048]u8 = undefined;
@@ -156,6 +158,7 @@ fn parseDest(in: ?[]const u8) [4]u8 {
const builtin = @import("builtin"); const builtin = @import("builtin");
const std = @import("std"); const std = @import("std");
const log = std.log;
const ArrayList = std.ArrayList; const ArrayList = std.ArrayList;
const StaticStringMap = std.StaticStringMap; const StaticStringMap = std.StaticStringMap;