diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Client.zig | 4 | ||||
| -rw-r--r-- | src/c_api.zig | 116 | ||||
| -rw-r--r-- | src/main.zig | 6 |
3 files changed, 8 insertions, 118 deletions
diff --git a/src/Client.zig b/src/Client.zig index 19f8360..849d627 100644 --- a/src/Client.zig +++ b/src/Client.zig @@ -76,7 +76,7 @@ pub fn sendInitialConnection(payload: []const u8, initial_port: u16, allocator: return msg; } -pub fn connect(payload: []const u8, allocator: Allocator) !?SaprusMessage { +pub fn connect(payload: []const u8, allocator: Allocator) !SaprusMessage { var initial_port: u16 = 0; if (rand) |r| { initial_port = r.intRangeAtMost(u16, 1024, 65000); @@ -109,7 +109,7 @@ pub fn connect(payload: []const u8, allocator: Allocator) !?SaprusMessage { // Complete handshake after awaiting response try broadcastSaprusMessage(msg, randomPort(), allocator); - return initial_conn_res; + return initial_conn_res.?; } const SaprusMessage = @import("message.zig").Message; diff --git a/src/c_api.zig b/src/c_api.zig index d3ad168..11ff763 100644 --- a/src/c_api.zig +++ b/src/c_api.zig @@ -1,81 +1,3 @@ -const c = @cImport({ - @cInclude("zaprus.h"); -}); - -fn zigToCMessage(msg: ?*zaprus.Message) !?*c.SaprusMessage { - if (msg) |m| { - var res = c.SaprusMessage{ - .packet_type = @intFromEnum(m.*), - }; - switch (m.*) { - .relay => |r| { - res.headers.relay = .{ - .dest = r.header.dest, - }; - res.payload_len = @intCast(r.payload.len); - res.payload = (try allocator.alloc(u8, r.payload.len)).ptr; - }, - .connection => |con| { - res.headers.connection = .{ - .src_port = con.header.src_port, - .dest_port = con.header.dest_port, - .seq_num = con.header.seq_num, - .msg_id = con.header.msg_id, - ._reserved = con.header.reserved, - .options = @bitCast(con.header.options), - }; - - res.payload_len = @intCast(con.payload.len); - res.payload = (try allocator.alloc(u8, con.payload.len)).ptr; - }, - .file_transfer => return zaprus.Error.NotImplementedSaprusType, - else => return zaprus.Error.UnknownSaprusType, - } - return &res; - } else return null; -} - -fn cToZigMessage(msg: ?*c.SaprusMessage) !?*zaprus.Message { - if (msg) |m| { - const msg_type: zaprus.PacketType = @enumFromInt(m.*.packet_type); - var res: zaprus.Message = switch (msg_type) { - .relay => .{ - .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 export fn zaprus_init() c_int { SaprusClient.init() catch return 1; @@ -92,48 +14,16 @@ export fn zaprus_send_relay(payload: [*]const u8, len: usize, dest: [*]u8) c_int return 0; } -export fn zaprus_send_initial_connection(payload: [*]const u8, len: usize, initial_port: u16) c_int { - _ = SaprusClient.sendInitialConnection(payload[0..len], initial_port, allocator) catch return 1; +export fn zaprus_connect(payload: [*]const u8, len: usize, output: *SaprusConnection) c_int { + output.* = (SaprusClient.connect(payload[0..len], allocator) catch return 1).?; return 0; } -export fn zaprus_connect(payload: [*]const u8, len: usize) ?*c.SaprusMessage { - if (SaprusClient.connect(payload[0..len], allocator)) |msg| { - return zigToCMessage(@constCast(&(msg.?))) catch null; - } else |_| { - return null; - } -} - -// message - -/// ptr should be freed by the caller. -export fn zaprus_message_to_bytes(msg: c.SaprusMessage, ptr: *[*]u8, len: *usize) c_int { - if (cToZigMessage(@constCast(&msg)) catch return 1) |m| { - const bytes = m.toBytes(allocator) catch return 1; - ptr.* = bytes.ptr; - len.* = bytes.len; - return 0; - } else return 1; -} - -/// Return value should be destroyed with zaprus_message_deinit. -export fn zaprus_message_from_bytes(bytes: [*]const u8, len: usize) ?*c.SaprusMessage { - if (zaprus.Message.fromBytes(bytes[0..len], allocator)) |msg| { - return zigToCMessage(@constCast(&msg)) catch null; - } else |_| return null; -} - -export fn zaprus_message_deinit(msg: *c.SaprusMessage) void { - // noop - _ = msg; - // msg.*.deinit(allocator); -} - const std = @import("std"); const zaprus = @import("./root.zig"); const SaprusClient = zaprus.Client; +const SaprusConnection = zaprus.Connection; const allocator = std.heap.c_allocator; diff --git a/src/main.zig b/src/main.zig index f4941e4..f60614f 100644 --- a/src/main.zig +++ b/src/main.zig @@ -75,7 +75,7 @@ pub fn main() !void { return clap.help(std.io.getStdErr().writer(), clap.Help, ¶ms, .{}); } -fn parseDest(in: ?[]const u8) ![4]u8 { +fn parseDest(in: ?[]const u8) [4]u8 { if (in) |dest| { if (dest.len <= 4) { var res: [4]u8 = @splat(0); @@ -83,10 +83,10 @@ fn parseDest(in: ?[]const u8) ![4]u8 { return res; } - const addr = try std.net.Ip4Address.parse(dest, 0); + const addr = std.net.Ip4Address.parse(dest, 0) catch return "FAIL".*; return @bitCast(addr.sa.addr); } - return "FAIL".*; + return "zap".*; } const builtin = @import("builtin"); |