From 432cdc0de899a2de3dae3d83793a5e38b2253488 Mon Sep 17 00:00:00 2001 From: Moydow <28638419+Moydow@users.noreply.github.com> Date: Tue, 14 Jun 2022 04:28:42 +0100 Subject: [PATCH] added a short form oodle2net.h Custom short version of oodle2net.h that only sets up the functions we need here. Still need oo2net_9_win64.dll and oo2net_9_win64.lib which won't be added here --- deps/Oodle/oodle2net.h | 32 ++++++++++++++++++++++++++++++++ src/common/Network/Oodle.cpp | 6 +++--- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 deps/Oodle/oodle2net.h diff --git a/deps/Oodle/oodle2net.h b/deps/Oodle/oodle2net.h new file mode 100644 index 00000000..59c718c9 --- /dev/null +++ b/deps/Oodle/oodle2net.h @@ -0,0 +1,32 @@ +#ifndef __OODLE2NET_H__ +#define __OODLE2NET_H__ + +extern "C" intptr_t __stdcall OodleNetwork1_Shared_Size( int32_t htbits ); + +extern "C" intptr_t __stdcall OodleNetwork1UDP_State_Size(); + +extern "C" void __stdcall OodleNetwork1_Shared_SetWindow( + void* shared, + int32_t htbits, + const void* window, + int32_t windowSize +); + +extern "C" void __stdcall OodleNetwork1UDP_Train( + void* state, + const void* shared, + const void** trainingPacketPointers, + const int32_t* trainingPacketSizes, + int32_t numTrainingPackets +); + +extern "C" bool __stdcall OodleNetwork1UDP_Decode( + void* state, + const void* shared, + const void* enc, + intptr_t encSize, + void* dec, + intptr_t decSize +); + +#endif \ No newline at end of file diff --git a/src/common/Network/Oodle.cpp b/src/common/Network/Oodle.cpp index 32e007de..58f65f73 100644 --- a/src/common/Network/Oodle.cpp +++ b/src/common/Network/Oodle.cpp @@ -17,11 +17,11 @@ Network::Oodle::Oodle() : void Network::Oodle::oodleInit() { - OodleNetwork1_Shared_SetWindow( (OodleNetwork1_Shared*) &m_shared[0], m_htbits, &m_window[0], (int) m_window.size() ); - OodleNetwork1UDP_Train( (OodleNetwork1UDP_State*) &m_state[0], (OodleNetwork1_Shared*) &m_shared[0], nullptr, nullptr, 0 ); + OodleNetwork1_Shared_SetWindow( &m_shared[0], m_htbits, &m_window[0], (int) m_window.size() ); + OodleNetwork1UDP_Train( &m_state[0], &m_shared[0], nullptr, nullptr, 0 ); } bool Network::Oodle::oodleDecode( const std::vector< uint8_t > &enc, uint32_t encSize, std::vector< uint8_t > &dec, uint32_t decSize ) { - return OodleNetwork1UDP_Decode( (OodleNetwork1UDP_State*) &m_state[0], (OodleNetwork1_Shared*) &m_shared[0], &enc[0], encSize, &dec[0], decSize ); + return OodleNetwork1UDP_Decode( &m_state[0], &m_shared[0], &enc[0], encSize, &dec[0], decSize ); } \ No newline at end of file