pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 13:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/eqemu-api-data-service-netstats-ws' into unstable

Browse Source
This commit is contained in:
KimLS
2019-06-24 17:45:37 -07:00
parent e06a845921 89691d6c32
commit 8293225ecc
13 changed files with 218 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/net/websocket_server.cpp
+6
View File
@@ -177,6 +177,12 @@ Json::Value EQ::Net::WebsocketServer::Login(WebsocketServerConnection *connectio
connection->SetAuthorized(true, r.account_name, r.account_id, 255);
ret["status"] = "Ok";
}
else if (user == "admin" && (connection->RemoteIP() == "127.0.0.1" || connection->RemoteIP() == "::")) {
r.logged_in = true;
r.account_id = 0;
connection->SetAuthorized(true, r.account_name, r.account_id, 255);
ret["status"] = "Ok";
}
else {
connection->SetAuthorized(false, "", 0, 0);
ret["status"] = "Not Authorized";
common/version.h
+1 -1
View File
@@ -34,7 +34,7 @@
#define CURRENT_BINARY_DATABASE_VERSION 9139
#ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9022
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9023
#else
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 0 // must be 0
#endif