Changeset 21844 for ps

Timestamp:

06/07/18 00:37:20 (7 years ago)

Author:

elexis

Message:

Don't print lobby buddies to mainlog.html, refs D209 / rP19433.

Differential Revision: ​https://code.wildfiregames.com/D1563
Comments By: Vladislav

Location:

ps/trunk/source

Files:

• network/NetMessages.h (modified) (2 diffs)
• ps/ConfigDB.cpp (modified) (2 diffs)

ps/trunk/source/network/NetMessages.h

@@ -1 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -122 +122 @@
 START_NMT_CLASS_(Authenticate, NMT_AUTHENTICATE)
     NMT_FIELD(CStrW, m_Name)
+    // TODO: The password should not be printed to logfiles
     NMT_FIELD(CStrW, m_Password)
     NMT_FIELD_INT(m_IsLocalClient, u8, 1)

ps/trunk/source/ps/ConfigDB.cpp

@@ -33 +33 @@
 
 static pthread_mutex_t cfgdb_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+// These entries will not be printed to logfiles
+static const std::set<CStr> g_UnloggedEntries = {
+    "lobby.password",
+    "lobby.buddies"
+};
 
 CConfigDB::CConfigDB()
@@ -369 +375 @@
             CStr key(header + name);
             newMap[key] = values;
-            if (key == "lobby.password")
+            if (g_UnloggedEntries.find(key) != g_UnloggedEntries.end())
                 LOGMESSAGE("Loaded config string \"%s\"", key);
             else