Use helpers_extended to get function pointers and interfaces

Update license
Clean up headers and includes
Bump revision number

Author: danielga

license.txt

@@ -2,7 +2,7 @@ gm_sourcenet
 A module for Garry's Mod that provides interfaces to many systems
 of VALVe's engine.
 -----------------------------------------------------------------------
-Copyright (c) 2015-2019, Daniel Almeida
+Copyright (c) 2015-2020, Daniel Almeida
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

premake5.lua

@@ -6,11 +6,12 @@ newoption({
 
 local gmcommon = assert(_OPTIONS.gmcommon or os.getenv("GARRYSMOD_COMMON"),
 	"you didn't provide a path to your garrysmod_common (https://github.com/danielga/garrysmod_common) directory")
-include(path.join(gmcommon, "generator.v2.lua"))
+include(gmcommon .. "/generator.v2.lua")
 
 CreateWorkspace({name = "sourcenet", abi_compatible = true})
 	CreateProject({serverside = true})
 		IncludeLuaShared()
+		IncludeHelpersExtended()
 		IncludeSDKCommon()
 		IncludeSDKTier0()
 		IncludeSDKTier1()
@@ -21,9 +22,9 @@ CreateWorkspace({name = "sourcenet", abi_compatible = true})
 
 	CreateProject({serverside = false})
 		IncludeLuaShared()
+		IncludeHelpersExtended()
 		IncludeSDKCommon()
 		IncludeSDKTier0()
 		IncludeSDKTier1()
 		IncludeScanning()
 		IncludeDetouring()
-

source/gameeventmanager.cpp

@@ -5,6 +5,7 @@
 #include "sn_bf_write.hpp"
 
 #include <GarrysMod/Lua/AutoReference.h>
+
 #include <igameevents.h>
 
 namespace GameEventManager

source/hooks.cpp

@@ -6,13 +6,15 @@
 #include "sn_bf_write.hpp"
 #include "net.hpp"
 
-#include <inetmsghandler.h>
-#include <cdll_int.h>
-#include <scanning/symbolfinder.hpp>
 #include <GarrysMod/Lua/Helpers.hpp>
-#include <detouring/classproxy.hpp>
+#include <GarrysMod/FunctionPointers.hpp>
 #include <Platform.hpp>
 
+#include <detouring/classproxy.hpp>
+
+#include <inetmsghandler.h>
+#include <cdll_int.h>
+
 namespace Hooks
 {
 
@@ -64,17 +66,6 @@ namespace Hooks
 	class CNetChanProxy : public Detouring::ClassProxy<CNetChan, CNetChanProxy>
 	{
 	private:
-
-#if defined SYSTEM_WINDOWS
-
-		typedef bool( __thiscall *ProcessMessages_t )( CNetChan *netchan, bf_read &buf );
-
-#else
-
-		typedef bool( *ProcessMessages_t )( CNetChan *netchan, bf_read &buf );
-
-#endif
-
 		typedef CNetChan TargetClass;
 		typedef CNetChanProxy SubstituteClass;
 
@@ -83,25 +74,12 @@ namespace Hooks
 			return NetChannel::Get( LUA, index );
 		}
 
-		static const char ProcessMessages_sig[];
-		static const size_t ProcessMessages_siglen;
-
-		static ProcessMessages_t ProcessMessages_original;
+		static FunctionPointers::CNetChan_ProcessMessages_t ProcessMessages_original;
 
 	public:
 		static void Initialize( GarrysMod::Lua::ILuaBase *LUA )
 		{
-			{
-				SymbolFinder symfinder;
-
-				ProcessMessages_original =
-					reinterpret_cast<ProcessMessages_t>( symfinder.Resolve(
-						global::engine_loader.GetModuleLoader( ).GetModule( ),
-						ProcessMessages_sig,
-						ProcessMessages_siglen
-					) );
-			}
-
+			ProcessMessages_original = FunctionPointers::CNetChan_ProcessMessages( );
 			if( ProcessMessages_original == nullptr )
 				LUA->ThrowError( "failed to locate CNetChan::ProcessMessages" );
 		}
@@ -210,15 +188,19 @@ namespace Hooks
 		{
 			CNetChan *netchan = This( );
 
-			static uint8_t data[100000] = { 0 };
 			if( !buf.IsOverflowed( ) )
 			{
-				memcpy( data, buf.GetBasePointer( ), buf.GetNumBytesRead( ) );
+				static uint8_t data[100000] = { 0 };
 
-				int32_t bitsread = buf.GetNumBitsRead( );
+				const int32_t bytesread = buf.GetNumBytesRead( );
+				if( bytesread > 0 )
+					std::memcpy( data, buf.GetBasePointer( ), bytesread );
+
+				const int32_t bitsread = buf.GetNumBitsRead( );
 				bf_write write( data, sizeof( data ) );
 				write.SeekToBit( bitsread );
 
+				bool handled = false;
 				HOOK_INIT( "PreProcessMessages" );
 				HOOK_PUSH( NetChannel::Push( LUA, netchan ) );
 				HOOK_PUSH( bf_read **reader = sn_bf_read::Push( LUA, &buf ) );
@@ -232,18 +214,27 @@ namespace Hooks
 					) );
 				}
 
-				HOOK_CALL( 0 );
+				if( HOOK_CALL( 1 ) )
+				{
+					if( LUA->IsType( -1, GarrysMod::Lua::Type::BOOL ) )
+						handled = LUA->GetBool( -1 );
+
+					LUA->Pop( 1 );
+				}
 
 				*reader = nullptr;
 				*writer = nullptr;
 				HOOK_END( );
 
-				buf.StartReading(
-					write.GetBasePointer( ),
-					write.GetNumBytesWritten( ),
-					bitsread,
-					write.GetNumBitsWritten( )
-				);
+				if( handled )
+					buf.StartReading(
+						write.GetBasePointer( ),
+						write.GetNumBytesWritten( ),
+						bitsread,
+						write.GetNumBitsWritten( )
+					);
+				else
+					buf.Seek( bitsread );
 			}
 
 			return Call<bool, bf_read &>( ProcessMessages_original, buf );
@@ -262,28 +253,7 @@ namespace Hooks
 
 	CNetChanProxy CNetChanProxy::Singleton;
 
-#if defined SYSTEM_WINDOWS
-
-	const char CNetChanProxy::ProcessMessages_sig[] = "\x55\x8B\xEC\x83\xEC\x2C\xF7\x05";
-	const size_t CNetChanProxy::ProcessMessages_siglen =
-		sizeof( CNetChanProxy::ProcessMessages_sig ) - 1;
-
-#elif ( defined SYSTEM_LINUX && defined SOURCENET_SERVER ) || defined SYSTEM_MACOSX
-
-	const char CNetChanProxy::ProcessMessages_sig[] =
-		"@_ZN8CNetChan15ProcessMessagesER7bf_read";
-	const size_t CNetChanProxy::ProcessMessages_siglen = 0;
-
-#elif defined SYSTEM_LINUX && defined SOURCENET_CLIENT
-
-	const char CNetChanProxy::ProcessMessages_sig[] =
-		"\x55\x89\xE5\x57\x56\x53\x83\xEC\x6C\x8B\x3D\x2A\x2A\x2A\x2A\x8B";
-	const size_t CNetChanProxy::ProcessMessages_siglen =
-		sizeof( CNetChanProxy::ProcessMessages_sig ) - 1;
-
-#endif
-
-	CNetChanProxy::ProcessMessages_t CNetChanProxy::ProcessMessages_original = nullptr;
+	FunctionPointers::CNetChan_ProcessMessages_t CNetChanProxy::ProcessMessages_original = nullptr;
 
 	class INetChannelHandlerProxy : public Detouring::ClassProxy<INetChannelHandler, INetChannelHandlerProxy>
 	{

source/main.cpp

@@ -23,42 +23,15 @@
 
 #endif
 
-#include <scanning/symbolfinder.hpp>
+#include <GarrysMod/InterfacePointers.hpp>
+
 #include <interface.h>
 #include <eiface.h>
 #include <cdll_int.h>
 #include <iserver.h>
-#include <Platform.hpp>
 
 namespace global
 {
-
-#if defined SYSTEM_WINDOWS
-
-	static const char IServer_sig[] = "\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\xD8\x6D\x24\x83\x4D\xEC\x10";
-	static const size_t IServer_siglen = sizeof( IServer_sig ) - 1;
-
-#elif defined SYSTEM_LINUX
-
-#if defined SOURCENET_SERVER
-
-	static const char IServer_sig[] = "@sv";
-	static const size_t IServer_siglen = 0;
-
-#elif defined SOURCENET_CLIENT
-
-	static const char IServer_sig[] = "\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\xC7\x85\x68\xFF\xFF\xFF\x68";
-	static const size_t IServer_siglen = sizeof( IServer_sig ) - 1;
-
-#endif
-
-#elif defined SYSTEM_MACOSX
-
-	static const char IServer_sig[] = "\x2A\x2A\x2A\x2A\x8B\x08\x89\x04\x24\xFF\x51\x28\xF3\x0F\x10\x45";
-	static const size_t IServer_siglen = sizeof( IServer_sig ) - 1;
-
-#endif
-
 	static bool loaded = false;
 
 	const char *tostring_format = "%s: %p";
@@ -116,11 +89,11 @@ namespace global
 	{
 		LUA->CreateTable( );
 
-		LUA->PushString( "sourcenet 1.1.8" );
+		LUA->PushString( "sourcenet 1.1.9" );
 		LUA->SetField( -2, "Version" );
 
 		// version num follows LuaJIT style, xxyyzz
-		LUA->PushNumber( 10108 );
+		LUA->PushNumber( 10109 );
 		LUA->SetField( -2, "VersionNum" );
 
 		LUA->SetField( GarrysMod::Lua::INDEX_GLOBAL, "sourcenet" );
@@ -142,33 +115,19 @@ GMOD_MODULE_OPEN( )
 {
 	global::lua = LUA;
 
-	global::engine_server = global::engine_loader.GetInterface<IVEngineServer>( INTERFACEVERSION_VENGINESERVER );
+	global::engine_server = InterfacePointers::VEngineServer( );
 	if( global::engine_server == nullptr )
 		LUA->ThrowError( "failed to retrieve server engine interface" );
 
 	global::is_dedicated = global::engine_server->IsDedicatedServer( );
 	if( !global::is_dedicated )
 	{
-		global::engine_client = global::engine_loader.GetInterface<IVEngineClient>( VENGINE_CLIENT_INTERFACE_VERSION );
+		global::engine_client = InterfacePointers::VEngineClient( );
 		if( global::engine_client == nullptr )
 			LUA->ThrowError( "failed to retrieve client engine interface" );
 	}
 
-	IServer **pserver = nullptr;
-	{
-		SymbolFinder symfinder;
-
-		pserver = reinterpret_cast<IServer **>( symfinder.Resolve(
-			global::engine_loader.GetModuleLoader( ).GetModule( ),
-			global::IServer_sig,
-			global::IServer_siglen
-		) );
-	}
-
-	if( pserver == nullptr )
-		LUA->ThrowError( "failed to locate IServer pointer" );
-
-	global::server = *pserver;
+	global::server = InterfacePointers::Server( );
 	if( global::server == nullptr )
 		LUA->ThrowError( "failed to locate IServer" );
 

source/main.hpp

@@ -1,11 +1,12 @@
 #pragma once
 
 #include <GarrysMod/Lua/Interface.h>
-#include <lua.hpp>
-#include <stdint.h>
-#include <string>
 #include <GarrysMod/FactoryLoader.hpp>
+#include <lua.hpp>
 #include <Platform.hpp>
+
+#include <cstdint>
+#include <string>
 #include <limits>
 
 class IVEngineServer;