Browse Source

Updated Jupiter; reverted previous commit (fixed bug in Jupiter instead).

pull/3/head
JustinAJ 9 years ago
parent
commit
9c342f4647
  1. 2
      Jupiter
  2. BIN
      Release/Bot.lib
  3. BIN
      Release/Plugins/RenX.Core.lib
  4. 7
      RenX.Core/RenX_Server.cpp
  5. 2
      RenX.Listen/RenX_Listen.cpp

2
Jupiter

@ -1 +1 @@
Subproject commit 4d20ab64300ba49a923c712106dd2a040fa95bcc Subproject commit 8cc73c997a35d8abedd64dcd45b1016c57330000

BIN
Release/Bot.lib

Binary file not shown.

BIN
Release/Plugins/RenX.Core.lib

Binary file not shown.

7
RenX.Core/RenX_Server.cpp

@ -620,12 +620,12 @@ unsigned short RenX::Server::getPort() const
const Jupiter::ReadableString &RenX::Server::getSocketHostname() const const Jupiter::ReadableString &RenX::Server::getSocketHostname() const
{ {
return RenX::Server::sock.getHostname(); return RenX::Server::sock.getRemoteHostname();
} }
unsigned short RenX::Server::getSocketPort() const unsigned short RenX::Server::getSocketPort() const
{ {
return RenX::Server::sock.getPort(); return RenX::Server::sock.getRemotePort();
} }
std::chrono::steady_clock::time_point RenX::Server::getLastAttempt() const std::chrono::steady_clock::time_point RenX::Server::getLastAttempt() const
@ -2559,7 +2559,6 @@ bool RenX::Server::connect()
RenX::Server::attempts = 0; RenX::Server::attempts = 0;
return true; return true;
} }
RenX::Server::sock.closeSocket();
RenX::Server::connected = false; RenX::Server::connected = false;
++RenX::Server::attempts; ++RenX::Server::attempts;
return false; return false;
@ -2608,7 +2607,7 @@ const Jupiter::ReadableString &RenX::Server::getRCONUsername() const
RenX::Server::Server(Jupiter::Socket &&socket, const Jupiter::ReadableString &configurationSection) : Server(configurationSection) RenX::Server::Server(Jupiter::Socket &&socket, const Jupiter::ReadableString &configurationSection) : Server(configurationSection)
{ {
RenX::Server::sock = std::move(socket); RenX::Server::sock = std::move(socket);
RenX::Server::hostname = RenX::Server::sock.getHostname(); RenX::Server::hostname = RenX::Server::sock.getRemoteHostname();
RenX::Server::sock.send(Jupiter::StringS::Format("a%.*s\n", RenX::Server::pass.size(), RenX::Server::pass.ptr())); RenX::Server::sock.send(Jupiter::StringS::Format("a%.*s\n", RenX::Server::pass.size(), RenX::Server::pass.ptr()));
RenX::Server::connected = true; RenX::Server::connected = true;
RenX::Server::silenceParts = false; RenX::Server::silenceParts = false;

2
RenX.Listen/RenX_Listen.cpp

@ -56,7 +56,7 @@ int RenX_ListenPlugin::OnRehash()
uint16_t port = Jupiter::IRC::Client::Config->getInt(this->getName(), STRING_LITERAL_AS_REFERENCE("Port"), 21337); uint16_t port = Jupiter::IRC::Client::Config->getInt(this->getName(), STRING_LITERAL_AS_REFERENCE("Port"), 21337);
const Jupiter::ReadableString &address = Jupiter::IRC::Client::Config->get(this->getName(), STRING_LITERAL_AS_REFERENCE("Address"), STRING_LITERAL_AS_REFERENCE("0.0.0.0")); const Jupiter::ReadableString &address = Jupiter::IRC::Client::Config->get(this->getName(), STRING_LITERAL_AS_REFERENCE("Address"), STRING_LITERAL_AS_REFERENCE("0.0.0.0"));
RenX_ListenPlugin::serverSection = Jupiter::IRC::Client::Config->get(this->getName(), STRING_LITERAL_AS_REFERENCE("ServerSection"), this->getName()); RenX_ListenPlugin::serverSection = Jupiter::IRC::Client::Config->get(this->getName(), STRING_LITERAL_AS_REFERENCE("ServerSection"), this->getName());
if (port != RenX_ListenPlugin::socket.getPort() || address.equals(RenX_ListenPlugin::socket.getHostname()) == false) if (port != RenX_ListenPlugin::socket.getRemotePort() || address.equals(RenX_ListenPlugin::socket.getRemoteHostname()) == false)
{ {
puts("Notice: The Renegade-X listening socket has been changed!"); puts("Notice: The Renegade-X listening socket has been changed!");
RenX_ListenPlugin::socket.closeSocket(); RenX_ListenPlugin::socket.closeSocket();

Loading…
Cancel
Save