From 809de77034c5956a95f35c90024e62b02b439164 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 12 Apr 2011 17:41:10 -0700
Subject: Ported SOCKS5 proxy support from Snowglobe 1.5

---
 linden/indra/llmessage/message.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'linden/indra/llmessage/message.h')

diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index e6391d9..43c3b0a 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -66,6 +66,7 @@
 #include "llmessagesenderinterface.h"
 
 #include "llstoredmessage.h"
+#include "llsocks5.h"
 
 const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
 const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
@@ -775,7 +776,18 @@ private:
 	LLMessagePollInfo						*mPollInfop;
 
 	U8	mEncodedRecvBuffer[MAX_BUFFER_SIZE];
-	U8	mTrueReceiveBuffer[MAX_BUFFER_SIZE];
+
+// Push current alignment to stack and set alignment to 1 byte boundary
+#pragma pack(push,1)
+
+	struct ReceiveBuffer_t
+	{
+		proxywrap_t header;
+		U8			buffer[MAX_BUFFER_SIZE];
+	} mTrueReceiveBuffer;
+
+#pragma pack(pop)   /* restore original alignment from stack */
+
 	S32	mTrueReceiveSize;
 
 	// Must be valid during decode
-- 
cgit v1.1