IP spoofing stuff and zCatch game mode specific database tables.

.gitignore

@@ -7,7 +7,6 @@ objs
 src/game/generated
 SDL.dll
 freetype.dll
-autoexec.cfg
 
 crapnet*
 dilate*

Makefile

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# This file is used on unix (linux + macOS) 
+# systems to easily build the executable 
+# for the server
+
+BAM_DIR=bam
+CORES=2
+
+default: release_server
+clean: clean_build
+
+update_release_server: backup_autoexec update_repository restore_autoexec release_server
+	@echo "Done updating the release server executable!"
+
+restore_autoexec:
+	@echo "Restoring autoexec.cfg"
+	rm autoexec.cfg
+	mv autoexec.cfg.backup autoexec.cfg
+
+update_repository:
+	git checkout autoexec.cfg
+	git pull
+
+backup_autoexec:
+	@echo "Backing up autoexec.cfg"
+	cp autoexec.cfg autoexec.cfg.backup
+
+
+release_server: build_bam
+	@echo "Building normal server executable..."
+	../${BAM_DIR}/bam -j ${CORES} -a server_release
+
+
+debug_server: build_bam
+	@echo "Building debug server executable..."
+	@../${BAM_DIR}/bam -j ${CORES} -a server_debug
+
+
+build_bam: download_bam
+	@echo "Building bam..." 
+	@cd ../${BAM_DIR} && \
+	chmod +x make_unix.sh && \
+	./make_unix.sh && \
+	chmod +x bam 
+
+
+download_bam:
+	# if this fails, we wanna continue anyway, 
+	# as it seems that bam has already been downloaded
+	# failures are ignored by a - in front of the line
+	@echo "Downloading bam..."
+	-cd .. && \
+	git clone https://github.com/matricks/bam.git ${BAM_DIR}
+
+
+clean_all: clean_build
+	@echo "Removing bam directory..."
+	cd .. && \
+	rm -rf ${BAM_DIR}
+
+
+clean_build:
+	@echo "Cleaning object files..."
+	../${BAM_DIR}/bam -c all
+
+
+
+
+
+

autoexec.cfg

@@ -0,0 +1,42 @@
+sv_name zCatch Server
+sv_port 8303
+
+sv_max_clients 16
+sv_max_clients_per_ip 2
+
+sv_rcon_password xxxxx
+sv_register 1
+sv_rcon_max_tries 2
+sv_rcon_bantime 30
+
+sv_map ctf5
+sv_mode 4
+
+sv_ranking_file ranking.db
+
+sv_motd "Message of the day."
+
+add_info 90 "Vote in English."
+add_info 90 "Have fun!"
+add_info 90 "Talk before voting!"
+add_info 90 "No funvoting!"
+add_info 90 "Play fairly!"
+add_info 90 "Be friendly!"
+add_info 90 "Help new players!"
+
+add_vote "" ""
+add_vote "===== Server Options ====="
+add_vote "Enable  Releasing Players" "sv_allow_release 1"
+add_vote "Disable Releasing Players" "sv_allow_release 0"
+add_vote "" ""
+add_vote "========== Maps ==========" ""
+add_vote "CTF5" "change_map ctf5"
+
+
+sv_anticamper 1
+
+sv_input_fifo "fifofile"
+logfile logfile.log
+
+debug 0
+sv_teehistorian 1

bam.lua

@@ -1,4 +1,3 @@
-CheckVersion("0.4")
 
 Import("configure.lua")
 Import("other/sdl/sdl.lua")
@@ -151,8 +150,13 @@ function build(settings)
 			-- disable visibility attribute support for gcc on windows
 			settings.cc.defines:Add("NO_VIZ")
 		elseif platform == "macosx" then
-			settings.cc.flags:Add("-mmacosx-version-min=10.5")
-			settings.link.flags:Add("-mmacosx-version-min=10.5")
+			settings.cc.flags:Add("-mmacosx-version-min=10.7")
+			settings.link.flags:Add("-mmacosx-version-min=10.7")
+
+			-----jxsl13 was here mac os x thread crap -----
+			settings.cc.flags:Add("--stdlib=libc++")
+			settings.link.flags:Add("--stdlib=libc++")
+			----------
 			if config.minmacosxsdk.value == 1 then
 				settings.cc.flags:Add("-isysroot /Developer/SDKs/MacOSX10.5.sdk")
 				settings.link.flags:Add("-isysroot /Developer/SDKs/MacOSX10.5.sdk")
@@ -206,6 +210,9 @@ function build(settings)
 	-- build sqlite
 	sqlite = Compile(settings, Collect("src/engine/external/sqlite/sqlite3.c"))
 
+	-- build md5 --
+	md5 = Compile(settings, Collect("src/engine/external/md5/md5.c"))
+
 	-- build game components
 	engine_settings = settings:Copy()
 	server_settings = engine_settings:Copy()
@@ -236,12 +243,17 @@ function build(settings)
 	-- apply freetype settings
 	config.freetype:Apply(client_settings)
 
-	engine = Compile(engine_settings, Collect("src/engine/shared/*.cpp", "src/base/*.c"))
-	client = Compile(client_settings, Collect("src/engine/client/*.cpp"))
 
-	-- we need threads in the server
+	-- settings.cc.flags:Add("-std=c++11")
 	-- threads need c++11
 	settings.cc.flags:Add("-std=c++11")
+
+	engine_cpp = Compile(settings, Collect("src/engine/shared/*.cpp", "src/base/*.cpp"))
+	engine = Compile(engine_settings, Collect("src/base/*.c"))
+	client = Compile(client_settings, Collect("src/engine/client/*.cpp"))
+
+	-- we need threads in the server
+
 	server = Compile(server_settings, Collect("src/engine/server/*.cpp"))
 
 	versionserver = Compile(settings, Collect("src/versionsrv/*.cpp"))
@@ -264,27 +276,23 @@ function build(settings)
 	tools = {}
 	for i,v in ipairs(tools_src) do
 		toolname = PathFilename(PathBase(v))
-		tools[i] = Link(settings, toolname, Compile(settings, v), engine, zlib, pnglite)
+		tools[i] = Link(settings, toolname, Compile(settings, v), engine, md5, zlib, pnglite)
 	end
 
 	-- build client, server, version server and master server
 	client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
-		engine, client, game_editor, zlib, pnglite, wavpack,
+		engine, client, game_editor, md5, zlib, pnglite, wavpack,
 		client_link_other, client_osxlaunch)
 
-	server_exe = Link(server_settings, "zcatch_srv", engine, server,
-		game_shared, game_server, zlib, sqlite, server_link_other)
+	server_exe = Link(server_settings, "zcatch_srv", engine, engine_cpp, server,
+		game_shared, game_server, md5, zlib, sqlite, server_link_other)
 
-	serverlaunch = {}
-	if platform == "macosx" then
-		serverlaunch = Link(launcher_settings, "serverlaunch", server_osxlaunch)
-	end
 
 	versionserver_exe = Link(server_settings, "versionsrv", versionserver,
-		engine, zlib)
+		engine, md5, zlib)
 
 	masterserver_exe = Link(server_settings, "mastersrv", masterserver,
-		engine, zlib)
+		engine, md5, zlib)
 
 
 	-- make targets
@@ -307,6 +315,9 @@ debug_settings.config_ext = "_d"
 debug_settings.debug = 1
 debug_settings.optimize = 0
 debug_settings.cc.defines:Add("CONF_DEBUG")
+-- jxsl13 was here sanitizer for debugging stuff --
+--debug_settings.cc.flags:Add("-fsanitize=address")
+--debug_settings.cc.flags:Add("-fsanitize=leak")
 
 release_settings = NewSettings()
 release_settings.config_name = "release"
@@ -341,15 +352,11 @@ if platform == "macosx" then
 		debug_settings_x86 = debug_settings:Copy()
 		debug_settings_x86.config_name = "debug_x86"
 		debug_settings_x86.config_ext = "_x86_d"
-		debug_settings_x86.cc.flags:Add("-arch i386")
-		debug_settings_x86.link.flags:Add("-arch i386")
 		debug_settings_x86.cc.defines:Add("CONF_DEBUG")
 
 		release_settings_x86 = release_settings:Copy()
 		release_settings_x86.config_name = "release_x86"
 		release_settings_x86.config_ext = "_x86"
-		release_settings_x86.cc.flags:Add("-arch i386")
-		release_settings_x86.link.flags:Add("-arch i386")
 		release_settings_x86.cc.defines:Add("CONF_RELEASE")
 
 		x86_d = build(debug_settings_x86)

configure.lua

@@ -1,4 +1,17 @@
 
+function loadfile_(filename, env)
+	local file
+	if _VERSION == "Lua 5.1" then
+		file = loadfile(filename)
+		if file then
+			setfenv(file, env)
+		end
+	else
+		file = loadfile(filename, nil, env)
+	end
+	return file
+end
+
 --[[@GROUP Configuration@END]]--
 
 --[[@FUNCTION
@@ -72,21 +85,20 @@ function NewConfig(on_configured_callback)
 	end
 
 	config.Load = function(self, filename)
-		local options_func = loadfile(filename)
 		local options_table = {}
+		local options_func = loadfile_(filename, options_table)
 
 		if not options_func then
 			print("auto configuration")
 			self:Config(filename)
-			options_func = loadfile(filename)
+			options_func = loadfile_(filename, options_table)
 		end
 
 		if options_func then
 			-- Setup the options tables
 			for k,v in pairs(self.options) do
 				options_table[v.name] = {}
 			end
-			setfenv(options_func, options_table)
 
 			-- this is to make sure that we get nice error messages when
 			-- someone sets an option that isn't valid.

datasrc/compile.py

@@ -143,6 +143,7 @@ class CNetObjHandler
 
 	const char *GetMsgName(int Type);
 	void *SecureUnpackMsg(int Type, CUnpacker *pUnpacker);
+	bool TeeHistorianRecordMsg(int Type);
 	const char *FailedMsgOn();
 };
 
@@ -310,6 +311,30 @@ class CNetObjHandler
 	lines += ['};']
 	lines += ['']
 
+	lines += ['bool CNetObjHandler::TeeHistorianRecordMsg(int Type)']
+	lines += ['{']
+	lines += ['\tswitch(Type)']
+	lines += ['\t{']
+	empty = True
+	for msg in network.Messages:
+		if not msg.teehistorian:
+			lines += ['\tcase %s:' % msg.enum_name]
+			empty = False
+	if not empty:
+		lines += ['\t\treturn false;']
+	lines += ['\tdefault:']
+	lines += ['\t\treturn true;']
+	lines += ['\t}']
+	lines += ['}']
+	lines += ['']
+
+	lines += ['void RegisterGameUuids(CUuidManager *pManager)']
+	lines += ['{']
+
+	for item in network.Objects + network.Messages:
+		if item.ex is not None:
+			lines += ['\tpManager->RegisterName(%s, "%s");' % (item.enum_name, item.ex)]
+	lines += ['}']
 
 	for l in lines:
 		print(l)

datasrc/datatypes.py

@@ -198,7 +198,7 @@ def __init__(self, name, values):
 		self.values = values
 
 class NetObject:
-	def __init__(self, name, variables):
+	def __init__(self, name, variables, ex=None):
 		l = name.split(":")
 		self.name = l[0]
 		self.base = ""
@@ -208,6 +208,7 @@ def __init__(self, name, variables):
 		self.struct_name = "CNetObj_%s" % self.name
 		self.enum_name = "NETOBJTYPE_%s" % self.name.upper()
 		self.variables = variables
+		self.ex = ex
 	def emit_declaration(self):
 		if self.base:
 			lines = ["struct %s : public %s"%(self.struct_name,self.base_struct_name), "{"]
@@ -221,7 +222,7 @@ def emit_validate(self):
 		lines = ["case %s:" % self.enum_name]
 		lines += ["{"]
 		lines += ["\t%s *pObj = (%s *)pData;"%(self.struct_name, self.struct_name)]
-		lines += ["\tif(sizeof(*pObj) != Size) return -1;"]
+		lines += ["\tif((int)sizeof(*pObj) > Size) return -1;"]
 		for v in self.variables:
 			lines += ["\t"+line for line in v.emit_validate()]
 		lines += ["\treturn 0;"]
@@ -230,18 +231,19 @@ def emit_validate(self):
 
 
 class NetEvent(NetObject):
-	def __init__(self, name, variables):
-		NetObject.__init__(self, name, variables)
+	def __init__(self, name, variables, ex=None):
+		NetObject.__init__(self, name, variables, ex=ex)
 		self.base_struct_name = "CNetEvent_%s" % self.base
 		self.struct_name = "CNetEvent_%s" % self.name
 		self.enum_name = "NETEVENTTYPE_%s" % self.name.upper()
 
 class NetMessage(NetObject):
-	def __init__(self, name, variables):
-		NetObject.__init__(self, name, variables)
+	def __init__(self, name, variables, ex=None, teehistorian=True):
+		NetObject.__init__(self, name, variables, ex=ex)
 		self.base_struct_name = "CNetMsg_%s" % self.base
 		self.struct_name = "CNetMsg_%s" % self.name
 		self.enum_name = "NETMSGTYPE_%s" % self.name.upper()
+		self.teehistorian = teehistorian
 	def emit_unpack(self):
 		lines = []
 		lines += ["case %s:" % self.enum_name]
@@ -271,6 +273,17 @@ def emit_declaration(self):
 		lines = lines[:-1] + extra + lines[-1:]
 		return lines
 
+class NetObjectEx(NetObject):
+	def __init__(self, name, ex, variables):
+		NetObject.__init__(self, name, variables, ex=ex)
+
+class NetEventEx(NetEvent):
+	def __init__(self, name, ex, variables):
+		NetEvent.__init__(self, name, variables, ex=ex)
+
+class NetMessageEx(NetMessage):
+	def __init__(self, name, ex, variables, teehistorian=True):
+		NetMessage.__init__(self, name, variables, ex=ex)
 
 class NetVariable:
 	def __init__(self, name):