fix 多次回调close的bug，本地监听同时监听IPV4和IPV6端口

Author: libla

Network.cs

@@ -10,7 +10,7 @@
 using UnityObject = UnityEngine.Object;
 
 namespace TinyNet
-{
+{
 	#region 发送和接收缓冲区
 	/// <summary>
 	/// 填充数据包
@@ -65,8 +65,8 @@ public static BufferSegment Make(byte onebyte)
 			};
 			return seg;
 		}
-	}
-
+	}
+
 	/// <summary>
 	/// 复用缓冲区
 	/// </summary>
@@ -192,9 +192,9 @@ public void Reset()
 			_offset = 0;
 			_length = 0;
 		}
-	}
+	}
 	#endregion
-
+
 	#region 解析网络请求
 	/// <summary>
 	/// 基础请求类
@@ -239,8 +239,8 @@ public virtual void Reset()
 		{
 			buffer.Reset();
 		}
-	}
-
+	}
+
 	/// <summary>
 	/// 无ID分组
 	/// </summary>
@@ -259,8 +259,8 @@ protected virtual void Handle(NetHandler handler, T t)
 		}
 
 		public static event Action<NetHandler, T> DefaultHandler;
-	}
-
+	}
+
 	/// <summary>
 	/// 按ID分组
 	/// </summary>
@@ -296,9 +296,9 @@ public static Dictionary<TKey, Action<NetHandler, T>> Handlers
 			}
 		}
 		public static event Action<NetHandler, TKey, T> DefaultHandler;
-	}
+	}
 	#endregion
-
+
 	#region 设置相关
 	public class Settings
 	{
@@ -322,9 +322,9 @@ public Settings()
 			capacity = 2 << 24;
 			worklimit = 4;
 		}
-	}
+	}
 	#endregion
-
+
 	/// <summary>
 	/// 网络连接抽象句柄
 	/// </summary>
@@ -340,8 +340,8 @@ public abstract class NetHandler
 		public abstract IPEndPoint Local { get; }
 		public abstract short TTL { get; set; }
 		public abstract bool NoDelay { get; set; }
-	}
-
+	}
+
 	/// <summary>
 	/// 网络管理全局接口
 	/// </summary>
@@ -353,18 +353,19 @@ public abstract class NetManager : IDisposable
 		private readonly Queue<NetHandlerImpl> workqueue = new Queue<NetHandlerImpl>();
 		private readonly Dictionary<NetHandlerImpl, bool> workindex = new Dictionary<NetHandlerImpl, bool>();
 		private readonly Dictionary<int, Control> listens = new Dictionary<int, Control>();
+		private readonly Dictionary<int, Control> listensv6 = new Dictionary<int, Control>();
 		private readonly Dictionary<NetHandlerImpl, bool> sockets = new Dictionary<NetHandlerImpl, bool>();
 
-		private static readonly Dictionary<NetManager, bool> managers = new Dictionary<NetManager, bool>();
-
+		private static readonly Dictionary<NetManager, bool> managers = new Dictionary<NetManager, bool>();
+
 		#region 内部使用的类
 		private class Control
 		{
 			public bool running;
 			public Action<NetHandler> action;
-		}
+		}
 		#endregion
-
+
 		protected NetManager(Settings settings)
 		{
 			this.settings = settings;
@@ -383,7 +384,7 @@ public void Listen(int port, Action<NetHandler> callback)
 		{
 			if (!running)
 				throw new ObjectDisposedException(ToString());
-			new Thread(delegate ()
+			new Thread(delegate()
 			{
 				Thread.CurrentThread.Name = "Network Server";
 				TcpListener server = new TcpListener(IPAddress.Any, port);
@@ -430,6 +431,53 @@ public void Listen(int port, Action<NetHandler> callback)
 				}
 				server.Stop();
 			}).Start();
+			new Thread(delegate()
+			{
+				Thread.CurrentThread.Name = "Network Server";
+				TcpListener server = new TcpListener(IPAddress.IPv6Any, port);
+				server.Start();
+				Control ctrl;
+				lock (listensv6)
+				{
+					if (listensv6.TryGetValue(port, out ctrl))
+					{
+						ctrl.running = true;
+					}
+					else
+					{
+						ctrl = new Control { running = true };
+						listensv6[port] = ctrl;
+					}
+				}
+				ctrl.action = callback;
+				while (running)
+				{
+					if (!server.Server.Poll(1000, SelectMode.SelectRead))
+					{
+						if (!ctrl.running)
+							break;
+						continue;
+					}
+					if (!server.Pending())
+						break;
+					NetHandlerImpl socket = new NetHandlerImpl(server.AcceptSocket(), this);
+					socket.Socket.Blocking = false;
+					socket.OnConnected();
+					Loop.Run(() =>
+					{
+						ctrl.action(socket);
+					});
+				}
+				lock (listensv6)
+				{
+					Control ctrlnow;
+					if (listensv6.TryGetValue(port, out ctrlnow) && ctrlnow == ctrl)
+					{
+						listensv6.Remove(port);
+					}
+				}
+				server.Stop();
+			}).Start();
 		}
 
 		public void Stop(int port)
@@ -445,6 +493,15 @@ public void Stop(int port)
 					listens.Remove(port);
 				}
 			}
+			lock (listensv6)
+			{
+				Control ctrl;
+				if (listensv6.TryGetValue(port, out ctrl))
+				{
+					ctrl.running = false;
+					listensv6.Remove(port);
+				}
+			}
 		}
 
 		public NetHandler Connect(string hostport, int timeout)
@@ -533,8 +590,8 @@ public void Dispose()
 		public void Close()
 		{
 			Dispose();
-		}
-
+		}
+
 		#region 连接
 		private void ConnectImpl(string host, int port, int timeout, Action<NetHandler, Exception> callback)
 		{
@@ -604,9 +661,9 @@ private void ConnectImpl(string host, int port, int timeout, Action<NetHandler,
 					callback(null, e);
 				}
 			}, null);
-		}
+		}
 		#endregion
-
+
 		private void SendQueue(NetHandlerImpl handler)
 		{
 			lock (workqueue)
@@ -625,7 +682,7 @@ private void SendQueue(NetHandlerImpl handler)
 				Interlocked.Decrement(ref workcount);
 				return;
 			}
-			new Thread(delegate ()
+			new Thread(delegate()
 			{
 				Thread.CurrentThread.Name = "Network Write";
 				while (running)
@@ -671,27 +728,30 @@ private void SendQueue(NetHandlerImpl handler)
 					}
 				}
 			}).Start();
-		}
-
+		}
+
 		#region 网络连接的具体类
 		private class NetHandlerImpl : NetHandler
 		{
 			public readonly Socket Socket;
 
 			public readonly ByteBuffer buffer = new ByteBuffer();
 			private readonly NetManager manager;
+			private int closed;
 			private Request request;
 
 			public NetHandlerImpl(AddressFamily family, NetManager manager)
 			{
 				this.manager = manager;
+				this.closed = 0;
 				Socket = new Socket(family, SocketType.Stream, ProtocolType.Tcp);
 				Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Linger, new LingerOption(false, 0));
 			}
 
 			public NetHandlerImpl(Socket socket, NetManager manager)
 			{
 				this.manager = manager;
+				this.closed = 0;
 				Socket = socket;
 				Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Linger, new LingerOption(false, 0));
 			}
@@ -702,7 +762,7 @@ public void OnConnected()
 				{
 					manager.sockets.Add(this, true);
 				}
-				new Thread(delegate ()
+				new Thread(delegate()
 				{
 					Thread.CurrentThread.Name = "Network Read";
 					byte[] bytes = new byte[64 * 1024];
@@ -795,7 +855,8 @@ public void OnConnected()
 
 			public override void Close()
 			{
-				Socket.Close();
+				if (Interlocked.CompareExchange(ref closed, 1, 0) != 0)
+					return;
 				lock (manager.sockets)
 				{
 					manager.sockets.Remove(this);
@@ -805,12 +866,14 @@ public override void Close()
 					Loop.Run(() =>
 					{
 						if (manager.settings.events.close != null)
-						{
 							manager.settings.events.close(this);
-							manager.settings.events.close = null;
-						}
+						Socket.Close();
 					});
 				}
+				else
+				{
+					Socket.Close();
+				}
 			}
 
 			public override bool Send(BufferSegment seg)
@@ -948,7 +1011,7 @@ private void OnReceive(byte[] bytes, int length)
 						size = length - offset;
 						Request old = request;
 						request = manager.NewRequest();
-						Loop.Run(delegate ()
+						Loop.Run(delegate()
 						{
 							if (manager.settings.events.request != null)
 							{
@@ -961,18 +1024,22 @@ private void OnReceive(byte[] bytes, int length)
 				}
 				catch (Exception e)
 				{
-					Socket.Close();
 					if (manager.settings.events.close != null)
 					{
-						Loop.Run(delegate ()
+						Loop.Run(delegate()
 						{
 							if (manager.settings.events.close != null)
 								manager.settings.events.close(this);
+							Socket.Close();
 						});
 					}
+					else
+					{
+						Socket.Close();
+					}
 					if (manager.settings.events.exception != null)
 					{
-						Loop.Run(delegate ()
+						Loop.Run(delegate()
 						{
 							if (manager.settings.events.exception != null)
 								manager.settings.events.exception(this, e);
@@ -983,9 +1050,9 @@ private void OnReceive(byte[] bytes, int length)
 		}
 
 		protected abstract Request NewRequest();
-		protected abstract void ReleaseRequest(Request request);
+		protected abstract void ReleaseRequest(Request request);
 		#endregion
-
+		
 		#region 主循环调用
 		private static class Loop
 		{
@@ -1115,7 +1182,7 @@ void OnApplicationQuit()
 					}
 				}
 			}
-		}
+		}
 		#endregion
 	}
 

UnitTest/TestCase.cs

@@ -25,13 +25,13 @@ public static NetManager NetMgr
 								}
 							},
 							read = (handler, len) => {
-								Debug.Log("read " + len);
+								Debug.Log("read " + len);
 							},
-							close = (handler) => {
-								Debug.Log("handler close");
+							close = (handler) => {
+								Debug.Log("handler close");
 							},
 							write = (handler, len) => {
-								Debug.Log("write " + len);;
+								Debug.Log("write " + len);
 							}
 						}
 					};
@@ -43,7 +43,7 @@ public static NetManager NetMgr
 
 		public static void StartListen(int port)
 		{
-			NetMgr.Listen(port, delegate (NetHandler socket)
+			NetMgr.Listen(port, delegate(NetHandler socket)
 			{
 				Debug.Log("New Connection");
 			});
@@ -69,8 +69,8 @@ public static void StartConnect(string ipport)
 		public static void Main(string[] args)
 		{
 			NetManager.Initialize();
-			StartListen(12306);
-			StartConnect("127.0.0.1:12306");
+			StartListen(12306);
+			StartConnect("localhost:12306");
 		}
 	}
 }