网络层更新

Author: kbengine

Bundle.cs

@@ -83,7 +83,7 @@ public void send(NetworkInterface networkInterface)
 				for(int i=0; i<streamList.Count; i++)
 				{
 					stream = streamList[i];
-					networkInterface.send(stream.getbuffer());
+					networkInterface.send(stream);
 				}
 			}
 			else

NetworkInterface.cs

@@ -1,31 +1,33 @@
 namespace KBEngine
 {
-  	using UnityEngine; 
-	using System; 
-	using System.Net.Sockets; 
-	using System.Net; 
-	using System.Collections; 
+	using UnityEngine;
+	using System;
+	using System.Net.Sockets;
+	using System.Net;
+	using System.Collections;
 	using System.Collections.Generic;
 	using System.Text;
 	using System.Text.RegularExpressions;
 	using System.Threading;
-	
+	using System.Runtime.Remoting.Messaging;
+
 	using MessageID = System.UInt16;
 	using MessageLength = System.UInt16;
-	
-	/*
-		网络模块
-		处理连接、收发数据
-	*/
-    public class NetworkInterface 
-    {
-    	public const int TCP_PACKET_MAX = 1460;
-    	public delegate void ConnectCallback(string ip, int port, bool success, object userData);
-    	
-        protected Socket _socket = null;
+
+	/// <summary>
+	/// 网络模块
+	/// 处理连接、收发数据
+	/// </summary>
+	public class NetworkInterface
+	{
+		public delegate void AsyncConnectMethod(ConnectState state);
+		public const int TCP_PACKET_MAX = 1460;
+		public delegate void ConnectCallback(string ip, int port, bool success, object userData);
+
+		protected Socket _socket = null;
 		PacketReceiver _packetReceiver = null;
 		PacketSender _packetSender = null;
-		
+
 		public class ConnectState
 		{
 			// for connect
@@ -38,10 +40,21 @@ public class ConnectState
 			public string error = "";
 		}
 
-        public NetworkInterface()
-        {
-        	reset();
-        }
+		public NetworkInterface()
+		{
+			reset();
+		}
+
+		~NetworkInterface()
+		{
+			Dbg.DEBUG_MSG("NetworkInterface::~NetworkInterface(), destructed!!!");
+			reset();
+		}
+
+		public virtual Socket sock()
+		{
+			return _socket;
+		}
 
 		public void reset()
 		{
@@ -55,27 +68,35 @@ public void reset()
 			_packetSender = null;
 		}
 
-		public Socket sock()
-		{
-			return _socket;
-		}
-		
-		public PacketReceiver packetReceiver()
+
+        public void close()
+        {
+           if(_socket != null)
+			{
+				_socket.Close(0);
+				_socket = null;
+				Event.fireAll("onDisableConnect", new object[]{});
+            }
+
+            _socket = null;
+        }
+
+		public virtual PacketReceiver packetReceiver()
 		{
 			return _packetReceiver;
 		}
 
-		public bool valid()
+		public virtual bool valid()
 		{
 			return ((_socket != null) && (_socket.Connected == true));
 		}
 
 		public void _onConnectStatus(ConnectState state)
 		{
 			KBEngine.Event.deregisterIn(this);
-			
+
 			bool success = (state.error == "" && valid());
-			if(success)
+			if (success)
 			{
 				Dbg.DEBUG_MSG(string.Format("NetworkInterface::_onConnectStatus(), connect to {0} is success!", state.socket.RemoteEndPoint.ToString()));
 				_packetReceiver = new PacketReceiver(this);
@@ -85,13 +106,13 @@ public void _onConnectStatus(ConnectState state)
 			{
 				Dbg.ERROR_MSG(string.Format("NetworkInterface::_onConnectStatus(), connect is error! ip: {0}:{1}, err: {2}", state.connectIP, state.connectPort, state.error));
 			}
-			
-			Event.fireOut("onConnectStatus", new object[]{success});
-			
+
+			Event.fireAll("onConnectStatus", new object[] { success });
+
 			if (state.connectCB != null)
 				state.connectCB(state.connectIP, state.connectPort, success, state.userData);
 		}
-		
+
 		private static void connectCB(IAsyncResult ar)
 		{
 			ConnectState state = null;
@@ -104,98 +125,103 @@ private static void connectCB(IAsyncResult ar)
 				// Complete the connection.
 				state.socket.EndConnect(ar);
 
-				Event.fireIn("_onConnectStatus", new object[]{state});
+				Event.fireIn("_onConnectStatus", new object[] { state });
 			} 
 			catch (Exception e) 
 			{
 				state.error = e.ToString();
-				Event.fireIn("_onConnectStatus", new object[]{state});
+				Event.fireIn("_onConnectStatus", new object[] { state });
 			}
 		}
-	    
-		public void connectTo(string ip, int port, ConnectCallback callback, object userData) 
+
+		/// <summary>
+		/// 在非主线程执行：连接服务器
+		/// </summary>
+		private void _asyncConnect(ConnectState state)
+		{
+			Dbg.DEBUG_MSG(string.Format("NetWorkInterface::_asyncConnect(), will connect to '{0}:{1}' ...", state.connectIP, state.connectPort));
+			try
+			{
+				state.socket.Connect(state.connectIP, state.connectPort);
+			}
+			catch (Exception e)
+			{
+				Dbg.ERROR_MSG(string.Format("NetWorkInterface::_asyncConnect(), connect to '{0}:{1}' fault! error = '{2}'", state.connectIP, state.connectPort, e));
+				state.error = e.ToString();
+			}
+		}
+
+		/// <summary>
+		/// 在非主线程执行：连接服务器结果回调
+		/// </summary>
+		private void _asyncConnectCB(IAsyncResult ar)
+		{
+			ConnectState state = (ConnectState)ar.AsyncState;
+			AsyncResult result = (AsyncResult)ar;
+			AsyncConnectMethod caller = (AsyncConnectMethod)result.AsyncDelegate;
+
+			Dbg.DEBUG_MSG(string.Format("NetWorkInterface::_asyncConnectCB(), connect to '{0}:{1}' finish. error = '{2}'", state.connectIP, state.connectPort, state.error));
+
+			// Call EndInvoke to retrieve the results.
+			caller.EndInvoke(ar);
+			Event.fireIn("_onConnectStatus", new object[] { state });
+		}
+
+		public void connectTo(string ip, int port, ConnectCallback callback, object userData)
 		{
 			if (valid())
-				throw new InvalidOperationException( "Have already connected!" );
-			
-			if(!(new Regex( @"((?:(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d))))")).IsMatch(ip))
+				throw new InvalidOperationException("Have already connected!");
+
+			if (!(new Regex(@"((?:(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d))))")).IsMatch(ip))
 			{
-				IPHostEntry ipHost = Dns.GetHostEntry (ip);
+				IPHostEntry ipHost = Dns.GetHostEntry(ip);
 				ip = ipHost.AddressList[0].ToString();
 			}
 
 			// Security.PrefetchSocketPolicy(ip, 843);
-			_socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); 
+			_socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
 			_socket.SetSocketOption(System.Net.Sockets.SocketOptionLevel.Socket, SocketOptionName.ReceiveBuffer, KBEngineApp.app.getInitArgs().getRecvBufferSize() * 2);
 			_socket.SetSocketOption(System.Net.Sockets.SocketOptionLevel.Socket, SocketOptionName.SendBuffer, KBEngineApp.app.getInitArgs().getSendBufferSize() * 2);
 			_socket.NoDelay = true;
-			
+			//_socket.Blocking = false;
+
 			ConnectState state = new ConnectState();
 			state.connectIP = ip;
 			state.connectPort = port;
 			state.connectCB = callback;
 			state.userData = userData;
 			state.socket = _socket;
 			state.networkInterface = this;
-			
+
 			Dbg.DEBUG_MSG("connect to " + ip + ":" + port + " ...");
-			
+
 			// 先注册一个事件回调，该事件在当前线程触发
 			Event.registerIn("_onConnectStatus", this, "_onConnectStatus");
-			
-			try 
-			{ 
-				_socket.BeginConnect(new IPEndPoint(IPAddress.Parse(ip), port), new AsyncCallback(connectCB), state);
-            } 
-            catch (Exception e) 
-            {
-            	state.error = e.ToString();
-				Event.fireIn("_onConnectStatus", new object[]{state});
-            }
-		}
-        
-        public void close()
-        {
-           if(_socket != null)
-			{
-				_socket.Close(0);
-				_socket = null;
-				Event.fireAll("onDisableConnect", new object[]{});
-            }
 
-            _socket = null;
-        }
+			var v = new AsyncConnectMethod(this._asyncConnect);
+			v.BeginInvoke(state, new AsyncCallback(this._asyncConnectCB), state);
+		}
 
-        public bool send(byte[] datas)
-        {
-			if(!valid()) 
+		public bool send(MemoryStream stream)
+		{
+			if (!valid())
 			{
-			   throw new ArgumentException ("invalid socket!");
+				throw new ArgumentException("invalid socket!");
 			}
-			
-			if(_packetSender == null)
+
+			if (_packetSender == null)
 				_packetSender = new PacketSender(this);
-			
-			try
-			{
-				return _packetSender.send(datas);
-			}
-			catch (SocketException err)
-			{
-				Dbg.ERROR_MSG(string.Format("NetworkInterface::send(): socket error(" + err.ErrorCode + ")!"));
-				close();
-			}
-			
-			return false;
-        }
-        
-        public void process()
-        {
-        	if(!valid())
-        		return;
-        	
-        	if(_packetReceiver != null)
-        		_packetReceiver.process();
-        }
+
+			return _packetSender.send(stream);
+		}
+
+		public void process()
+		{
+			if (!valid())
+				return;
+
+			if (_packetReceiver != null)
+				_packetReceiver.process();
+		}
 	}
-} 
+}