zambyte/zaprus
1
0
Fork 0
mirror of https://git.robbyzambito.me/zaprus synced 2025-12-20 16:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break out encoding and decoding into its own functions

Browse Source
This commit is contained in:
Robby Zambito
2025-04-03 15:21:32 -04:00
parent 3bd955f0bf
commit 53d7e62054
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/main.zig
View File

@@ -64,25 +64,21 @@ const SaprusMessage = union(SaprusPacketType) {
switch (self) { switch (self) {
.relay => |r| { .relay => |r| {
var b64_payload_buf = std.ArrayList(u8).init(allocator); const payload_list = try encodeToList(r.payload, allocator);
defer b64_payload_buf.deinit(); defer payload_list.deinit();
const buf_w = b64_payload_buf.writer();
try base64Enc.encodeWriter(buf_w, r.payload);
try w.writeStructEndian(r.header, .big); try w.writeStructEndian(r.header, .big);
try w.writeInt(u16, @intCast(b64_payload_buf.items.len), .big); try w.writeInt(u16, @intCast(payload_list.items.len), .big);
try w.writeAll(b64_payload_buf.items); try w.writeAll(payload_list.items);
}, },
.file_transfer => return SaprusError.NotImplementedSaprusType, .file_transfer => return SaprusError.NotImplementedSaprusType,
.connection => |c| { .connection => |c| {
var b64_payload_buf = std.ArrayList(u8).init(allocator); const payload_list = try encodeToList(c.payload, allocator);
defer b64_payload_buf.deinit(); defer payload_list.deinit();
const buf_w = b64_payload_buf.writer();
try base64Enc.encodeWriter(buf_w, c.payload);
try w.writeStructEndian(c.header, .big); try w.writeStructEndian(c.header, .big);
try w.writeInt(u16, @intCast(b64_payload_buf.items.len), .big); try w.writeInt(u16, @intCast(payload_list.items.len), .big);
try w.writeAll(b64_payload_buf.items); try w.writeAll(payload_list.items);
}, },
} }
@@ -97,13 +93,7 @@ const SaprusMessage = union(SaprusPacketType) {
.relay => { .relay => {
const header = try r.readStructEndian(Relay.Header, .big); const header = try r.readStructEndian(Relay.Header, .big);
const len = try r.readInt(u16, .big); const len = try r.readInt(u16, .big);
const payload = try decodeFromReader(r, len, allocator);
var payload_b64_buf = std.ArrayList(u8).init(allocator);
defer payload_b64_buf.deinit();
try r.readAllArrayList(&payload_b64_buf, len);
const payload = try allocator.alloc(u8, try base64Dec.calcSizeForSlice(payload_b64_buf.items));
try base64Dec.decode(payload, payload_b64_buf.items);
return .{ return .{
.relay = .{ .relay = .{
@@ -116,13 +106,7 @@ const SaprusMessage = union(SaprusPacketType) {
.connection => { .connection => {
const header = try r.readStructEndian(Connection.Header, .big); const header = try r.readStructEndian(Connection.Header, .big);
const len = try r.readInt(u16, .big); const len = try r.readInt(u16, .big);
const payload = try decodeFromReader(r, len, allocator);
var payload_b64_buf = std.ArrayList(u8).init(allocator);
defer payload_b64_buf.deinit();
try r.readAllArrayList(&payload_b64_buf, len);
const payload = try allocator.alloc(u8, try base64Dec.calcSizeForSlice(payload_b64_buf.items));
try base64Dec.decode(payload, payload_b64_buf.items);
return .{ return .{
.connection = .{ .connection = .{
@@ -178,10 +162,28 @@ pub fn main() !void {
_ = try sock.sendTo(dest_addr, msg_bytes); _ = try sock.sendTo(dest_addr, msg_bytes);
} }
fn encodeToList(buf: []const u8, allocator: Allocator) !std.ArrayList(u8) {
var b64_buf = std.ArrayList(u8).init(allocator);
const buf_w = b64_buf.writer();
try base64Enc.encodeWriter(buf_w, buf);
return b64_buf;
}
fn decodeFromReader(reader: StringReader, len: u16, allocator: Allocator) ![]const u8 {
var b64_buf = std.ArrayList(u8).init(allocator);
defer b64_buf.deinit();
try reader.readAllArrayList(&b64_buf, len);
const payload = try allocator.alloc(u8, try base64Dec.calcSizeForSlice(b64_buf.items));
try base64Dec.decode(payload, b64_buf.items);
return payload;
}
const builtin = @import("builtin"); const builtin = @import("builtin");
const std = @import("std"); const std = @import("std");
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
const DebugAllocator = std.heap.DebugAllocator(.{}); const DebugAllocator = std.heap.DebugAllocator(.{});
const StringReader = std.io.FixedBufferStream([]const u8).Reader;
const network = @import("network"); const network = @import("network");