Merge 2a71c7fce2 into af1b32d296

Merge pull request #8930 from timakro/pr-fix-econ-listening-publicly
Fixes a bug where econ was exposed publicly when ec_bindaddr was set to localhost
2024-09-19 01:02:20 +00:00 · 2024-09-11 21:16:09 +03:00 · 2024-09-11 16:50:42 +00:00 · 2024-09-11 18:28:07 +02:00 · 2024-09-10 09:50:26 +08:00
6 changed files with 63 additions and 50 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2162,6 +2162,8 @@ set_src(GAME_SHARED GLOB src/game
  mapitems_ex.cpp
  mapitems_ex.h
  mapitems_ex_types.h
+  mapitems_fng.h
+  mapitems_vanilla.h
  prng.cpp
  prng.h
  teamscore.cpp
--- a/src/engine/shared/econ.cpp
+++ b/src/engine/shared/econ.cpp
@ -70,18 +70,18 @@ void CEcon::Init(CConfig *pConfig, IConsole *pConsole, CNetBan *pNetBan)
 	}

 	NETADDR BindAddr;
-	if(g_Config.m_EcBindaddr[0] == '\0')
+	if(g_Config.m_EcBindaddr[0] && net_host_lookup(g_Config.m_EcBindaddr, &BindAddr, NETTYPE_ALL) == 0)
 	{
-		mem_zero(&BindAddr, sizeof(BindAddr));
+		// got bindaddr
+		BindAddr.port = g_Config.m_EcPort;
 	}
-	else if(net_host_lookup(g_Config.m_EcBindaddr, &BindAddr, NETTYPE_ALL) != 0)
+	else
 	{
 		char aBuf[256];
-		str_format(aBuf, sizeof(aBuf), "The configured bindaddr '%s' cannot be resolved.", g_Config.m_Bindaddr);
+		str_format(aBuf, sizeof(aBuf), "The configured bindaddr '%s' cannot be resolved.", g_Config.m_EcBindaddr);
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "econ", aBuf);
+		return;
 	}
-	BindAddr.type = NETTYPE_ALL;
-	BindAddr.port = g_Config.m_EcPort;

 	if(m_NetConsole.Open(BindAddr, pNetBan))
 	{
--- a/src/game/editor/editor.h
+++ b/src/game/editor/editor.h
@ -1044,50 +1044,6 @@ public:
 		TILE_PUB_ENTITIES_OFF2,
 	};

-	enum
-	{
-		TILE_FNG_SPIKE_GOLD = 7,
-		TILE_FNG_SPIKE_NORMAL,
-		TILE_FNG_SPIKE_RED,
-		TILE_FNG_SPIKE_BLUE,
-		TILE_FNG_SCORE_RED,
-		TILE_FNG_SCORE_BLUE,
-
-		TILE_FNG_SPIKE_GREEN = 14,
-		TILE_FNG_SPIKE_PURPLE,
-
-		TILE_FNG_SPAWN = 192,
-		TILE_FNG_SPAWN_RED,
-		TILE_FNG_SPAWN_BLUE,
-		TILE_FNG_FLAG_RED,
-		TILE_FNG_FLAG_BLUE,
-		TILE_FNG_SHIELD,
-		TILE_FNG_HEART,
-		TILE_FNG_SHOTGUN,
-		TILE_FNG_GRENADE,
-		TILE_FNG_NINJA,
-		TILE_FNG_LASER,
-
-		TILE_FNG_SPIKE_OLD1 = 208,
-		TILE_FNG_SPIKE_OLD2,
-		TILE_FNG_SPIKE_OLD3
-	};
-
-	enum
-	{
-		TILE_VANILLA_SPAWN = 192,
-		TILE_VANILLA_SPAWN_RED,
-		TILE_VANILLA_SPAWN_BLUE,
-		TILE_VANILLA_FLAG_RED,
-		TILE_VANILLA_FLAG_BLUE,
-		TILE_VANILLA_SHIELD,
-		TILE_VANILLA_HEART,
-		TILE_VANILLA_SHOTGUN,
-		TILE_VANILLA_GRENADE,
-		TILE_VANILLA_NINJA,
-		TILE_VANILLA_LASER,
-	};
-
 	// Explanations
 	enum class EExplanation
 	{
--- a/src/game/editor/explanations.cpp
+++ b/src/game/editor/explanations.cpp
@ -1,3 +1,6 @@
+#include <game/mapitems_fng.h>
+#include <game/mapitems_vanilla.h>
+
 #include "editor.h"

 // DDNet entity explanations by Lady Saavik
--- a/src/game/mapitems_fng.h
+++ b/src/game/mapitems_fng.h
@ -0,0 +1,33 @@
+#ifndef GAME_MAPITEMS_FNG_H
+#define GAME_MAPITEMS_FNG_H
+
+enum
+{
+	TILE_FNG_SPIKE_GOLD = 7,
+	TILE_FNG_SPIKE_NORMAL,
+	TILE_FNG_SPIKE_RED,
+	TILE_FNG_SPIKE_BLUE,
+	TILE_FNG_SCORE_RED,
+	TILE_FNG_SCORE_BLUE,
+
+	TILE_FNG_SPIKE_GREEN = 14,
+	TILE_FNG_SPIKE_PURPLE,
+
+	TILE_FNG_SPAWN = 192,
+	TILE_FNG_SPAWN_RED,
+	TILE_FNG_SPAWN_BLUE,
+	TILE_FNG_FLAG_RED,
+	TILE_FNG_FLAG_BLUE,
+	TILE_FNG_SHIELD,
+	TILE_FNG_HEART,
+	TILE_FNG_SHOTGUN,
+	TILE_FNG_GRENADE,
+	TILE_FNG_NINJA,
+	TILE_FNG_LASER,
+
+	TILE_FNG_SPIKE_OLD1 = 208,
+	TILE_FNG_SPIKE_OLD2,
+	TILE_FNG_SPIKE_OLD3
+};
+
+#endif
--- a/src/game/mapitems_vanilla.h
+++ b/src/game/mapitems_vanilla.h
@ -0,0 +1,19 @@
+#ifndef GAME_MAPITEMS_VANILLA_H
+#define GAME_MAPITEMS_VANILLA_H
+
+enum
+{
+	TILE_VANILLA_SPAWN = 192,
+	TILE_VANILLA_SPAWN_RED,
+	TILE_VANILLA_SPAWN_BLUE,
+	TILE_VANILLA_FLAG_RED,
+	TILE_VANILLA_FLAG_BLUE,
+	TILE_VANILLA_SHIELD,
+	TILE_VANILLA_HEART,
+	TILE_VANILLA_SHOTGUN,
+	TILE_VANILLA_GRENADE,
+	TILE_VANILLA_NINJA,
+	TILE_VANILLA_LASER,
+};
+
+#endif
Author	SHA1	Message	Date
Chiller Dragon	383f1cb895	Merge `2a71c7fce2` into `af1b32d296`	2024-09-11 21:16:09 +03:00
Dennis Felsing	af1b32d296	Merge pull request #8930 from timakro/pr-fix-econ-listening-publicly Fixes a bug where econ was exposed publicly when ec_bindaddr was set to localhost	2024-09-11 16:50:42 +00:00
Tim Schumacher	0ad1c08c22	Fixes a bug where econ was exposed publicly when ec_bindaddr was set to localhost Also implements the original intention of `85f5e9c` that is to disable econ if ec_binaddr is invalid.	2024-09-11 18:28:07 +02:00
ChillerDragon	2a71c7fce2	Share fng and vanilla tiles with the server While implementing a ddnet based fng mod I realized that I reimplemented the same enum that already exists on the client side. So this encourages fng mod developers to use the indecies that the ddnet client already knows.	2024-09-10 09:50:26 +08:00