From 443711380578467bbc90a0b67798d701f201cfe5 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 5 May 2019 02:34:45 +0000 Subject: [PATCH] Fix server list LAN address and port --- src/openrct2-ui/windows/ServerList.cpp | 7 +++++++ src/openrct2/network/NetworkServerAdvertiser.cpp | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 6b64fdb636..e350c909b0 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -660,6 +660,13 @@ static void fetch_lan_servers_worker() auto sender = endpoint->GetHostname(); std::printf(">> Recieved packet from %s\n", sender.c_str()); auto jinfo = Json::FromString(std::string_view(buffer)); + + auto ip4 = json_array(); + json_array_append_new(ip4, json_string(sender.c_str())); + auto ip = json_object(); + json_object_set_new(ip, "v4", ip4); + json_object_set_new(jinfo, "ip", ip); + AddServerFromJson(jinfo); json_decref(jinfo); } diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index c60be89ffa..bdfaa4beda 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -281,7 +281,9 @@ private: json_t* GetBroadcastJson() { - return network_get_server_info_as_json(); + auto root = network_get_server_info_as_json(); + json_object_set(root, "port", json_integer(_port)); + return root; } static std::string GenerateAdvertiseKey()