mirror of
https://git.robbyzambito.me/zaprus
synced 2025-12-20 16:24:50 +00:00
Base64 encode relay message
write the packed connection struct directly instead of each of the fields.
This commit is contained in:
12
src/main.zig
12
src/main.zig
@@ -1,4 +1,5 @@
|
|||||||
const is_debug = builtin.mode == .Debug;
|
const is_debug = builtin.mode == .Debug;
|
||||||
|
const base64 = std.base64.Base64Encoder.init(std.base64.standard_alphabet_chars, '=');
|
||||||
|
|
||||||
const SaprusPacketType = enum(u16) {
|
const SaprusPacketType = enum(u16) {
|
||||||
relay = 0x003C,
|
relay = 0x003C,
|
||||||
@@ -23,7 +24,7 @@ const SaprusMessage = union(SaprusPacketType) {
|
|||||||
payload: []u8,
|
payload: []u8,
|
||||||
},
|
},
|
||||||
file_transfer: void, // unimplemented
|
file_transfer: void, // unimplemented
|
||||||
connection: struct {
|
connection: packed struct {
|
||||||
src_port: u16,
|
src_port: u16,
|
||||||
dest_port: u16,
|
dest_port: u16,
|
||||||
seq_num: u32 = 0,
|
seq_num: u32 = 0,
|
||||||
@@ -43,16 +44,11 @@ const SaprusMessage = union(SaprusPacketType) {
|
|||||||
.relay => |r| {
|
.relay => |r| {
|
||||||
try w.writeAll(&r.dest);
|
try w.writeAll(&r.dest);
|
||||||
try w.writeInt(u16, @intCast(r.payload.len), .big);
|
try w.writeInt(u16, @intCast(r.payload.len), .big);
|
||||||
try w.writeAll(r.payload);
|
try base64.encodeWriter(w, r.payload);
|
||||||
},
|
},
|
||||||
.file_transfer => unreachable,
|
.file_transfer => unreachable,
|
||||||
.connection => |c| {
|
.connection => |c| {
|
||||||
try w.writeInt(u16, c.src_port, .big);
|
try w.writeStruct(c);
|
||||||
try w.writeInt(u16, c.dest_port, .big);
|
|
||||||
try w.writeInt(u32, c.seq_num, .big);
|
|
||||||
try w.writeInt(u32, c.msg_id, .big);
|
|
||||||
try w.writeInt(u8, c.reserved, .big);
|
|
||||||
try w.writeStruct(c.options);
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user