Os O5a: live parts of OsTcp

Port OsNetPump (TCPNET::Pump inlined), TCPNET::LogWrite and the
OsNetAddr helpers. The TCPNET connection layer is dead in 12340;
IoPump stays declared only. Os links ws2_32.

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
Saty
2026-09-25 16:31:52 +02:00
co-authored by Claude Opus 5.5
parent 68f8dc745a
commit 47a805dc6b
4 changed files with 198 additions and 40 deletions
+1
View File
@@ -14,5 +14,6 @@ if(WIN32)
PUBLIC
imm32
wininet
ws2_32
)
endif()
+26 -40
View File
@@ -1,50 +1,36 @@
#ifndef ENGINE_SOURCE_OS_OSTCP_H
#define ENGINE_SOURCE_OS_OSTCP_H
#include <cstddef>
#include <cstdint>
#include "Engine/Source/Storm/H/stpl.h"
#include "Engine/Source/Storm/H/Types.h"
class OsNet {
public:
/* 0000 */ uint8_t unk_0000;
/* 0001 */ uint8_t unk_0001;
/* 0002 */ uint8_t unk_0002;
/* 0003 */ uint8_t unk_0003;
/* 0004 */ uint8_t unk_0004;
/* 0005 */ uint8_t unk_0005[4];
/* 0009 */ uint8_t unk_0009[5];
/* 000E */ uint8_t unk_000E;
/* 000F */ uint8_t unk_000F;
/* 0010 */ uint8_t unk_0010;
/* 0011 */ uint8_t unk_0011;
/* 0012 */ uint8_t unk_0012[5];
/* 0017 */ uint8_t unk_0017;
/* 0018 */ uint8_t unk_0018[3];
/* 001B */ uint8_t unk_001B;
/* 001C */ uint8_t unk_001C;
/* 001D */ uint8_t unk_001D[4];
/* 0021 */ uint8_t unk_0021[23];
/* 0038 */ uint32_t unk_0038;
/* 003C */ uint32_t unk_003C;
/* 0040 */ uint32_t unk_0040;
/* 0044 */ uint8_t unk_0044[36];
/* 0068 */ uint32_t unk_0068;
/* 006C */ uint32_t unk_006C;
/* 0070 */ uint32_t unk_0070;
/* 0074 */ uint32_t unk_0074;
/* 0078 */ uint32_t unk_0078;
/* 007C */ uint32_t unk_007C;
/* 0080 */ uint8_t unk_0080[269];
/* 018D */ uint8_t unk_018D;
/* 018E */ uint8_t unk_018E;
/* 018F */ uint8_t unk_018F;
/* 0190 */ uint8_t unk_0190;
/* 0191 */ uint8_t unk_0191;
/* 0192 */ uint8_t unk_0192[4];
/* 0196 */ uint8_t unk_0196[1146];
/* 0610 */ uint32_t unk_0610;
union NETADDR {
/* 0000 */ uint8_t data[16];
};
namespace OsNet {
extern const char* OSNETERR_INTERNAL;
struct TCPNET {
/* 0000 */ uint8_t unk_0000[8];
/* 0008 */ TSGrowableArray<void*> m_pumpThreads;
/* 0018 */ uint8_t unk_0018[1528];
/* 0610 */ void* m_port;
static TCPNET* s_pnet;
static HSLOG s_log;
static void LogWrite(const char* format, ...);
void IoPump(uint32_t timeout);
void Pump(uint32_t timeout);
};
}
uint32_t OsNetAddrGetAddress(const NETADDR* addr, uint16_t* port);
void OsNetAddrMake(uint32_t address, uint16_t port, NETADDR* addr);
const char* OsNetAddrToStr(const NETADDR* addr, char* buffer, uint32_t size);
void OsNetPump(uint32_t timeout);
#endif
+88
View File
@@ -1,5 +1,93 @@
#if defined(WOWDECOMP_ARCH_32)
#include <cstdarg>
#include <cstdint>
#include <winsock2.h>
#include <windows.h>
#include "Engine/Source/Os/OsTcp.h"
#include "Engine/Source/Storm/H/storm.h"
// STATIC: 0x00B1D3F4
const char* OsNet::OSNETERR_INTERNAL = "Internal error";
// STATIC: 0x00D41830
OsNet::TCPNET* OsNet::TCPNET::s_pnet;
// STATIC: 0x00D41674
HSLOG OsNet::TCPNET::s_log;
// VERIFY: ae872b98 auto
// OFFSET: 0x0086D770
void OsNet::TCPNET::LogWrite(const char* format, ...) {
char line[1024];
DWORD lastError = GetLastError();
int wsaError = WSAGetLastError();
uint32_t length = static_cast<uint32_t>(SStrPrintf(line, sizeof(line), "t[0x%08x] se[%u] we[%u] ", GetCurrentThreadId(), wsaError, lastError));
va_list arglist;
va_start(arglist, format);
SStrVPrintf(&line[length], sizeof(line) - length, format, arglist);
DebugLog("OsNet: (INFO): %s\n", line);
if (OsNet::TCPNET::s_log) {
SLogWrite(OsNet::TCPNET::s_log, line);
SLogFlush(OsNet::TCPNET::s_log);
}
}
// VERIFY: 68e53455 auto
// OFFSET: 0x0086DBF0
void OsNetAddrMake(uint32_t address, uint16_t port, NETADDR* addr) {
sockaddr_in* in = reinterpret_cast<sockaddr_in*>(addr);
in->sin_family = AF_INET;
in->sin_port = htons(port);
in->sin_addr.s_addr = address;
*reinterpret_cast<uint32_t*>(&in->sin_zero[0]) = 0;
*reinterpret_cast<uint32_t*>(&in->sin_zero[4]) = 0;
}
// VERIFY: 2bad892b auto
// OFFSET: 0x0086DC20
uint32_t OsNetAddrGetAddress(const NETADDR* addr, uint16_t* port) {
const sockaddr_in* in = reinterpret_cast<const sockaddr_in*>(addr);
if (port) {
*port = ntohs(in->sin_port);
}
return in->sin_addr.s_addr;
}
// VERIFY: 731d2940 auto
// OFFSET: 0x0086DC50
const char* OsNetAddrToStr(const NETADDR* addr, char* buffer, uint32_t size) {
const sockaddr_in* in = reinterpret_cast<const sockaddr_in*>(addr);
SStrPrintf(buffer, size, "%s:%u", inet_ntoa(in->sin_addr), ntohs(in->sin_port));
return buffer;
}
// INLINED
void OsNet::TCPNET::Pump(uint32_t timeout) {
if (this->m_pumpThreads.Count()) {
Sleep(timeout);
} else if (this->m_port) {
this->IoPump(timeout);
} else {
OsNet::TCPNET::LogWrite("%s 7", OsNet::OSNETERR_INTERNAL);
Sleep(timeout);
}
}
// VERIFY: 8b85bf60 manual
// OFFSET: 0x0086F1C0
void OsNetPump(uint32_t timeout) {
if (OsNet::TCPNET::s_pnet) {
OsNet::TCPNET::s_pnet->Pump(timeout);
} else {
Sleep(timeout);
}
}
#endif
+83
View File
@@ -1,5 +1,88 @@
#if defined(WOWDECOMP_ARCH_64)
#include <cstdarg>
#include <cstdint>
#include <winsock2.h>
#include <windows.h>
#include "Engine/Source/Os/OsTcp.h"
#include "Engine/Source/Storm/H/storm.h"
// STATIC: 0x00B1D3F4
const char* OsNet::OSNETERR_INTERNAL = "Internal error";
// STATIC: 0x00D41830
OsNet::TCPNET* OsNet::TCPNET::s_pnet;
// STATIC: 0x00D41674
HSLOG OsNet::TCPNET::s_log;
// OFFSET: 0x0086D770
void OsNet::TCPNET::LogWrite(const char* format, ...) {
char line[1024];
DWORD lastError = GetLastError();
int wsaError = WSAGetLastError();
uint32_t length = static_cast<uint32_t>(SStrPrintf(line, sizeof(line), "t[0x%08x] se[%u] we[%u] ", GetCurrentThreadId(), wsaError, lastError));
va_list arglist;
va_start(arglist, format);
SStrVPrintf(&line[length], sizeof(line) - length, format, arglist);
DebugLog("OsNet: (INFO): %s\n", line);
if (OsNet::TCPNET::s_log) {
SLogWrite(OsNet::TCPNET::s_log, line);
SLogFlush(OsNet::TCPNET::s_log);
}
}
// OFFSET: 0x0086DBF0
void OsNetAddrMake(uint32_t address, uint16_t port, NETADDR* addr) {
sockaddr_in* in = reinterpret_cast<sockaddr_in*>(addr);
in->sin_family = AF_INET;
in->sin_port = htons(port);
in->sin_addr.s_addr = address;
*reinterpret_cast<uint32_t*>(&in->sin_zero[0]) = 0;
*reinterpret_cast<uint32_t*>(&in->sin_zero[4]) = 0;
}
// OFFSET: 0x0086DC20
uint32_t OsNetAddrGetAddress(const NETADDR* addr, uint16_t* port) {
const sockaddr_in* in = reinterpret_cast<const sockaddr_in*>(addr);
if (port) {
*port = ntohs(in->sin_port);
}
return in->sin_addr.s_addr;
}
// OFFSET: 0x0086DC50
const char* OsNetAddrToStr(const NETADDR* addr, char* buffer, uint32_t size) {
const sockaddr_in* in = reinterpret_cast<const sockaddr_in*>(addr);
SStrPrintf(buffer, size, "%s:%u", inet_ntoa(in->sin_addr), ntohs(in->sin_port));
return buffer;
}
// INLINED
void OsNet::TCPNET::Pump(uint32_t timeout) {
if (this->m_pumpThreads.Count()) {
Sleep(timeout);
} else if (this->m_port) {
this->IoPump(timeout);
} else {
OsNet::TCPNET::LogWrite("%s 7", OsNet::OSNETERR_INTERNAL);
Sleep(timeout);
}
}
// OFFSET: 0x0086F1C0
void OsNetPump(uint32_t timeout) {
if (OsNet::TCPNET::s_pnet) {
OsNet::TCPNET::s_pnet->Pump(timeout);
} else {
Sleep(timeout);
}
}
#endif