Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Include protocol in nodes

Browse Source
This commit is contained in:
momo5502 2016-06-14 15:04:58 +02:00
parent 9c8904d561
commit 66671fa817
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Modules/Node.cpp
View File

@ -142,6 +142,7 @@ namespace Components
Proto::Node::List list; Proto::Node::List list;
list.set_is_dedi(Dedicated::IsDedicated()); list.set_is_dedi(Dedicated::IsDedicated());
list.set_protocol(PROTOCOL);
for (auto node : Node::Nodes) for (auto node : Node::Nodes)
{ {
@ -690,10 +691,11 @@ namespace Components
Logger::Print("Received valid node list with %i entries from %s\n", list.address_size(), address.GetCString()); Logger::Print("Received valid node list with %i entries from %s\n", list.address_size(), address.GetCString());
entry->isDedi = list.is_dedi(); entry->isDedi = list.is_dedi();
entry->protocol = list.protocol();
entry->state = Node::STATE_VALID; entry->state = Node::STATE_VALID;
entry->lastTime = Game::Com_Milliseconds(); entry->lastTime = Game::Com_Milliseconds();
if (!Dedicated::IsDedicated() && entry->isDedi && ServerList::IsOnlineList()) if (!Dedicated::IsDedicated() && entry->isDedi && ServerList::IsOnlineList() && entry->protocol == PROTOCOL)
{ {
ServerList::InsertRequest(entry->address, true); ServerList::InsertRequest(entry->address, true);
} }

1
src/Components/Modules/Node.hpp
View File

@ -46,6 +46,7 @@ namespace Components
// This is only relevant for clients // This is only relevant for clients
bool isDedi; bool isDedi;
uint32_t protocol;
}; };
struct ClientSession struct ClientSession

1
src/Proto/node.proto
View File

@ -14,4 +14,5 @@ message List
{ {
bool is_dedi = 1; bool is_dedi = 1;
repeated Network.Address address = 2; repeated Network.Address address = 2;
uint32 protocol = 3;
} }

2
src/STDInclude.hpp
View File

@ -60,8 +60,6 @@
#define LTC_NO_PROTOTYPES #define LTC_NO_PROTOTYPES
#define LTC_NO_RSA_BLINDING #define LTC_NO_RSA_BLINDING
#define ASIO_STANDALONE
#include <zlib.h> #include <zlib.h>
#include <curses.h> #include <curses.h>
#include <mongoose.h> #include <mongoose.h>