From 9546f7a2ff988a1888a47df7f10001a776758146 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sat, 14 May 2022 18:22:46 +0200
Subject: [PATCH] Update netpacket_t struct

---
 r5dev/engine/net.cpp               |  2 +-
 r5dev/public/include/inetchannel.h | 14 ++++++++++++++
 r5dev/tier1/NetAdr2.h              | 26 +-------------------------
 r5dev/tier1/bitbuf.h               |  2 +-
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/r5dev/engine/net.cpp b/r5dev/engine/net.cpp
index c967e2f2..0eb48ca3 100644
--- a/r5dev/engine/net.cpp
+++ b/r5dev/engine/net.cpp
@@ -33,7 +33,7 @@ bool NET_ReceiveDatagram(int iSocket, netpacket_s* pInpacket, bool bEncrypted)
 	if (result && net_tracePayload->GetBool())
 	{
 		// Log received packet data.
-		HexDump("[+] NET_ReceiveDatagram", "netchan_packet_logger", &pInpacket->data[NULL], pInpacket->wiresize);
+		HexDump("[+] NET_ReceiveDatagram", "netchan_packet_logger", &pInpacket->pData[NULL], pInpacket->wiresize);
 	}
 	return result;
 }
diff --git a/r5dev/public/include/inetchannel.h b/r5dev/public/include/inetchannel.h
index e4fef886..d2e49400 100644
--- a/r5dev/public/include/inetchannel.h
+++ b/r5dev/public/include/inetchannel.h
@@ -10,4 +10,18 @@ struct INetChannelHandler
 {
 	void* iNetMessageHandlerVTable /*VFT*/;
 };
+
+typedef struct netpacket_s netpacket_t;
+typedef struct __declspec(align(8)) netpacket_s
+{
+	v_netadr_t from;
+	int source;
+	double received;
+	uint8_t* pData;
+	bf_read message;
+	int size;
+	int wiresize;
+	char stream;
+	netpacket_s* pNext;
+} netpacket_t;
 #endif // !INETCHANNEL_H
diff --git a/r5dev/tier1/NetAdr2.h b/r5dev/tier1/NetAdr2.h
index 175b139c..390c18c3 100644
--- a/r5dev/tier1/NetAdr2.h
+++ b/r5dev/tier1/NetAdr2.h
@@ -1,29 +1,5 @@
 #pragma once
-
-typedef struct netpacket_s netpacket_t;
-typedef struct __declspec(align(8)) netpacket_s
-{
-	DWORD         family_maybe;
-	sockaddr_in   sin;
-	WORD          sin_port;
-	char          gap16;
-	char          byte17;
-	DWORD         source;
-	double        received;
-	uint8_t*      data;
-	uint64_t      label;
-	BYTE          byte38;
-	uint64_t      qword40;
-	uint64_t      qword48;
-	BYTE          gap50[8];
-	uint64_t      qword58;
-	uint64_t      qword60;
-	uint64_t      qword68;
-	int           less_than_12;
-	DWORD         wiresize;
-	BYTE          gap78[8];
-	struct netpacket_s* pNext;
-} netpacket_t;
+#include "tier1/bitbuf.h"
 
 enum class netadrtype_t
 {
diff --git a/r5dev/tier1/bitbuf.h b/r5dev/tier1/bitbuf.h
index 74a16539..766a8873 100644
--- a/r5dev/tier1/bitbuf.h
+++ b/r5dev/tier1/bitbuf.h
@@ -81,7 +81,7 @@ public:
 	bool IsOverflowed() const;
 	void SetOverflowFlag();
 private:
-	unsigned __int8* m_pData;
+	uint8_t* m_pData;
 	int m_nDataBytes;
 	int m_nDataBits;
 	int m_iCurBit;