Skip to content
Permalink
Browse files

Send real port to server list

  • Loading branch information
ShadowNinja authored and Zeno- committed Jan 21, 2015
1 parent 1702c34 commit a9f81b729b1cc90db5574fdb97542901e695bf69
Showing with 12 additions and 4 deletions.
  1. +6 −2 src/server.cpp
  2. +3 −0 src/server.h
  3. +2 −1 src/serverlist.cpp
  4. +1 −1 src/serverlist.h
@@ -428,6 +428,9 @@ Server::~Server()
void Server::start(Address bind_addr)
{
DSTACK(__FUNCTION_NAME);

m_bind_addr = bind_addr;

infostream<<"Starting server on "
<< bind_addr.serializeString() <<"..."<<std::endl;

@@ -678,6 +681,7 @@ void Server::AsyncRunStep(bool initial_step)
g_settings->getBool("server_announce"))
{
ServerList::sendAnnounce(counter ? "update" : "start",
m_bind_addr.getPort(),
m_clients.getPlayerNames(),
m_uptime.get(),
m_env->getGameTime(),
@@ -5093,8 +5097,8 @@ void dedicated_server_loop(Server &server, bool &kill)
{
infostream<<"Dedicated server quitting"<<std::endl;
#if USE_CURL
if(g_settings->getBool("server_announce") == true)
ServerList::sendAnnounce("delete");
if(g_settings->getBool("server_announce"))
ServerList::sendAnnounce("delete", server.m_bind_addr.getPort());
#endif
break;
}
@@ -340,6 +340,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
std::string* vers_string);

// Bind address
Address m_bind_addr;

private:

friend class EmergeThread;
@@ -189,6 +189,7 @@ const std::string serializeJson(const std::vector<ServerListSpec> &serverlist)

#if USE_CURL
void sendAnnounce(const std::string &action,
const u16 port,
const std::vector<std::string> &clients_names,
const double uptime,
const u32 game_time,
@@ -199,7 +200,7 @@ void sendAnnounce(const std::string &action,
{
Json::Value server;
server["action"] = action;
server["port"] = g_settings->getU16("port");
server["port"] = port;
if (g_settings->exists("server_address")) {
server["address"] = g_settings->get("server_address");
}
@@ -38,7 +38,7 @@ namespace ServerList
std::vector<ServerListSpec> deSerializeJson(const std::string &liststring);
const std::string serializeJson(const std::vector<ServerListSpec> &serverlist);
#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 double uptime = 0, const u32 game_time = 0,
const float lag = 0, const std::string &gameid = "",

0 comments on commit a9f81b7

Please sign in to comment.
You can’t perform that action at this time.