core: Set HTTP port to ip_addr field Having separate HTTP port and keeping UDP source port is wasteful and not user friendly.

Changes

2 changed files (+7/-8)

• cli/src/commands/server/list.zig
  • @@ -84,10 +84,9 @@ var server_iter = scanner.servers.iterator();
    switch (res.args.format orelse .text) { .text => { while (server_iter.next()) |server| { - stdout.print("ID={s} IP={} PORT={d} VERSION=\"{s}\"\n", .{ + stdout.print("ID={s} IP={} VERSION=\"{s}\"\n", .{ server.value_ptr.unique_id, server.value_ptr.ip_addr, - server.value_ptr.http_port, server.value_ptr.version, }) catch { // TODO: Create and return appropriate error code
  • @@ -97,17 +96,16 @@ }
    }, .tsv => { if (res.args.header > 0) { - stdout.writeAll("ID\tName\tIP address\tHTTP port\tVersion\n") catch { + stdout.writeAll("ID\tName\tIP address\tVersion\n") catch { return ExitCode.not_ok; }; } while (server_iter.next()) |server| { // TODO: Escape tabs from name and version - stdout.print("{s}\t{s}\t{}\t{d}\t{s}\n", .{ + stdout.print("{s}\t{s}\t{}\t{s}\n", .{ server.value_ptr.unique_id, server.value_ptr.name, server.value_ptr.ip_addr, - server.value_ptr.http_port, server.value_ptr.version, }) catch { // TODO: Create and return appropriate error code
• core/src/mod.zig
  • @@ -28,7 +28,6 @@ ip_addr: std.net.Address,
    unique_id: []const u8, name: []const u8, version: []const u8, - http_port: u16, }; pub const ServerScanner = struct {
  • @@ -123,13 +122,15 @@ defer if (stale_message) |msg| {
    self.allocator.free(msg); }; + var ip_addr = src; + ip_addr.setPort(response.http_port); + try self.servers.put(response.unique_id, Server{ .message = message, .unique_id = response.unique_id, .version = response.display_version, .name = response.name, - .ip_addr = src, - .http_port = response.http_port, + .ip_addr = ip_addr, }); } else |err| switch (err) { std.posix.RecvFromError.WouldBlock => return,