added close to connection

joeyespo · Oct 29, 2010 · 70dd168 · 70dd168
1 parent afc0718
commit 70dd168
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/Samples/ConsoleApp/Server.cs b/Samples/ConsoleApp/Server.cs
@@ -22,7 +22,10 @@ static void Main()
 							Console.WriteLine("Close!");
 							allSockets.Remove(socket);
 						};
-					socket.OnMessage = message => Console.WriteLine(message);
+					socket.OnMessage = message =>
+						{
+							Console.WriteLine(message);
+						};
 				});
 
 

diff --git a/src/Fleck/Receiver.cs b/src/Fleck/Receiver.cs
@@ -26,7 +26,7 @@ public void Receive(DataFrame frame = null)
 
 			if (Socket == null || !Socket.Connected)
 			{
-				_connection.OnClose();
+				_connection.Close();
 				return;
 			}
 
@@ -56,8 +56,7 @@ public void Receive(DataFrame frame = null)
 					}
 					else
 					{
-						_connection.OnClose();
-						Socket.Close();
+						_connection.Close();
 					}
 				}, null);
 		}

diff --git a/src/Fleck/Sender.cs b/src/Fleck/Sender.cs
@@ -15,16 +15,13 @@ public Sender(WebSocketConnection connection)
 
 		public void Send(string data)
 		{
-			if (Socket.Connected)
-			{
-				var wrapped = DataFrame.Wrap(data);
-				Socket.BeginSend(wrapped, 0, wrapped.Length, SocketFlags.None, r => Socket.EndSend(r), null);
-			}
-			else
-			{
-				_connection.OnClose();
-				Socket.Close();
-			}
+			if (!Socket.Connected) return;
+			var wrapped = DataFrame.Wrap(data);
+			Socket.BeginSend(wrapped, 0, wrapped.Length, SocketFlags.None, r =>
+				{
+					if (Socket.Connected)
+						Socket.EndSend(r);
+				}, null);
 		}
 	}
 }
diff --git a/src/Fleck/WebSocketConnection.cs b/src/Fleck/WebSocketConnection.cs
@@ -34,5 +34,12 @@ public void StartReceiving()
 		{
 			_receiver.Receive();
 		}
+
+		public void Close()
+		{
+			if (!Socket.Connected) return;
+			OnClose();
+			Socket.Close();
+		}
 	}
 }
diff --git a/src/Fleck/WebSocketServer.cs b/src/Fleck/WebSocketServer.cs
@@ -14,7 +14,8 @@ public WebSocketServer(int port, string location)
 			Location = location;
 		}
 
-		public WebSocketServer(int port, string location, string origin):this(port,location)
+		public WebSocketServer(int port, string location, string origin)
+			: this(port, location)
 		{
 			Origin = origin;
 		}
@@ -58,6 +59,7 @@ private void OnClientConnect(IAsyncResult ar)
 				Log.Error("Listener socket is closed");
 				return;
 			}
+			ListenForClients();
 
 
 			var shaker = new HandshakeHandler(Origin, Location)
@@ -73,7 +75,6 @@ private void OnClientConnect(IAsyncResult ar)
 
 			shaker.Shake(clientSocket);
 
-			ListenForClients();
 		}
 	}
 }