mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-04 22:56:37 +00:00
[Netcode] Remove security from servertalk connections (#1464)
* Remove security from servertalk connections
* Remove the two hello steps before handshake that are now obsolete out
* Revert "Remove the two hello steps before handshake that are now obsolete out"
This reverts commit 32d61ea238.
* Keep old values for enums
* Use downgrade security handshake for backwards compat
* Send handshake instead of hello to fast connect
* Add connect callback so it will actually work
This commit is contained in:
@@ -5,10 +5,6 @@
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
#ifdef ENABLE_SECURITY
|
||||
#include <sodium.h>
|
||||
#endif
|
||||
|
||||
namespace EQ
|
||||
{
|
||||
namespace Net
|
||||
@@ -17,18 +13,9 @@ namespace EQ
|
||||
{
|
||||
int port;
|
||||
bool ipv6;
|
||||
bool encrypted;
|
||||
bool allow_downgrade;
|
||||
std::string credentials;
|
||||
|
||||
ServertalkServerOptions() {
|
||||
#ifdef ENABLE_SECURITY
|
||||
encrypted = true;
|
||||
allow_downgrade = true;
|
||||
#else
|
||||
encrypted = false;
|
||||
allow_downgrade = true;
|
||||
#endif
|
||||
ipv6 = false;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user