diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-07-13 11:40:50 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-07-13 11:40:50 -0400 |
| commit | cfce3686dea74dfa2a6c92dbd1e8e1ae8518f259 (patch) | |
| tree | 1e3189afbe6d2d9c5b1473ea59399e66a03d5d99 /indra/llmessage/llpacketring.h | |
| parent | b750a5afb7833d91aed88d9d1f75ee0b4bc2aa80 (diff) | |
STORM-1112 Fixed network buffers that need to have space for the SOCKS proxy header.
Diffstat (limited to 'indra/llmessage/llpacketring.h')
| -rw-r--r-- | indra/llmessage/llpacketring.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/llmessage/llpacketring.h b/indra/llmessage/llpacketring.h index 2fe2f8e1e9..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 { @@ -83,8 +83,11 @@ protected: LLHost mLastSender; LLHost mLastReceivingIF; - BOOL doSendPacket(int h_socket, const char * send_buffer, S32 buf_size, LLHost host); - U8 mProxyWrappedSendBuffer[NET_BUFFER_SIZE]; + + U8 mProxyWrappedSendBuffer[NET_BUFFER_SIZE + SOCKS_HEADER_SIZE]; + +private: + BOOL sendPacketImpl(int h_socket, const char * send_buffer, S32 buf_size, LLHost host); }; |