Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Send real port to server list

This commit is contained in:
ShadowNinja 2015-01-21 14:32:12 -05:00 committed by Craig Robbins
parent 1702c34b64
commit a9f81b729b
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server.cpp
View File

@ -428,6 +428,9 @@ Server::~Server()
void Server::start(Address bind_addr) void Server::start(Address bind_addr)
{ {
DSTACK(__FUNCTION_NAME); DSTACK(__FUNCTION_NAME);
m_bind_addr = bind_addr;
infostream<<"Starting server on " infostream<<"Starting server on "
<< bind_addr.serializeString() <<"..."<<std::endl; << bind_addr.serializeString() <<"..."<<std::endl;
@ -678,6 +681,7 @@ void Server::AsyncRunStep(bool initial_step)
g_settings->getBool("server_announce")) g_settings->getBool("server_announce"))
{ {
ServerList::sendAnnounce(counter ? "update" : "start", ServerList::sendAnnounce(counter ? "update" : "start",
m_bind_addr.getPort(),
m_clients.getPlayerNames(), m_clients.getPlayerNames(),
m_uptime.get(), m_uptime.get(),
m_env->getGameTime(), m_env->getGameTime(),
@ -5093,8 +5097,8 @@ void dedicated_server_loop(Server &server, bool &kill)
{ {
infostream<<"Dedicated server quitting"<<std::endl; infostream<<"Dedicated server quitting"<<std::endl;
#if USE_CURL #if USE_CURL
if(g_settings->getBool("server_announce") == true) if(g_settings->getBool("server_announce"))
ServerList::sendAnnounce("delete"); ServerList::sendAnnounce("delete", server.m_bind_addr.getPort());
#endif #endif
break; break;
} }

3
src/server.h
View File

@ -340,6 +340,9 @@ public:
u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch, u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
std::string* vers_string); std::string* vers_string);
// Bind address
Address m_bind_addr;
private: private:
friend class EmergeThread; friend class EmergeThread;

3
src/serverlist.cpp
View File

@ -189,6 +189,7 @@ const std::string serializeJson(const std::vector<ServerListSpec> &serverlist)
#if USE_CURL #if USE_CURL
void sendAnnounce(const std::string &action, void sendAnnounce(const std::string &action,
const u16 port,
const std::vector<std::string> &clients_names, const std::vector<std::string> &clients_names,
const double uptime, const double uptime,
const u32 game_time, const u32 game_time,
@ -199,7 +200,7 @@ void sendAnnounce(const std::string &action,
{ {
Json::Value server; Json::Value server;
server["action"] = action; server["action"] = action;
server["port"] = g_settings->getU16("port"); server["port"] = port;
if (g_settings->exists("server_address")) { if (g_settings->exists("server_address")) {
server["address"] = g_settings->get("server_address"); server["address"] = g_settings->get("server_address");
} }

2
src/serverlist.h
View File

@ -38,7 +38,7 @@ namespace ServerList
std::vector<ServerListSpec> deSerializeJson(const std::string &liststring); std::vector<ServerListSpec> deSerializeJson(const std::string &liststring);
const std::string serializeJson(const std::vector<ServerListSpec> &serverlist); const std::string serializeJson(const std::vector<ServerListSpec> &serverlist);
#if USE_CURL #if USE_CURL
void sendAnnounce(const std::string &action, void sendAnnounce(const std::string &action, const u16 port,
const std::vector<std::string> &clients_names = std::vector<std::string>(), const std::vector<std::string> &clients_names = std::vector<std::string>(),
const double uptime = 0, const u32 game_time = 0, const double uptime = 0, const u32 game_time = 0,
const float lag = 0, const std::string &gameid = "", const float lag = 0, const std::string &gameid = "",