Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

1 files changed, 51 insertions, 5 deletions

diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index 7f9617f..e7dad79 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -43,6 +43,15 @@
 #include "llmessagelog.h"
 #include "message.h"
 
+#include "llsocks5.h"
+
+#if LL_WINDOWS
+        #include <winsock2.h>
+#else
+        #include <sys/socket.h>
+        #include <netinet/in.h>
+#endif
+
 ///////////////////////////////////////////////////////////
 LLPacketRing::LLPacketRing () :
         mUseInThrottle(FALSE),
@@ -224,8 +233,25 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
         else
         {
                 // no delay, pull straight from net
-                packet_size = receive_packet(socket, datap);            
-                mLastSender = ::get_sender();
+                if (LLSocks::isEnabled())
+                {
+                        proxywrap_t * header;
+                        datap  = datap-10;
+                        header = (proxywrap_t *)datap;
+                        packet_size = receive_packet(socket, datap);
+                        mLastSender.setAddress(header->addr);
+                        mLastSender.setPort(ntohs(header->port));
+                        if (packet_size > 10)
+                        {
+                                packet_size -= 10;                      
+                        }
+                }
+                else
+                {
+                        packet_size = receive_packet(socket, datap);            
+                        mLastSender = ::get_sender();
+                }
+
                 mLastReceivingIF = ::get_receiving_interface();
 
                 if (packet_size)  // did we actually get a packet?
@@ -254,7 +280,7 @@ BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LL
         BOOL status = TRUE;
         if (!mUseOutThrottle)
         {
-                return send_packet(h_socket, send_buffer, buf_size, host.getAddress(), host.getPort() );
+                return doSendPacket(h_socket, send_buffer, buf_size, host );
         }
         else
         {
@@ -275,7 +301,7 @@ BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LL
                                 mOutBufferLength -= packetp->getSize();
                                 packet_size = packetp->getSize();
 
-                                status = send_packet(h_socket, packetp->getData(), packet_size, packetp->getHost().getAddress(), packetp->getHost().getPort());
+                                status = doSendPacket(h_socket, packetp->getData(), packet_size, packetp->getHost());
                                 
                                 delete packetp;
                                 // Update the throttle
@@ -284,7 +310,7 @@ BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LL
                         else
                         {
                                 // If the queue's empty, we can just send this packet right away.
-                                status = send_packet(h_socket, send_buffer, buf_size, host.getAddress(), host.getPort() );
+                                status =  doSendPacket(h_socket, send_buffer, buf_size, host );
                                 packet_size = buf_size;
 
                                 // Update the throttle
@@ -322,3 +348,23 @@ BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LL
 
         return status;
 }
+
+BOOL LLPacketRing::doSendPacket(int h_socket, const char * send_buffer, S32 buf_size, LLHost host)
+{
+        
+        if (!LLSocks::isEnabled())
+        {
+                return send_packet(h_socket, send_buffer, buf_size, host.getAddress(), host.getPort());
+        }
+
+        proxywrap_t *socks_header = (proxywrap_t *)&mProxyWrappedSendBuffer;
+        socks_header->rsv   = 0;
+        socks_header->addr  = host.getAddress();
+        socks_header->port  = htons(host.getPort());
+        socks_header->atype = ADDRESS_IPV4;
+        socks_header->frag  = 0;
+
+        memcpy(mProxyWrappedSendBuffer+10, send_buffer, buf_size);
+
+        return send_packet(h_socket,(const char*) mProxyWrappedSendBuffer, buf_size+10, LLSocks::getInstance()->getUDPPproxy().getAddress(), LLSocks::getInstance()->getUDPPproxy().getPort());
+}