diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
| commit | e6239b7978fb9f05d2c8c7cf42b9277f4a5f7c52 (patch) | |
| tree | 17080b4ffa8a59a5b9c158edaf9e60f9af2a67b4 /indra/llmessage/llpacketring.h | |
| parent | 66cac05cfb1236c3c1607dff27babf873c29a679 (diff) | |
| parent | 6484dbf28cb8b6ffa745fe9b26beae58d3c68441 (diff) | |
merge changes for storm-1571
Diffstat (limited to 'indra/llmessage/llpacketring.h')
| -rw-r--r-- | indra/llmessage/llpacketring.h | 12 |
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); }; |