From 4b3ec386911cf7ec1a7be941688cf640a626961f Mon Sep 17 00:00:00 2001
From: kimw <kimw@users.noreply.github.com>
Date: Sun, 15 May 2016 01:34:28 -0400
Subject: [PATCH] featured print "connect to hostname:port" to log

---
 .../Controller/Service/TCPRelay.cs            | 37 +++++++++++++------
 shadowsocks-csharp/Util/Util.cs               |  6 ++-
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/shadowsocks-csharp/Controller/Service/TCPRelay.cs b/shadowsocks-csharp/Controller/Service/TCPRelay.cs
index 9c162780..808f1f6f 100644
--- a/shadowsocks-csharp/Controller/Service/TCPRelay.cs
+++ b/shadowsocks-csharp/Controller/Service/TCPRelay.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Timers;
@@ -15,10 +16,7 @@ namespace Shadowsocks.Controller
         private ShadowsocksController _controller;
         private DateTime _lastSweepTime;
 
-        public ISet<TCPHandler> Handlers
-        {
-            get; set;
-        }
+        public ISet<TCPHandler> Handlers { get; set; }
 
         public TCPRelay(ShadowsocksController controller)
         {
@@ -389,10 +387,7 @@ namespace Shadowsocks.Controller
         private class ServerTimer : Timer
         {
             public Server Server;
-
-            public ServerTimer(int p) : base(p)
-            {
-            }
+            public ServerTimer(int p) : base(p) { }
         }
 
         private void StartConnect()
@@ -484,8 +479,6 @@ namespace Shadowsocks.Controller
 
                 connected = true;
 
-                Logging.Debug($"Socket connected to {remote.RemoteEndPoint}");
-
                 var latency = DateTime.Now - _startConnectTime;
                 IStrategy strategy = controller.GetCurrentStrategy();
                 strategy?.UpdateLatency(server, latency);
@@ -554,7 +547,6 @@ namespace Shadowsocks.Controller
                         }
                         encryptor.Decrypt(remoteRecvBuffer, bytesRead, remoteSendBuffer, out bytesToSend);
                     }
-                    Logging.Debug(remote, bytesToSend, "TCP Relay", "@PipeRemoteReceiveCallback() (download)");
                     connection.BeginSend(remoteSendBuffer, 0, bytesToSend, 0, new AsyncCallback(PipeConnectionSendCallback), null);
 
                     IStrategy strategy = controller.GetCurrentStrategy();
@@ -597,6 +589,28 @@ namespace Shadowsocks.Controller
 
                 if (bytesRead > 0)
                 {
+                    int atyp = connetionRecvBuffer[0];
+                    string dst_addr;
+                    int dst_port;
+                    switch (atyp)
+                    {
+                        case 1:  // IPv4 address, 4 bytes
+                            dst_addr = new IPAddress(connetionRecvBuffer.Skip(1).Take(4).ToArray()).ToString();
+                            dst_port = (connetionRecvBuffer[5] << 8) + connetionRecvBuffer[6];
+                            Logging.Debug($"connect to {dst_addr}:{dst_port}");
+                            break;
+                        case 3:  // domain name, length + str
+                            int len = connetionRecvBuffer[1];
+                            dst_addr = System.Text.Encoding.UTF8.GetString(connetionRecvBuffer, 2, len);
+                            dst_port = (connetionRecvBuffer[len + 2] << 8) + connetionRecvBuffer[len + 3];
+                            Logging.Debug($"connect to {dst_addr}:{dst_port}");
+                            break;
+                        case 4:  // IPv6 address, 16 bytes
+                            dst_addr = new IPAddress(connetionRecvBuffer.Skip(1).Take(16).ToArray()).ToString();
+                            dst_port = (connetionRecvBuffer[17] << 8) + connetionRecvBuffer[18];
+                            Logging.Debug($"connect to [{dst_addr}]:{dst_port}");
+                            break;
+                    }
                     int bytesToSend;
                     lock (encryptionLock)
                     {
@@ -606,7 +620,6 @@ namespace Shadowsocks.Controller
                         }
                         encryptor.Encrypt(connetionRecvBuffer, bytesRead, connetionSendBuffer, out bytesToSend);
                     }
-                    Logging.Debug(remote, bytesToSend, "TCP Relay", "@PipeConnectionReceiveCallback() (upload)");
                     tcprelay.UpdateOutboundCounter(server, bytesToSend);
                     _startSendingTime = DateTime.Now;
                     _bytesToSend = bytesToSend;
diff --git a/shadowsocks-csharp/Util/Util.cs b/shadowsocks-csharp/Util/Util.cs
index 178c994b..3d09db7a 100755
--- a/shadowsocks-csharp/Util/Util.cs
+++ b/shadowsocks-csharp/Util/Util.cs
@@ -76,7 +76,8 @@ namespace Shadowsocks.Util
                 //
                 // just kidding
                 SetProcessWorkingSetSize(Process.GetCurrentProcess().Handle,
-                    (UIntPtr)0xFFFFFFFF, (UIntPtr)0xFFFFFFFF);
+                                         (UIntPtr)0xFFFFFFFF,
+                                         (UIntPtr)0xFFFFFFFF);
             }
         }
 
@@ -87,7 +88,8 @@ namespace Shadowsocks.Util
             using (MemoryStream sb = new MemoryStream())
             {
                 using (GZipStream input = new GZipStream(new MemoryStream(buf),
-                    CompressionMode.Decompress, false))
+                                                         CompressionMode.Decompress,
+                                                         false))
                 {
                     while ((n = input.Read(buffer, 0, buffer.Length)) > 0)
                     {