fix bug

Author: GangZhuo

TrafficStatistics/Relay/TcpPipe.cs

@@ -32,8 +32,6 @@ class Handler
             private Socket _local;
             private Socket _remote;
             private bool _closed = false;
-            private bool _localShutdown = false;
-            private bool _remoteShutdown = false;
             public const int RecvSize = 16384;
             // remote receive buffer
             private byte[] remoteRecvBuffer = new byte[RecvSize];
@@ -118,10 +116,7 @@ private void PipeRemoteReceiveCallback(IAsyncResult ar)
                     }
                     else
                     {
-                        //Console.WriteLine("bytesRead: " + bytesRead.ToString());
-                        _remote.Shutdown(SocketShutdown.Send);
-                        _remoteShutdown = true;
-                        CheckClose();
+                        this.Close();
                     }
                 }
                 catch (Exception e)
@@ -148,9 +143,7 @@ private void PipeConnectionReceiveCallback(IAsyncResult ar)
                     }
                     else
                     {
-                        _local.Shutdown(SocketShutdown.Send);
-                        _localShutdown = true;
-                        CheckClose();
+                        this.Close();
                     }
                 }
                 catch (Exception e)
@@ -198,14 +191,6 @@ private void PipeConnectionSendCallback(IAsyncResult ar)
                 }
             }
 
-            private void CheckClose()
-            {
-                if (_localShutdown && _remoteShutdown)
-                {
-                    this.Close();
-                }
-            }
-
             public void Close()
             {
                 lock (this)

TrafficStatistics/Relay/UdpRelay.cs

@@ -18,6 +18,8 @@ public State()
             }
         }
 
+        private const int SIP_UDP_CONNRESET = -1744830452;
+
         private Socket _local;
         private UDPPipe _pipe;
 
@@ -42,6 +44,8 @@ public void Start()
                 // Create a TCP/IP socket.
                 _local = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
                 _local.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+                // Fix WinSock library bug, See https://support.microsoft.com/en-us/kb/263823
+                _local.IOControl(SIP_UDP_CONNRESET, new byte[] { 0, 0, 0, 0 }, null);
                 // Bind the socket to the local endpoint and listen for incoming connections.
                 _local.Bind(_localEP);
 

TrafficStatistics/Traffic.cs

@@ -18,9 +18,9 @@ public Traffic(Traffic t)
 
         public Traffic(Traffic t1, Traffic t2)
         {
-            if (t1.inbound >= t2.inbound)
+            if (t2.inbound > 0 && t1.inbound >= t2.inbound)
                 inbound = t1.inbound - t2.inbound;
-            if (t1.outbound >= t2.outbound)
+            if (t2.outbound > 0 && t1.outbound >= t2.outbound)
                 outbound = t1.outbound - t2.outbound;
         }
 

TrafficStatistics/TrafficStatisticsForm.cs

@@ -18,7 +18,7 @@ public partial class TrafficStatisticsForm : Form
 
         private IRelay relay;
         private Traffic rawTrafficStatistics = new Traffic();
-        private LinkedList<TrafficLog> trafficLogList;
+        private LinkedList<TrafficLog> trafficLogList = new LinkedList<TrafficLog>();
 
         public TrafficStatisticsForm()
         {
@@ -86,6 +86,7 @@ private void TopMostheckBox_CheckedChanged(object sender, EventArgs e)
         private void ResetButton_Click(object sender, EventArgs e)
         {
             rawTrafficStatistics.reset();
+            InitTrafficHistoricalList();
         }
 
         private void timer1_Tick(object sender, EventArgs e)
@@ -97,6 +98,7 @@ private void timer2_Tick(object sender, EventArgs e)
         {
             try
             {
+                timer2.Stop();
                 UpdateTrafficList();
                 if (TrafficChart.InvokeRequired)
                 {
@@ -114,6 +116,10 @@ private void timer2_Tick(object sender, EventArgs e)
             {
                 string s = ex.Message;
             }
+            finally
+            {
+                timer2.Start();
+            }
         }
 
         private void CleanLogsButton_Click(object sender, EventArgs e)
@@ -197,27 +203,30 @@ private void AppendLog(string line)
 
         private void InitTrafficHistoricalList()
         {
-            if (trafficLogList == null)
-                trafficLogList = new LinkedList<TrafficLog>();
-            else
-                trafficLogList.Clear();
-            for (int i = 0; i < trafficLogSize; i++)
+            lock(trafficLogList)
             {
-                trafficLogList.AddLast(new TrafficLog());
+                trafficLogList.Clear();
+                for (int i = 0; i < trafficLogSize; i++)
+                {
+                    trafficLogList.AddLast(new TrafficLog());
+                }
             }
         }
 
         private void UpdateTrafficList()
         {
-            TrafficLog previous = trafficLogList.Last.Value;
-            TrafficLog current = new TrafficLog(
-                new Traffic(rawTrafficStatistics),
-                new Traffic(rawTrafficStatistics, previous.raw)
-            );
-            trafficLogList.AddLast(current);
-
-            while (trafficLogList.Count > trafficLogSize) trafficLogList.RemoveFirst();
-            while (trafficLogList.Count < trafficLogSize) trafficLogList.AddFirst(new TrafficLog());
+            lock (trafficLogList)
+            {
+                TrafficLog previous = trafficLogList.Last.Value;
+                TrafficLog current = new TrafficLog(
+                    new Traffic(rawTrafficStatistics),
+                    new Traffic(rawTrafficStatistics, previous.raw)
+                );
+                trafficLogList.AddLast(current);
+
+                while (trafficLogList.Count > trafficLogSize) trafficLogList.RemoveFirst();
+                while (trafficLogList.Count < trafficLogSize) trafficLogList.AddFirst(new TrafficLog());
+            }
         }
 
         private List<float> rawInboundPoints = new List<float>();
@@ -226,21 +235,25 @@ private void UpdateTrafficList()
 
         private void UpdateTrafficChart()
         {
+            TrafficLog last;
             long maxSpeedValue = 0;
             rawInboundPoints.Clear();
             rawOutboundPoints.Clear();
-            foreach (TrafficLog item in trafficLogList)
+            lock(trafficLogList)
             {
-                rawInboundPoints.Add(item.rawSpeed.inbound);
-                rawOutboundPoints.Add(item.rawSpeed.outbound);
+                last = trafficLogList.Last.Value;
+                foreach (TrafficLog item in trafficLogList)
+                {
+                    rawInboundPoints.Add(item.rawSpeed.inbound);
+                    rawOutboundPoints.Add(item.rawSpeed.outbound);
 
-                maxSpeedValue = Math.Max(maxSpeedValue,
-                        Math.Max(item.rawSpeed.inbound, item.rawSpeed.outbound)
-                );
+                    maxSpeedValue = Math.Max(maxSpeedValue,
+                            Math.Max(item.rawSpeed.inbound, item.rawSpeed.outbound)
+                    );
+                }
             }
 
             FormattedSize maxSpeed = new FormattedSize(maxSpeedValue);
-            TrafficLog last = trafficLogList.Last.Value;
             RawInboundSpeed.Text = new FormattedSize(last.rawSpeed.inbound) + "/s";
             RawOutboundSpeed.Text = new FormattedSize(last.rawSpeed.outbound) + "/s";