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

Add C to Zig converter

Browse Source 
Further simplify struct
This commit is contained in:
Robby Zambito
2025-04-26 10:39:07 -04:00
parent 67818ed9d6
commit 983544facf
2 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/zaprus.h
View File

@@ -23,20 +23,15 @@ struct SaprusMessage {
uint16_t payload_len; uint16_t payload_len;
union { union {
struct { struct {
struct { char dest[4];
char dest[4];
};
} relay; } relay;
struct { struct {
struct { uint16_t src_port;
uint16_t src_port; uint16_t dest_port;
uint16_t dest_port; uint32_t seq_num;
uint32_t seq_num; uint32_t msg_id;
uint32_t msg_id; char _reserved;
char _reserved; char options;
char options;
};
} connection; } connection;
} headers; } headers;
char *payload; char *payload;

67
src/c_api.zig
View File

@@ -10,23 +10,19 @@ fn zigToCMessage(msg: ?*zaprus.Message) !?*c.SaprusMessage {
switch (m.*) { switch (m.*) {
.relay => |r| { .relay => |r| {
res.headers.relay = .{ res.headers.relay = .{
.unnamed_0 = .{ .dest = r.header.dest,
.dest = r.header.dest,
},
}; };
res.payload_len = @intCast(r.payload.len); res.payload_len = @intCast(r.payload.len);
res.payload = (try allocator.alloc(u8, r.payload.len)).ptr; res.payload = (try allocator.alloc(u8, r.payload.len)).ptr;
}, },
.connection => |con| { .connection => |con| {
res.headers.connection = .{ res.headers.connection = .{
.unnamed_0 = .{ .src_port = con.header.src_port,
.src_port = con.header.src_port, .dest_port = con.header.dest_port,
.dest_port = con.header.dest_port, .seq_num = con.header.seq_num,
.seq_num = con.header.seq_num, .msg_id = con.header.msg_id,
.msg_id = con.header.msg_id, ._reserved = con.header.reserved,
._reserved = con.header.reserved, .options = @bitCast(con.header.options),
.options = @bitCast(con.header.options),
},
}; };
res.payload_len = @intCast(con.payload.len); res.payload_len = @intCast(con.payload.len);
@@ -39,14 +35,45 @@ fn zigToCMessage(msg: ?*zaprus.Message) !?*c.SaprusMessage {
} else return null; } else return null;
} }
fn cToZigMessage(msg: ?*c.SaprusMessage) ?*zaprus.Message { fn cToZigMessage(msg: ?*c.SaprusMessage) !?*zaprus.Message {
_ = msg; if (msg) |m| {
return @constCast(&zaprus.Message{ const msg_type: zaprus.PacketType = @enumFromInt(m.*.packet_type);
.relay = .{ var res: zaprus.Message = switch (msg_type) {
.header = .{ .dest = @splat(0) }, .relay => .{
.payload = &.{0}, .relay = .{
}, .header = .{
}); .dest = m.*.headers.relay.dest[0..4].*,
},
.payload = blk: {
const p = try allocator.alloc(u8, m.payload_len);
@memcpy(p, m.payload[0..m.payload_len]);
break :blk p;
},
},
},
.connection => .{
.connection = .{
.header = .{
.src_port = m.*.headers.connection.src_port,
.dest_port = m.*.headers.connection.dest_port,
.seq_num = m.*.headers.connection.seq_num,
.msg_id = m.*.headers.connection.msg_id,
.reserved = m.*.headers.connection._reserved,
.options = @bitCast(m.*.headers.connection.options),
},
.payload = blk: {
const p = try allocator.alloc(u8, m.payload_len);
@memcpy(p, m.payload[0..m.payload_len]);
break :blk p;
},
},
},
.file_transfer => return zaprus.Error.NotImplementedSaprusType,
else => return zaprus.Error.UnknownSaprusType,
};
return &res;
} else return null;
} }
// client // client
@@ -82,7 +109,7 @@ export fn zaprus_connect(payload: [*]const u8, len: usize) ?*c.SaprusMessage {
/// ptr should be freed by the caller. /// ptr should be freed by the caller.
export fn zaprus_message_to_bytes(msg: c.SaprusMessage, ptr: *[*]u8, len: *usize) c_int { export fn zaprus_message_to_bytes(msg: c.SaprusMessage, ptr: *[*]u8, len: *usize) c_int {
if (cToZigMessage(@constCast(&msg))) |m| { if (cToZigMessage(@constCast(&msg)) catch return 1) |m| {
const bytes = m.toBytes(allocator) catch return 1; const bytes = m.toBytes(allocator) catch return 1;
ptr.* = bytes.ptr; ptr.* = bytes.ptr;
len.* = bytes.len; len.* = bytes.len;