Merge pull request #1 from chiuan/修复例子在osx运行，fix结束回调2次，V6环境靠谱设置

修复例子在osx运行，fix结束回调2次，v6环境靠谱设置

Author: libla

.gitignore

@@ -0,0 +1,3 @@
+*/*.meta
+*.meta
+.DS_Store

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>
@@ -355,16 +355,16 @@ public abstract class NetManager : IDisposable
 		private readonly Dictionary<int, Control> listens = 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 +383,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);
@@ -533,8 +533,8 @@ public void Dispose()
 		public void Close()
 		{
 			Dispose();
-		}
-
+		}
+
 		#region 连接
 		private void ConnectImpl(string host, int port, int timeout, Action<NetHandler, Exception> callback)
 		{
@@ -551,12 +551,12 @@ private void ConnectImpl(string host, int port, int timeout, Action<NetHandler,
 					IPAddress[] iplist = Dns.EndGetHostAddresses(ar);
 					if (timeout > 0)
 					{
-						AddressFamily family = AddressFamily.InterNetworkV6;
+						AddressFamily family = AddressFamily.InterNetwork;
 						for (int i = 0; i < iplist.Length; ++i)
 						{
-							if (iplist[i].AddressFamily == AddressFamily.InterNetwork)
+							if (iplist[i].AddressFamily == AddressFamily.InterNetworkV6)
 							{
-								family = AddressFamily.InterNetwork;
+								family = AddressFamily.InterNetworkV6;
 								break;
 							}
 						}
@@ -604,9 +604,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 +625,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,8 +671,8 @@ private void SendQueue(NetHandlerImpl handler)
 					}
 				}
 			}).Start();
-		}
-
+		}
+
 		#region 网络连接的具体类
 		private class NetHandlerImpl : NetHandler
 		{
@@ -702,7 +702,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];
@@ -805,7 +805,10 @@ public override void Close()
 					Loop.Run(() =>
 					{
 						if (manager.settings.events.close != null)
+						{
 							manager.settings.events.close(this);
+							manager.settings.events.close = null;
+						}
 					});
 				}
 			}
@@ -945,7 +948,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,15 +964,15 @@ private void OnReceive(byte[] bytes, int length)
 					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);
 						});
 					}
 					if (manager.settings.events.exception != null)
 					{
-						Loop.Run(delegate()
+						Loop.Run(delegate ()
 						{
 							if (manager.settings.events.exception != null)
 								manager.settings.events.exception(this, e);
@@ -980,9 +983,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
 		{
@@ -1112,7 +1115,7 @@ void OnApplicationQuit()
 					}
 				}
 			}
-		}
+		}
 		#endregion
 	}
 

UnitTest/TestCase.cs

@@ -23,6 +23,15 @@ public static NetManager NetMgr
 								{
 									Debug.Log(req.Value);
 								}
+							},
+							read = (handler, len) => {
+								Debug.Log("read " + len);
+							},
+							close = (handler) => {
+								Debug.Log("handler close");
+							},
+							write = (handler, len) => {
+								Debug.Log("write " + len);;
 							}
 						}
 					};
@@ -34,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");
 			});
@@ -60,8 +69,8 @@ public static void StartConnect(string ipport)
 		public static void Main(string[] args)
 		{
 			NetManager.Initialize();
-			StartListen(12306);
-			StartConnect("localhost:12306");
+			StartListen(12306);
+			StartConnect("127.0.0.1:12306");
 		}
 	}
 }