added new configuration attribute "protocol"

Author: kerryjiang

SocketBase/AppServer.cs

@@ -72,7 +72,19 @@ public AppServer(IReceiveFilterFactory<StringPackageInfo> receiveFilterFactory)
 
         internal override IReceiveFilterFactory<StringPackageInfo> CreateDefaultReceiveFilterFactory()
         {
-            return new CommandLineReceiveFilterFactory(TextEncoding);
+            var config = Config;
+            
+            if(config.Protocol == ProtocolMode.CommandLine)
+                return new CommandLineReceiveFilterFactory(TextEncoding);
+            else if (config.Protocol == ProtocolMode.WebSocket)
+            {
+                var websocketReceiveFilterFactoryType =
+                    Type.GetType("SuperSocket.WebSocket.WebSocketReceiveFilterFactory, SuperSocket.WebSocket");
+
+                return (IReceiveFilterFactory<StringPackageInfo>)Activator.CreateInstance(websocketReceiveFilterFactoryType);
+            }
+
+            return null;
         }
     }
 }

SocketBase/Config/IServerConfig.cs

@@ -28,6 +28,14 @@ public partial interface IServerConfig
         /// </value>
         string ServerType { get; }
 
+        /// <summary>
+        /// Gets the protocol the server instance want to use.
+        /// </summary>
+        /// <value>
+        /// The protocol  the server instance want to use.
+        /// </value>
+        ProtocolMode Protocol { get; }
+
         /// <summary>
         /// Gets the Receive filter factory.
         /// </summary>

SocketBase/Config/ServerConfig.cs

@@ -134,6 +134,14 @@ public ServerConfig()
         /// </value>
         public string ServerType { get; set; }
 
+        /// <summary>
+        /// Gets/sets the protocol the server instance want to use.
+        /// </summary>
+        /// <value>
+        /// The protocol  the server instance want to use.
+        /// </value>
+        public ProtocolMode Protocol { get; set; }
+
         /// <summary>
         /// Gets/sets the Receive filter factory.
         /// </summary>

SocketBase/ProtocolMode.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SuperSocket.SocketBase
+{
+    /// <summary>
+    /// Application protocol mode
+    /// </summary>
+    public enum ProtocolMode
+    {
+        /// <summary>
+        /// The command line protocol
+        /// </summary>
+        CommandLine,
+        /// <summary>
+        /// The web socket protocol
+        /// </summary>
+        WebSocket,
+        /// <summary>
+        /// The custom protocol defined by yourself
+        /// </summary>
+        Custom
+    }
+}

SocketBase/SuperSocket.SocketBase.Net45.csproj

@@ -126,6 +126,7 @@
     <Compile Include="Pool\IPool.cs" />
     <Compile Include="Pool\IPoolItemCreator.cs" />
     <Compile Include="Pool\NullBufferManager.cs" />
+    <Compile Include="ProtocolMode.cs" />
     <Compile Include="Protocol\CommandLineReceiveFilterFactory.cs" />
     <Compile Include="Protocol\CountSpliterReceiveFilter.cs" />
     <Compile Include="Protocol\CountSpliterReceiveFilterFactory.cs" />

SocketEngine/Configuration/Server.cs

@@ -78,6 +78,18 @@ public SocketMode Mode
             get { return (SocketMode)this["mode"]; }
         }
 
+        /// <summary>
+        /// Gets the protocol the server instance want to use.
+        /// </summary>
+        /// <value>
+        /// The protocol  the server instance want to use.
+        /// </value>
+        [ConfigurationProperty("protocol", IsRequired = false, DefaultValue = "CommandLine")]
+        public ProtocolMode Protocol
+        {
+            get { return (ProtocolMode)this["protocol"]; }
+        }
+
 
         /// <summary>
         /// Gets the request handling mode.