Skip to content

Commit

Permalink
Update zig-network submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
g41797 committed Oct 7, 2024
1 parent b7aac0d commit 310e524
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 54 deletions.
2 changes: 1 addition & 1 deletion src/deps/zig-network
104 changes: 51 additions & 53 deletions src/syslog_tests.zig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const rfc = @import("rfc5424.zig");
const network = @import("deps/zig-network/network.zig");
//---------------------------------

const Thread = std.Thread;
const Thread = std.Thread;
const Allocator = std.mem.Allocator;

const MsgBlock = struct {
Expand Down Expand Up @@ -89,68 +89,66 @@ test "init/deinit syslogd test" {
sd.waitFinish();
}

test "Darwin: connection-mode socket was connected already" {
const port: u16 = 12345;

test "Darwin: connection-mode socket was connected already" {
const port: u16 = 12345;

const Server = struct {
const Self = @This();
port: u16 = port,
socket: network.Socket = undefined,
thread: Thread = undefined,

fn start(srv: *Self) !void {
try network.init();
errdefer network.deinit();

srv.socket = try network.Socket.create(.ipv4, .udp);
errdefer srv.socket.close();
_ = try srv.socket.enablePortReuse(true);

const bindAddr = network.EndPoint{
.address = network.Address{ .ipv4 = network.Address.IPv4.any },
.port = srv.port,
};

try srv.socket.bind(bindAddr);
srv.thread = std.Thread.spawn(.{}, run, .{srv}) catch unreachable;
return;
}

fn run(srv: *Self) void {
defer {
srv.socket.close();
network.deinit();
}
var buff: [128]u8 = undefined;
_ = srv.socket.receive(buff[0..]) catch return;
return;
}

fn waitFinish(srv: *Self) void {
srv.thread.join();
}
};

const Server = struct {
const Self = @This();
port: u16 = port,
socket: network.Socket = undefined,
thread: Thread = undefined,

var srv: Server = .{};
try srv.start();
defer srv.waitFinish();
fn start(srv: *Self) !void {
try network.init();
errdefer network.deinit();

const addr: []const u8 = "127.0.0.1";
srv.socket = try network.Socket.create(.ipv4, .udp);
errdefer srv.socket.close();
_ = try srv.socket.enablePortReuse(true);

try network.init();
defer network.deinit();
const bindAddr = network.EndPoint{
.address = network.Address{ .ipv4 = network.Address.IPv4.any },
.port = srv.port,
};

const sock = try network.connectToHost(std.testing.allocator, addr, port, .udp);
defer sock.close();
try srv.socket.bind(bindAddr);
srv.thread = std.Thread.spawn(.{}, run, .{srv}) catch unreachable;
return;
}

fn run(srv: *Self) void {
defer {
srv.socket.close();
network.deinit();
}
var buff: [128]u8 = undefined;
_ = try sock.send(buff[0..]);

_ = srv.socket.receive(buff[0..]) catch return;
return;
}

fn waitFinish(srv: *Self) void {
srv.thread.join();
}
};

var srv: Server = .{};
try srv.start();
defer srv.waitFinish();

const addr: []const u8 = "127.0.0.1";

try network.init();
defer network.deinit();

const sock = try network.connectToHost(std.testing.allocator, addr, port, .udp);
defer sock.close();

var buff: [128]u8 = undefined;
_ = try sock.send(buff[0..]);

return;
}

test "hellozig test" {
try hellozig();
}
Expand Down

0 comments on commit 310e524

Please sign in to comment.