Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refine net time sync code for OneSync #2381

Merged
merged 1 commit into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions code/components/gta-net-five/include/netTimeSync.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#pragma once

struct TrustAddressData
{
uint32_t m_addr;
uint16_t m_port;
};

struct TrustAddress1604
{
TrustAddressData m_addr1;
TrustAddressData m_addr2;
};

struct TrustAddress2060
{
TrustAddressData m_addr1;
TrustAddressData m_addr2;
TrustAddressData m_addr3;
};

struct TrustAddress2372
{
uint32_t m_addr;
};

template<int Build>
using TrustAddress = std::conditional_t<(Build >= 2372), TrustAddress2372, std::conditional_t<(Build >= 2060), TrustAddress2060, TrustAddress1604>>;

namespace sync
{
bool IsWaitingForTimeSync();
}

namespace rage
{
class netConnectionManager;

template<int Build>
class netTimeSync
{
public:
virtual ~netTimeSync() = 0;

void Update();
void HandleTimeSync(net::Buffer& buffer);
bool IsInitialized();
void SetConnectionManager(netConnectionManager* mgr);

private:
netConnectionManager* m_connectionMgr; // +8 (1604)
TrustAddress<Build> m_trustAddr; // +16
uint32_t m_sessionKey; // +32
int32_t m_timeDelta; // +36
struct
{
void* self;
void* cb;
} m_messageDelegate; // +40
char m_pad_56[32];
uint32_t m_nextSync; // +88
uint32_t m_configTimeBetweenSyncs; // +92
uint32_t m_configMaxBackoff; // +96, usually 60000
uint32_t m_effectiveTimeBetweenSyncs; // +100
uint32_t m_lastRtt; // +104
uint32_t m_retryCount; // +108
uint32_t m_requestSequence; // +112
uint32_t m_replySequence; // +116
uint32_t m_flags; // +120
uint32_t m_packetFlags; // +124
uint32_t m_lastTime; // +128, used to prevent time from going backwards
uint8_t m_applyFlags; // +132
uint8_t m_disabled; // +133
};
}

static_assert(sizeof(rage::netTimeSync<1604>) == 136);
static_assert(sizeof(rage::netTimeSync<2060>) == 144);
static_assert(sizeof(rage::netTimeSync<2372>) == 128);
Loading
Loading