Correct XUID generation and getinfo experiments.

This commit is contained in:
momo5502 2015-12-24 19:21:10 +01:00
parent cb15d250f9
commit c6e3695228
8 changed files with 97 additions and 4 deletions

View File

@ -119,10 +119,30 @@ namespace Components
{ {
OutputDebugStringA(Utils::VA("getinfo received: %s!", address.GetString())); OutputDebugStringA(Utils::VA("getinfo received: %s!", address.GetString()));
int clientCount = 0;
for (int i = 0; i < *Game::svs_numclients; i++)
{
if (Game::svs_clients[i].state >= 3)
{
clientCount++;
}
}
auto data = std::string(message->data);
auto challenge = data.substr(data.find_first_of(" \n") + 1);
challenge = challenge.substr(0, challenge.find_first_of(" \n"));
Utils::InfoString info; Utils::InfoString info;
info.Set("mapname", "mp_rust"); info.Set("challenge", challenge.data()); // TODO: Fill!
info.Set("gamename", "tdm"); info.Set("gamename", "IW4");
info.Set("testKey", "testVal"); info.Set("hostname", Dvar::Var("sv_hostname").Get<const char*>());
info.Set("mapname", Dvar::Var("mapname").Get<const char*>());
info.Set("gametype", Dvar::Var("g_gametype").Get<const char*>());
info.Set("fs_game", Dvar::Var("fs_game").Get<const char*>());
info.Set("xuid", Utils::VA("%llX", Steam::SteamUser()->GetSteamID().m_Bits));
info.Set("clients", Utils::VA("%i", clientCount));
info.Set("sv_maxclients", Utils::VA("%i", *Game::svs_numclients));
Network::Send(Game::NS_CLIENT, address, Utils::VA("infoResponse\n%s\n", info.Build().data())); Network::Send(Game::NS_CLIENT, address, Utils::VA("infoResponse\n%s\n", info.Build().data()));
}); });

View File

@ -67,6 +67,9 @@ namespace Game
source_t **sourceFiles = (source_t **)0x7C4A98; source_t **sourceFiles = (source_t **)0x7C4A98;
keywordHash_t **menuParseKeywordHash = (keywordHash_t **)0x63AE928; keywordHash_t **menuParseKeywordHash = (keywordHash_t **)0x63AE928;
int* svs_numclients = (int*)0x31D938C;
client_t* svs_clients = (client_t*)0x31D9390;
void* ReallocateAssetPool(XAssetType type, unsigned int newSize) void* ReallocateAssetPool(XAssetType type, unsigned int newSize)
{ {
int elSize = DB_GetXAssetSizeHandlers[type](); int elSize = DB_GetXAssetSizeHandlers[type]();

View File

@ -121,6 +121,9 @@ namespace Game
extern DWORD* cmd_argc; extern DWORD* cmd_argc;
extern char*** cmd_argv; extern char*** cmd_argv;
extern int* svs_numclients;
extern client_t* svs_clients;
extern source_t **sourceFiles; extern source_t **sourceFiles;
extern keywordHash_t **menuParseKeywordHash; extern keywordHash_t **menuParseKeywordHash;

View File

@ -638,6 +638,45 @@ namespace Game
int readcount; // 28 int readcount; // 28
} msg_t; } msg_t;
#pragma pack(push, 1)
typedef struct client_s
{
// 0
int state;
// 4
char pad[36];
// 40
netadr_t adr;
// 60
char pad1[1568];
// 1628
char connectInfoString[1024];
// 2652
char pad2[133192];
// 135844
char name[16];
// 135860
char pad3[12];
// 135872
int snapNum;
// 135876
int pad4;
// 135880
short ping;
// 135882
//char pad5[142390];
char pad5[133158];
// 269040
int isBot;
// 269044
char pad6[9228];
// 278272
__int64 steamid;
// 278280
char pad7[403592];
} client_t;
#pragma pack(pop)
// Q3TA precompiler code // Q3TA precompiler code
//undef if binary numbers of the form 0b... or 0B... are not allowed //undef if binary numbers of the form 0b... or 0B... are not allowed

View File

@ -5,6 +5,9 @@
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <wincrypt.h>
#pragma comment(lib, "Crypt32.lib")
#include <map> #include <map>
#include <mutex> #include <mutex>

View File

@ -15,7 +15,16 @@ namespace Steam
SteamID User::GetSteamID() SteamID User::GetSteamID()
{ {
SteamID id; SteamID id;
id.m_Bits = 0x110000100000000 | 0x1337;
DATA_BLOB DataIn;
DATA_BLOB DataOut;
DataIn.pbData = (BYTE *)"AAAAAAAAAA";
DataIn.cbData = 10;
CryptProtectData(&DataIn, NULL, NULL, NULL, NULL, CRYPTPROTECT_LOCAL_MACHINE, &DataOut);
id.m_Bits = 0x110000100000000 | ::Utils::OneAtATime((char*)DataOut.pbData, 52);
return id; return id;
} }

View File

@ -59,6 +59,21 @@ namespace Utils
} }
} }
unsigned int OneAtATime(char *key, size_t len)
{
unsigned int hash, i;
for (hash = i = 0; i < len; ++i)
{
hash += key[i];
hash += (hash << 10);
hash ^= (hash >> 6);
}
hash += (hash << 3);
hash ^= (hash >> 11);
hash += (hash << 15);
return hash;
}
// Infostring class // Infostring class
void InfoString::Set(std::string key, std::string value) void InfoString::Set(std::string key, std::string value)
{ {

View File

@ -5,6 +5,7 @@ namespace Utils
bool EndsWith(const char* heystack, const char* needle); bool EndsWith(const char* heystack, const char* needle);
std::vector<std::string> Explode(const std::string& str, const std::string& delimiters); std::vector<std::string> Explode(const std::string& str, const std::string& delimiters);
void Replace(std::string &string, std::string find, std::string replace); void Replace(std::string &string, std::string find, std::string replace);
unsigned int OneAtATime(char *key, size_t len);
class InfoString class InfoString
{ {