teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Make sensitivity to protocol version

Browse source
This commit is contained in:
Koncord 2016-09-18 11:49:30 +08:00
parent fe10821528
commit 1e48555617
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw-mp/main.cpp
View file

@ -154,7 +154,10 @@ int main(int argc, char *argv[])
RakNet::RakPeerInterface *peer = RakNet::RakPeerInterface::GetInstance(); RakNet::RakPeerInterface *peer = RakNet::RakPeerInterface::GetInstance();
peer->SetIncomingPassword(TES3MP_VERSION, (int)strlen(TES3MP_VERSION)); stringstream sstr(TES3MP_VERSION);
sstr << TES3MP_PROTO_VERSION;
peer->SetIncomingPassword(sstr.str().c_str(), (int)sstr.str().size());
if (RakNet::NonNumericHostString(addr.c_str())) if (RakNet::NonNumericHostString(addr.c_str()))
{ {

9
apps/openmw/mwmp/Networking.cpp
View file

@ -103,7 +103,10 @@ void Networking::Connect(const std::string &ip, unsigned short port)
master.SetPortHostOrder(port); master.SetPortHostOrder(port);
std::string errmsg = ""; std::string errmsg = "";
if (peer->Connect(master.ToString(false), master.GetPort(), TES3MP_VERSION, (int) strlen(TES3MP_VERSION), 0, 0, 3, 500, 0) != RakNet::CONNECTION_ATTEMPT_STARTED) stringstream sstr(TES3MP_VERSION);
sstr << TES3MP_PROTO_VERSION;
if (peer->Connect(master.ToString(false), master.GetPort(), sstr.str().c_str(), (int) sstr.str().size(), 0, 0, 3, 500, 0) != RakNet::CONNECTION_ATTEMPT_STARTED)
errmsg = "Connection attempt failed.\n"; errmsg = "Connection attempt failed.\n";
bool queue = true; bool queue = true;
@ -139,10 +142,6 @@ void Networking::Connect(const std::string &ip, unsigned short port)
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONNECTION_REQUESTED_ACCEPTED from %s", LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_CONNECTION_REQUESTED_ACCEPTED from %s",
serverAddr.ToString()); serverAddr.ToString());
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "%s", "Sending ID_GAME_BASE_INFO to server");
GetPacket(ID_GAME_BASE_INFO)->Send(getLocalPlayer());
break; break;
} }
case ID_DISCONNECTION_NOTIFICATION: case ID_DISCONNECTION_NOTIFICATION: