startiing to clean up c api

Should map directly to the zig struct instead of mallocing

build.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const Step = std.Build.Step;
 
 // Although this function looks imperative, note that its job is to
 // declaratively construct a build graph that will be executed by an external
@@ -37,13 +38,29 @@ pub fn build(b: *std.Build) void {
     exe_mod.addImport("zaprus", lib_mod);
     exe_mod.addImport("clap", b.dependency("clap", .{}).module("clap"));
 
-    const lib = b.addLibrary(.{
+    const static_lib = b.addLibrary(.{
         .linkage = .static,
         .name = "zaprus",
         .root_module = lib_mod,
     });
+    static_lib.addIncludePath(.{ .cwd_relative = "include" });
+    static_lib.linkLibC();
 
-    b.installArtifact(lib);
+    b.installArtifact(static_lib);
+
+    const dynamic_lib = b.addLibrary(.{
+        .linkage = .dynamic,
+        .name = "zaprus",
+        .root_module = lib_mod,
+    });
+    dynamic_lib.addIncludePath(.{ .cwd_relative = "include" });
+    dynamic_lib.linkLibC();
+
+    b.installArtifact(dynamic_lib);
+
+    // C Headers
+    const c_header = b.addInstallHeaderFile(b.path("include/zaprus.h"), "zaprus.h");
+    b.getInstallStep().dependOn(&c_header.step);
 
     // This creates another `std.Build.Step.Compile`, but this one builds an executable
     // rather than a static library.

include/zaprus.h

@@ -0,0 +1,15 @@
+// client
+
+#include<stdint.h>
+#include<stdlib.h>
+
+int zaprus_init(void);
+
+int zaprus_deinit(void);
+
+int zaprus_send_relay(const char* payload, size_t len, char dest[4]);
+
+int zaprus_send_initial_connection(const char* payload, size_t len, uint16_t initial_port);
+
+void* zaprus_connect(const char* payload, size_t len);
+

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;

src/c_api.zig

@@ -0,0 +1,32 @@
+// client
+export fn zaprus_init() c_int {
+    SaprusClient.init() catch return 1;
+    return 0;
+}
+
+export fn zaprus_deinit() c_int {
+    SaprusClient.deinit();
+    return 0;
+}
+
+export fn zaprus_send_relay(payload: [*]const u8, len: usize, dest: [*]u8) c_int {
+    SaprusClient.sendRelay(payload[0..len], dest[0..4].*, allocator) catch return 1;
+    return 0;
+}
+
+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;
+}
+
+const std = @import("std");
+
+const zaprus = @import("./root.zig");
+const SaprusClient = zaprus.Client;
+const SaprusConnection = zaprus.Connection;
+
+const allocator = std.heap.c_allocator;
+
+test {
+    std.testing.refAllDeclsRecursively(@This());
+}

src/main.zig

@@ -75,7 +75,7 @@ pub fn main() !void {
     return clap.help(std.io.getStdErr().writer(), clap.Help, &params, .{});
 }
 
-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 .{ 70, 70, 70, 70 };
+    return "zap".*;
 }
 
 const builtin = @import("builtin");

src/root.zig

@@ -1,2 +1,4 @@
 pub const Client = @import("Client.zig");
 pub usingnamespace @import("message.zig");
+
+pub usingnamespace @import("c_api.zig");