Uuid from the community

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>

Author: Bamcane

CMakeLists.txt

@@ -26,6 +26,7 @@ if(NOT POLICY CMP0048)
 endif()
 
 project(teeworlds VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+project(teeworlds C CXX)
 
 set(ORIGINAL_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
 set(ORIGINAL_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
@@ -1272,6 +1273,8 @@ set_src(BASE GLOB_RECURSE src/base
   tl/sorted_array.h
   tl/string.h
   tl/threading.h
+  uuid.c
+  uuid.h
   vmath.h
 )
 set_src(ENGINE_INTERFACE GLOB src/engine
@@ -1295,6 +1298,7 @@ set_src(ENGINE_INTERFACE GLOB src/engine
   sound.h
   storage.h
   textrender.h
+  uuid.h
 )
 set_src(ENGINE_SHARED GLOB src/engine/shared
   compression.cpp
@@ -1343,11 +1347,16 @@ set_src(ENGINE_SHARED GLOB src/engine/shared
   packer.cpp
   packer.h
   protocol.h
+  protocol_ex.cpp
+  protocol_ex.h
+  protocol_ex_msgs.h
   ringbuffer.cpp
   ringbuffer.h
   snapshot.cpp
   snapshot.h
   storage.cpp
+  uuid_manager.cpp
+  uuid_manager.h
 )
 set(ENGINE_GENERATED_SHARED src/generated/nethash.cpp src/generated/protocol.cpp src/generated/protocol.h)
 set_src(GAME_SHARED GLOB src/game

bam.lua

@@ -150,15 +150,15 @@ function GenerateMacOSSettings(settings, conf, arch, compiler)
 	-- Build server launcher before adding game stuff
 	local serverlaunch = Link(settings, "serverlaunch", Compile(settings, "src/macoslaunch/server.m"))
 
+	-- Add requirements for Server & Client
+	BuildGameCommon(settings)
+
 	-- Master server, version server and tools
 	BuildEngineCommon(settings)
 	BuildMasterserver(settings)
 	BuildVersionserver(settings)
 	BuildTools(settings)
 
-	-- Add requirements for Server & Client
-	BuildGameCommon(settings)
-
 	-- Server
 	settings.link.frameworks:Add("Cocoa")
 	local server_exe = BuildServer(settings)
@@ -198,15 +198,15 @@ function GenerateLinuxSettings(settings, conf, arch, compiler)
 
 	GenerateCommonSettings(settings, conf, arch, compiler)
 
+	-- Add requirements for Server & Client
+	BuildGameCommon(settings)
+
 	-- Master server, version server and tools
 	BuildEngineCommon(settings)
 	BuildTools(settings)
 	BuildMasterserver(settings)
 	BuildVersionserver(settings)
 
-	-- Add requirements for Server & Client
-	BuildGameCommon(settings)
-
 	-- Server
 	BuildServer(settings)
 
@@ -262,15 +262,15 @@ function GenerateWindowsSettings(settings, conf, target_arch, compiler)
 
 	GenerateCommonSettings(settings, conf, target_arch, compiler)
 
+	-- Add requirements for Server & Client
+	BuildGameCommon(settings)
+
 	-- Master server, version server and tools
 	BuildEngineCommon(settings)
 	BuildMasterserver(settings)
 	BuildVersionserver(settings)
 	BuildTools(settings)
 
-	-- Add requirements for Server & Client
-	BuildGameCommon(settings)
-
 	-- Server
 	local server_settings = settings:Copy()
 	server_settings.link.extrafiles:Add(icons.server)

datasrc/compile.py

@@ -3,10 +3,10 @@
 import content
 import network
 
-def create_enum_table(names, num):
+def create_enum_table(names, num, start = "0"):
 	lines = []
 	lines += ["enum", "{"]
-	lines += ["\t%s=0,"%names[0]]
+	lines += [f"\t{names[0]} = {start},"]
 	for name in names[1:]:
 		lines += ["\t%s,"%name]
 	lines += ["\t%s" % num, "};"]
@@ -109,9 +109,16 @@ def EmitFlags(names, num):
 		for l in create_flags_table(["%s_%s" % (e.name, v) for v in e.values]): print(l)
 		print("")
 
-	for l in create_enum_table(["NETOBJ_INVALID"]+[o.enum_name for o in network.Objects], "NUM_NETOBJTYPES"): print(l)
+	non_extended = [o for o in network.Objects if o.ex is None]
+	extended = [o for o in network.Objects if o.ex is not None]
+	for l in create_enum_table(["NETOBJTYPE_EX"]+[o.enum_name for o in non_extended], "NUM_NETOBJTYPES"): print(l)
+	for l in create_enum_table(["__NETOBJTYPE_UUID_HELPER"]+[o.enum_name for o in extended], "OFFSET_NETMSGTYPE_UUID", "OFFSET_GAME_UUID - 1"): print(l)
 	print("")
-	for l in create_enum_table(["NETMSG_INVALID"]+[o.enum_name for o in network.Messages], "NUM_NETMSGTYPES"): print(l)
+
+	non_extended = [o for o in network.Messages if o.ex is None]
+	extended = [o for o in network.Messages if o.ex is not None]
+	for l in create_enum_table(["NETMSGTYPE_EX"]+[o.enum_name for o in non_extended], "NUM_NETMSGTYPES"): print(l)
+	for l in create_enum_table(["__NETMSGTYPE_UUID_HELPER"]+[o.enum_name for o in extended], "OFFSET_MAPITEMTYPE_UUID", "OFFSET_NETMSGTYPE_UUID - 1"): print(l)
 	print("")
 
 	for item in network.Objects + network.Messages:
@@ -267,6 +274,10 @@ class CNetObjHandler
 	lines += ['{']
 	lines += ['\tswitch(Type)']
 	lines += ['\t{']
+	lines += ['\tcase NETOBJTYPE_EX:']
+	lines += ['\t{']
+	lines += ['\t\treturn 0;']
+	lines += ['\t}']
 
 	for item in network.Objects:
 		base_item = None
@@ -332,6 +343,13 @@ class CNetObjHandler
 	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

@@ -210,7 +210,7 @@ def __init__(self, name, values):
 		self.values = values
 
 class NetObject:
-	def __init__(self, name, variables):
+	def __init__(self, name, variables, ex=None, fixup=True):
 		l = name.split(":")
 		self.name = l[0]
 		self.base = ""
@@ -220,6 +220,10 @@ def __init__(self, name, variables):
 		self.struct_name = "CNetObj_%s" % self.name
 		self.enum_name = "NETOBJTYPE_%s" % self.name.upper()
 		self.variables = variables
+		if fixup and ex != None:
+			ex = "object-{}".format(ex)
+		self.ex = ex
+
 	def emit_declaration(self):
 		if self.base:
 			lines = ["struct %s : public %s"%(self.struct_name,self.base_struct_name), "{"]
@@ -245,15 +249,17 @@ def emit_validate(self, base_item):
 
 
 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):
+		if ex != None:
+			ex = "message-{}".format(ex)
+		NetObject.__init__(self, name, variables, ex=ex, fixup=False)
 		self.base_struct_name = "CNetMsg_%s" % self.base
 		self.struct_name = "CNetMsg_%s" % self.name
 		self.enum_name = "NETMSGTYPE_%s" % self.name.upper()
@@ -399,3 +405,15 @@ def emit_unpack_check(self):
 			self.var.name = self.base_name + "[%d]"%i
 			lines += self.var.emit_unpack_check()
 		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):
+		NetMessage.__init__(self, name, variables, ex=ex)

datasrc/network.py

@@ -24,6 +24,7 @@
 RawHeader = '''
 
 #include <engine/message.h>
+#include <engine/shared/protocol_ex.h>
 
 enum
 {

src/base/system.c

@@ -2908,6 +2908,65 @@ const char *str_find(const char *haystack, const char *needle)
 	return 0;
 }
 
+static int hexval(char x)
+{
+	switch(x)
+	{
+	case '0': return 0;
+	case '1': return 1;
+	case '2': return 2;
+	case '3': return 3;
+	case '4': return 4;
+	case '5': return 5;
+	case '6': return 6;
+	case '7': return 7;
+	case '8': return 8;
+	case '9': return 9;
+	case 'a':
+	case 'A': return 10;
+	case 'b':
+	case 'B': return 11;
+	case 'c':
+	case 'C': return 12;
+	case 'd':
+	case 'D': return 13;
+	case 'e':
+	case 'E': return 14;
+	case 'f':
+	case 'F': return 15;
+	default: return -1;
+	}
+}
+
+static int byteval(const char *hex, unsigned char *dst)
+{
+	int v1 = hexval(hex[0]);
+	int v2 = hexval(hex[1]);
+
+	if(v1 < 0 || v2 < 0)
+		return 1;
+
+	*dst = v1 * 16 + v2;
+	return 0;
+}
+
+int str_hex_decode(void *dst, int dst_size, const char *src)
+{
+	unsigned char *cdst = (unsigned char *) dst;
+	int slen = str_length(src);
+	int len = slen / 2;
+	int i;
+	if(slen != dst_size * 2)
+		return 2;
+
+	for(i = 0; i < len && dst_size; i++, dst_size--)
+	{
+		if(byteval(src + i * 2, cdst++))
+			return 1;
+	}
+	return 0;
+}
+
 void str_hex(char *dst, int dst_size, const void *data, int data_size)
 {
 	static const char hex[] = "0123456789ABCDEF";

src/base/system.h

@@ -1402,6 +1402,26 @@ const char *str_find_nocase(const char *haystack, const char *needle);
 */
 const char *str_find(const char *haystack, const char *needle);
 
+/*
+	Function: str_hex_decode
+		Takes a hex string *without spaces between bytes* and returns a
+		byte array.
+
+	Parameters:
+		dst - Buffer for the byte array
+		dst_size - size of the buffer
+		data - String to decode
+
+	Returns:
+		2 - String doesn't exactly fit the buffer
+		1 - Invalid character in string
+		0 - Success
+
+	Remarks:
+		- The contents of the buffer is only valid on success
+*/
+int str_hex_decode(void *dst, int dst_size, const char *src);
+
 /*
 	Function: str_hex
 		Takes a datablock and generates a hexstring of it.