STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on Linden Coding Standard and comments in the code review.

1 files changed, 13 insertions, 10 deletions

diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
index 0c8c5f763c..62aaca0672 100644
--- a/indra/llmessage/llpacketring.cpp
+++ b/indra/llmessage/llpacketring.cpp
@@ -28,22 +28,26 @@
 
 #include "llpacketring.h"
 
+#if LL_WINDOWS
+	#include <winsock2.h>
+#else
+	#include <sys/socket.h>
+	#include <netinet/in.h>
+#endif
+
 // linden library includes
 #include "llerror.h"
+#include "message.h"
+#include "llsocks5.h"
 #include "lltimer.h"
 #include "timing.h"
 #include "llrand.h"
 #include "u64.h"
 
-#include "llsocks5.h"
-#include "message.h"
 
-#if LL_WINDOWS
-	#include <winsock2.h>
-#else
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-#endif
+
+
+
 
 
 ///////////////////////////////////////////////////////////
@@ -241,8 +245,7 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
 				packet_size=0;
 			}
 
-			proxywrap_t * header;
-			header = (proxywrap_t *)buffer;
+			proxywrap_t * header = (proxywrap_t *)buffer;
 			mLastSender.setAddress(header->addr);
 			mLastSender.setPort(ntohs(header->port));
 		}