Refactored a few for WebSocket.cs

websocket-sharp/Server/WebSocketBehavior.cs

@@ -366,7 +366,7 @@ namespace WebSocketSharp.Server
       _websocket.OnError += onError;
       _websocket.OnClose += onClose;
 
-      _websocket.ConnectAsServer ();
+      _websocket.Accept ();
     }
 
     #endregion

websocket-sharp/WebSocket.cs

@@ -601,7 +601,7 @@ namespace WebSocketSharp
       var msg = checkIfValidHandshakeRequest (_context);
       if (msg != null) {
         _logger.Error (msg);
-        error ("An error has occurred while connecting.", null);
+        error ("An error has occurred while accepting.", null);
         Close (HttpStatusCode.BadRequest);
 
         return false;
@@ -760,7 +760,7 @@ namespace WebSocketSharp
         var msg = _readyState.CheckIfConnectable ();
         if (msg != null) {
           _logger.Error (msg);
-          error ("An error has occurred in connecting.", null);
+          error ("An error has occurred in handshaking.", null);
 
           return false;
         }
@@ -773,7 +773,7 @@ namespace WebSocketSharp
           }
         }
         catch (Exception ex) {
-          processException (ex, "An exception has occurred while connecting.");
+          processException (ex, "An exception has occurred while handshaking.");
         }
 
         return false;
@@ -1536,6 +1536,20 @@ namespace WebSocketSharp
 
     #region Internal Methods
 
+    // As server
+    internal void Accept ()
+    {
+      try {
+        if (acceptHandshake ()) {
+          _readyState = WebSocketState.Open;
+          open ();
+        }
+      }
+      catch (Exception ex) {
+        processException (ex, "An exception has occurred while accepting.");
+      }
+    }
+
     internal static string CheckCloseParameters (ushort code, string reason, bool client)
     {
       return !code.IsCloseStatusCode ()
@@ -1610,20 +1624,6 @@ namespace WebSocketSharp
       }
     }
 
-    // As server
-    internal void ConnectAsServer ()
-    {
-      try {
-        if (acceptHandshake ()) {
-          _readyState = WebSocketState.Open;
-          open ();
-        }
-      }
-      catch (Exception ex) {
-        processException (ex, "An exception has occurred while connecting.");
-      }
-    }
-
     // As client
     internal static string CreateBase64Key ()
     {
@@ -2029,7 +2029,7 @@ namespace WebSocketSharp
       var msg = checkIfCanConnect ();
       if (msg != null) {
         _logger.Error (msg);
-        error ("An error has occurred in connecting.", null);
+        error ("An error has occurred in handshaking.", null);
 
         return;
       }
@@ -2049,7 +2049,7 @@ namespace WebSocketSharp
       var msg = checkIfCanConnect ();
       if (msg != null) {
         _logger.Error (msg);
-        error ("An error has occurred in connecting.", null);
+        error ("An error has occurred in handshaking.", null);
 
         return;
       }