Small changes

src/client/component/network.cpp

@@ -142,7 +142,7 @@ namespace network
 		sockaddr_in to{};
 		to.sin_family = AF_INET;
 		to.sin_port = htons(address.port);
-		to.sin_addr.S_un.S_addr = *reinterpret_cast<const ULONG*>(&address.ipv4.a);
+		to.sin_addr.S_un.S_addr = address.addr;
 		return to;
 	}
 
@@ -179,6 +179,17 @@ namespace network
 		return addr;
 	}
 
+	game::netadr_t address_from_ip(const uint32_t ip, const uint16_t port)
+	{
+		game::netadr_t addr{};
+		addr.localNetID = game::NS_SERVER;
+		addr.type = game::NA_RAWIP;
+		addr.port = port;
+		addr.addr = ip;
+
+		return addr;
+	}
+
 	bool are_addresses_equal(const game::netadr_t& a, const game::netadr_t& b)
 	{
 		if (a.type != b.type)
@@ -191,8 +202,7 @@ namespace network
 			return true;
 		}
 
-		return a.port == b.port && *reinterpret_cast<const uint32_t*>(&a.ipv4.a) == *reinterpret_cast<const uint32_t*>(&
+		return a.port == b.port && a.addr == b.addr;
-			b.ipv4.a);
 	}
 
 	class component final : public component_interface

src/client/component/network.hpp

@@ -14,6 +14,7 @@ namespace network
 	void send_data(const game::netadr_t& address, const std::string& data);
 
 	game::netadr_t address_from_string(const std::string& address);
+	game::netadr_t address_from_ip(uint32_t ip, uint16_t port);
 
 	bool are_addresses_equal(const game::netadr_t& a, const game::netadr_t& b);
 }
@@ -53,7 +54,7 @@ namespace std
 				return type_hash;
 			}
 
-			return type_hash ^ hash<uint32_t>()(*reinterpret_cast<const uint32_t*>(&x.ipv4.a)) ^ hash<
+			return type_hash ^ hash<uint32_t>()(x.addr) ^ hash<
 				uint16_t>()(x.port);
 		}
 	};

src/client/game/structs.hpp

@@ -5,6 +5,17 @@ namespace game
 {
 #endif
 
+	enum ControllerIndex_t
+	{
+		INVALID_CONTROLLER_PORT = 0xFFFFFFFF,
+		CONTROLLER_INDEX_FIRST = 0x0,
+		CONTROLLER_INDEX_0 = 0x0,
+		CONTROLLER_INDEX_1 = 0x1,
+		CONTROLLER_INDEX_2 = 0x2,
+		CONTROLLER_INDEX_3 = 0x3,
+		CONTROLLER_INDEX_COUNT = 0x4,
+	};
+
 	enum eModes
 	{
 		MODE_ZOMBIES = 0x0,
@@ -496,8 +507,13 @@ namespace game
 
 	struct netadr_t
 	{
-		netipv4_t ipv4;
+		union
-		unsigned __int16 port;
+		{
+			netipv4_t ipv4;
+			uint32_t addr;
+		};
+
+		uint16_t port;
 		netadrtype_t type;
 		netsrc_t localNetID;
 	};
@@ -521,6 +537,14 @@ namespace game
 
 	typedef bdSecurityKey XNKEY;
 
+	typedef uint64_t XUID;
+
+	struct SerializedAdr
+	{
+		byte valid;
+		byte addrBuff[37];
+	};
+
 	struct XSESSION_INFO
 	{
 		XNKID sessionID;
@@ -579,6 +603,166 @@ namespace game
 		//PacketMode analysis;
 	};
 
+	typedef void* bdCommonAddrRef;
+
+	struct HostInfo
+	{
+		uint64_t xuid;
+		char name[32];
+		netadr_t netAdr;
+		SerializedAdr serializedAdr;
+		bdSecurityID secId;
+		bdSecurityKey secKey;
+		uint32_t serverLocation;
+	};
+
+	enum LobbyType
+	{
+		LOBBY_TYPE_INVALID = 0xFFFFFFFF,
+		LOBBY_TYPE_PRIVATE = 0x0,
+		LOBBY_TYPE_GAME = 0x1,
+		LOBBY_TYPE_TRANSITION = 0x2,
+		LOBBY_TYPE_COUNT = 0x3,
+		LOBBY_TYPE_FIRST = 0x0,
+		LOBBY_TYPE_LAST = 0x2,
+		LOBBY_TYPE_AUTO = 0x3,
+	};
+
+	enum LobbyNetworkMode
+	{
+		LOBBY_NETWORKMODE_INVALID = 0xFFFFFFFF,
+		LOBBY_NETWORKMODE_LOCAL = 0x0,
+		LOBBY_NETWORKMODE_LAN = 0x1,
+		LOBBY_NETWORKMODE_LIVE = 0x2,
+		LOBBY_NETWORKMODE_COUNT = 0x3,
+	};
+
+	enum LobbyMainMode
+	{
+		LOBBY_MAINMODE_INVALID = 0xFFFFFFFF,
+		LOBBY_MAINMODE_CP = 0x0,
+		LOBBY_MAINMODE_MP = 0x1,
+		LOBBY_MAINMODE_ZM = 0x2,
+		LOBBY_MAINMODE_COUNT = 0x3,
+	};
+
+	struct LobbyParams
+	{
+		LobbyNetworkMode networkMode;
+		LobbyMainMode mainMode;
+	};
+
+	enum JoinType
+	{
+		JOIN_TYPE_NORMAL = 0x0,
+		JOIN_TYPE_PLAYLIST = 0x1,
+		JOIN_TYPE_FRIEND = 0x2,
+		JOIN_TYPE_INVITE = 0x3,
+		JOIN_TYPE_PARTY = 0x4,
+		JOIN_TYPE_COUNT = 0x5,
+	};
+
+	struct JoinHost
+	{
+		HostInfo info;
+		LobbyType lobbyType;
+		LobbyParams lobbyParams;
+		uint64_t reservationKey;
+		int retryTime;
+		int retryCount;
+	};
+
+	enum JoinSourceState
+	{
+		JOIN_SOURCE_STATE_IDLE = 0x0,
+		JOIN_SOURCE_STATE_CONNECT_TO_NEXT_HOST = 0x1,
+		JOIN_SOURCE_STATE_ASSOCIATING = 0x2,
+		JOIN_SOURCE_STATE_HANDSHAKING = 0x3,
+		JOIN_SOURCE_STATE_WAITING_FOR_AGREEMENT = 0x4,
+		JOIN_SOURCE_STATE_CONNECTION_FAILED = 0x5,
+		JOIN_SOURCE_STATE_CONNECTION_SUCCESS = 0x6,
+		JOIN_SOURCE_STATE_ENDING_HOST = 0x7,
+		JOIN_SOURCE_STATE_CLEANUP = 0x8,
+		JOIN_SOURCE_STATE_COUNT = 0x9,
+	};
+
+	enum JoinResult
+	{
+		JOIN_RESULT_INVALID = 0x0,
+		JOIN_RESULT_SUCCESS = 0x1,
+		JOIN_RESULT_CONNECT_TO_HOST_FAILURE = 0x2,
+		JOIN_RESULT_PROBE_SEND_FAILURE = 0x3,
+		JOIN_RESULT_PROBE_TIMEOUT = 0x4,
+		JOIN_RESULT_PROBE_INVALID_LOBBY = 0x5,
+		JOIN_RESULT_PROBE_INVALID_INFO = 0x6,
+		JOIN_RESULT_PROBE_RESULT_INVALID = 0x7,
+		JOIN_RESULT_INVALID_LOBBY = 0x8,
+		JOIN_RESULT_SEND_AGREEMENT_REQUEST_FAILED = 0x9,
+		JOIN_RESULT_HANDSHAKE_WINDOW_EXPIRED = 0xA,
+		JOIN_RESULT_AGREEMENT_WINDOW_EXPIRED = 0xB,
+		JOIN_RESULT_JOIN_DISABLED = 0xC,
+		JOIN_RESULT_JOIN_ALREADY_IN_PROGRESS = 0xD,
+		JOIN_RESULT_NOT_JOINABLE_NOT_HOSTING = 0xE,
+		JOIN_RESULT_NOT_JOINABLE_NOT_IDLE = 0xF,
+		JOIN_RESULT_NOT_JOINABLE_CLOSED = 0x10,
+		JOIN_RESULT_NOT_JOINABLE_INVITE_ONLY = 0x11,
+		JOIN_RESULT_NOT_JOINABLE_FRIENDS_ONLY = 0x12,
+		JOIN_RESULT_LOBBY_FULL = 0x13,
+		JOIN_RESULT_NETWORK_MODE_MISMATCH = 0x14,
+		JOIN_RESULT_MISMATCH_PLAYLISTID = 0x15,
+		JOIN_RESULT_MISMATCH_PLAYLIST_VERSION_TO_NEW = 0x16,
+		JOIN_RESULT_MISMATCH_PLAYLIST_VERSION_TO_OLD = 0x17,
+		JOIN_RESULT_MISMATCH_PROTOCOL_VERSION = 0x18,
+		JOIN_RESULT_MISMATCH_NETFIELD_CHECKSUM = 0x19,
+		JOIN_RESULT_MISMATCH_FFOTD_VERSION_TO_NEW = 0x1A,
+		JOIN_RESULT_MISMATCH_FFOTD_VERSION_TO_OLD = 0x1B,
+		JOIN_RESULT_MIGRATE_IN_PROGRESS = 0x1C,
+		JOIN_RESULT_COULD_NOT_RESERVE = 0x1D,
+		JOIN_RESPONSE_COUNT = 0x1E,
+	};
+
+	typedef void (*joinCompleteCallback)(const int, JoinResult);
+
+	struct AgreementStatus
+	{
+		XUID xuid;
+		char name[32];
+		bool responded;
+		bool agrees;
+		int startTime;
+		int responseTime;
+	};
+
+	struct Agreement
+	{
+		int nonce;
+		AgreementStatus status[18];
+		int requestCount;
+		int responseCount;
+		int agreeCount;
+	};
+
+	struct Join
+	{
+		JoinSourceState state;
+		int actionId;
+		int startTime;
+		int duration;
+		ControllerIndex_t controllerIndex;
+		LobbyType sourceLobbyType;
+		LobbyType targetLobbyType;
+		joinCompleteCallback joinComplete;
+		JoinHost hostList[50];
+		int hostCount;
+		int processedCount;
+		bool isFinalized;
+		JoinHost potentialHost;
+		Agreement agreement;
+		Agreement debugAgreement;
+		JoinType joinType;
+		JoinResult joinResult;
+	};
+
 #ifdef __cplusplus
 }
 #endif

src/client/game/symbols.hpp

@@ -40,6 +40,7 @@ namespace game
 	WEAK symbol<bool(netadr_t*, char const*)> NetAdr_InitFromString{0x142332F70_g};
 
 	// Sys
+	WEAK symbol<int()> Sys_Milliseconds{0x142333430_g};
 	WEAK symbol<void()> Sys_ShowConsole{0x142333F80_g};
 	WEAK symbol<TLSData*()> Sys_GetTLS{0x142184210_g};
 
@@ -64,6 +65,8 @@ namespace game
 
 	WEAK symbol<SOCKET> ip_socket{0x157E77818_g};
 
+	WEAK symbol<Join> s_join{0x15574C640_g};
+
 	namespace s_wcd
 	{
 		WEAK symbol<HWND> codLogo{0x157E77A50_g};

src/common/utils/cryptography.cpp

@@ -628,7 +628,7 @@ namespace utils::cryptography
 	std::string random::get_challenge()
 	{
 		std::string result;
-		result.resize(sizeof(uint32_t));
+		result.resize(sizeof(uint64_t));
 		random::get_data(result.data(), result.size());
 		return string::dump_hex(result, "");
 	}