From 25c119b8439418fd616c8c2eda38e86affa6305a Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Sun, 14 Jul 2019 22:23:51 -0500
Subject: [PATCH] Add new default login.json

---
 loginserver/login_util/login.json | 39 +++++++++++++++++++++++++++++++
 loginserver/main.cpp              |  2 ++
 loginserver/world_server.cpp      | 16 +++++++------
 3 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 loginserver/login_util/login.json

diff --git a/loginserver/login_util/login.json b/loginserver/login_util/login.json
new file mode 100644
index 000000000..f6c81ffcc
--- /dev/null
+++ b/loginserver/login_util/login.json
@@ -0,0 +1,39 @@
+{
+  "database": {
+    "host": "mariadb", // database host
+    "port": "3306", // database port
+    "db": "peq", // database name
+    "user": "eqemu", // database user
+    "password": "eqemu" // database password
+  },
+  "account": {
+    // ideal for local LAN setups, if you want a login attempt to automatically create an account
+    // this will automatically create the account using the username and password if it doesn't exist
+    "auto_create_accounts": true
+  },
+  "worldservers": {
+    "unregistered_allowed": true, // allows worldservers to connect to your loginserver without server admin authentication
+    "reject_duplicate_servers": false // if enabled, rejects duplicate worldservers
+  },
+  "web_api": {
+    "enabled": true, // enable/disable embedded webserver api
+    "port": 6000 // the port you want the web api to serve on (recommended not to change)
+  },
+  "security": {
+    "mode": 14, // encryption mode (dont touch) (14=scrypt)
+    "allow_password_login": true, // allows users to login via password, most cases, leave this on
+    "allow_token_login": true // allows token based login directly from launching game
+  },
+  "logging": {
+    "trace": false, // For debugging general packet messaging
+    "world_trace": false, // For debugging world to loginserver messaging
+    "dump_packets_in": false, // for debugging inbound packets
+    "dump_packets_out": false // for debugging outbound packets
+  },
+  "client_configuration": {
+    "titanium_port": 5998, // don't change
+    "titanium_opcodes": "login_opcodes.conf", // opcodes for the titanium era clients
+    "sod_port": 5999, // don't change
+    "sod_opcodes": "login_opcodes_sod.conf" // opcodes for sod and higher era clients
+  }
+}
\ No newline at end of file
diff --git a/loginserver/main.cpp b/loginserver/main.cpp
index 2a3db762c..f94bdd0c7 100644
--- a/loginserver/main.cpp
+++ b/loginserver/main.cpp
@@ -193,7 +193,9 @@ int main(int argc, char** argv)
 	LogInfo("[Config] [Logging] IsDumpInPacketsOn [{0}]", server.options.IsDumpInPacketsOn());
 	LogInfo("[Config] [Logging] IsDumpOutPacketsOn [{0}]", server.options.IsDumpOutPacketsOn());
 	LogInfo("[Config] [Account] CanAutoCreateAccounts [{0}]", server.options.CanAutoCreateAccounts());
+#ifdef LSPX
 	LogInfo("[Config] [Account] CanAutoLinkAccounts [{0}]", server.options.CanAutoLinkAccounts());
+#endif
 	LogInfo("[Config] [WorldServer] IsRejectingDuplicateServers [{0}]", server.options.IsRejectingDuplicateServers());
 	LogInfo("[Config] [WorldServer] IsUnregisteredAllowed [{0}]", server.options.IsUnregisteredAllowed());
 	LogInfo("[Config] [Security] GetEncryptionMode [{0}]", server.options.GetEncryptionMode());
diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp
index 049804943..4f880d506 100644
--- a/loginserver/world_server.cpp
+++ b/loginserver/world_server.cpp
@@ -171,13 +171,15 @@ void WorldServer::ProcessLSStatus(uint16_t opcode, const EQ::Net::Packet &packet
 
 	auto *ls_status = (ServerLSStatus_Struct *) packet.Data();
 
-	LogDebug(
-		"World Server Status Update Received | Server [{0}] Status [{1}] Players [{2}] Zones [{3}]",
-		this->GetServerLongName(),
-		ls_status->status,
-		ls_status->num_players,
-		ls_status->num_zones
-	);
+	if (server.options.IsWorldTraceOn()) {
+		LogDebug(
+			"World Server Status Update Received | Server [{0}] Status [{1}] Players [{2}] Zones [{3}]",
+			this->GetServerLongName(),
+			ls_status->status,
+			ls_status->num_players,
+			ls_status->num_zones
+		);
+	}
 
 	Handle_LSStatus(ls_status);
 }