summaryrefslogtreecommitdiff
path: root/indra/llmessage/llpacketring.h
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-09-15 14:32:55 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-09-15 14:32:55 -0400
commit11dce3b74d60accd4d73aa976022daff637343d2 (patch)
treeb73503634eb271e0e53d2928a2ac0fd426831075 /indra/llmessage/llpacketring.h
parent1b9a39a2e1050bb1366cce5f1140a1608633c473 (diff)
parent671a76b40c0669cb8d4b08a6617ec33c47324a49 (diff)
reconciled .hgtags
Diffstat (limited to 'indra/llmessage/llpacketring.h')
-rw-r--r--indra/llmessage/llpacketring.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llmessage/llpacketring.h b/indra/llmessage/llpacketring.h
index e6409d2048..7edcc834db 100644
--- a/indra/llmessage/llpacketring.h
+++ b/indra/llmessage/llpacketring.h
@@ -30,11 +30,11 @@
#include <queue>
-#include "llpacketbuffer.h"
#include "llhost.h"
-#include "net.h"
+#include "llpacketbuffer.h"
+#include "llproxy.h"
#include "llthrottle.h"
-
+#include "net.h"
class LLPacketRing
{
@@ -82,6 +82,12 @@ protected:
LLHost mLastSender;
LLHost mLastReceivingIF;
+
+
+ U8 mProxyWrappedSendBuffer[NET_BUFFER_SIZE + SOCKS_HEADER_SIZE];
+
+private:
+ BOOL sendPacketImpl(int h_socket, const char * send_buffer, S32 buf_size, LLHost host);
};