Adding support for limiting message frame size

darkl · darkl · commit 6d962b180c63 · 2021-06-05T15:13:34.000-04:00
diff --git a/src/netstandard/Extensions/WampSharp.AspNet.WebSockets.Server/AspNetWebsocketTransport.cs b/src/netstandard/Extensions/WampSharp.AspNet.WebSockets.Server/AspNetWebsocketTransport.cs
@@ -18,6 +18,7 @@ public sealed class AspNetWebSocketTransport : WebSocketTransport<WebSocketData>
         private readonly string mUrl;
         private readonly object mLock = new object();
         private Route mRoute;
+        private readonly int? mMaxFrameSize;
 
         /// <exclude />
         public AspNetWebSocketTransport(string url,
@@ -55,7 +56,8 @@ protected override IWampConnection<TMessage> CreateBinaryConnection<TMessage>
             return new BinaryWebSocketConnection<TMessage>(connection.WebSocket,
                                                            binding,
                                                            new AspNetCookieProvider(connection.HttpContext),
-                                                           AuthenticatorFactory);
+                                                           AuthenticatorFactory,
+                                                           mMaxFrameSize);
         }
 
         /// <exclude />
@@ -66,7 +68,8 @@ protected override IWampConnection<TMessage> CreateTextConnection<TMessage>
             return new TextWebSocketConnection<TMessage>(connection.WebSocket,
                                                          binding,
                                                          new AspNetCookieProvider(connection.HttpContext),
-                                                         AuthenticatorFactory);
+                                                         AuthenticatorFactory,
+                                                         mMaxFrameSize);
         }
 
         /// <exclude />
diff --git a/src/netstandard/Extensions/WampSharp.AspNetCore.WebSockets.Server/AspNetCoreWebSocketTransport.cs b/src/netstandard/Extensions/WampSharp.AspNetCore.WebSockets.Server/AspNetCoreWebSocketTransport.cs
@@ -15,6 +15,7 @@ namespace WampSharp.AspNetCore.WebSockets.Server
     public class AspNetCoreWebSocketTransport : WebSocketTransport<WebSocketData>
     {
         private Func<HttpContext, Func<Task>, Task> mHandler;
+        private int? mMaxFrameSize;
 
         public AspNetCoreWebSocketTransport
             (IApplicationBuilder app,
@@ -54,7 +55,8 @@ protected override IWampConnection<TMessage> CreateBinaryConnection<TMessage>
                 (connection.WebSocket,
                  binding,
                  new AspNetCoreCookieProvider(connection.HttpContext),
-                 AuthenticatorFactory);
+                 AuthenticatorFactory,
+                 mMaxFrameSize);
         }
 
         protected override IWampConnection<TMessage> CreateTextConnection<TMessage>
@@ -67,7 +69,8 @@ protected override IWampConnection<TMessage> CreateTextConnection<TMessage>
                 (connection.WebSocket,
                  binding,
                  new AspNetCoreCookieProvider(connection.HttpContext),
-                 AuthenticatorFactory);
+                 AuthenticatorFactory,
+                 mMaxFrameSize);
         }
 
         private void ConfigureComputeBytes<TMessage, TRaw>(IWampTransportBinding<TMessage, TRaw> binding)
diff --git a/src/netstandard/Extensions/WampSharp.HttpListener/HttpListenerWebSocketTransport.cs b/src/netstandard/Extensions/WampSharp.HttpListener/HttpListenerWebSocketTransport.cs
@@ -18,6 +18,7 @@ public sealed class HttpListenerWebSocketTransport : WebSocketTransport<WebSocke
         private readonly string mUrl;
         private readonly Action<HttpListenerContext> mOnUnknownRequest;
         private System.Net.HttpListener mHttpListener;
+        private int? mMaxFrameSize;
 
         /// <exclude />
         public HttpListenerWebSocketTransport
@@ -65,7 +66,8 @@ protected override IWampConnection<TMessage> CreateBinaryConnection<TMessage>
             return new BinaryWebSocketConnection<TMessage>(connection.Context.WebSocket,
                                                            binding,
                                                            new HttpListenerCookieProvider(connection.Context), 
-                                                           AuthenticatorFactory);
+                                                           AuthenticatorFactory,
+                                                           mMaxFrameSize);
         }
 
         /// <exclude />
@@ -76,7 +78,8 @@ protected override IWampConnection<TMessage> CreateTextConnection<TMessage>
             return new TextWebSocketConnection<TMessage>(connection.Context.WebSocket,
                                                          binding,
                                                          new HttpListenerCookieProvider(connection.Context),
-                                                         AuthenticatorFactory);
+                                                         AuthenticatorFactory,
+                                                         mMaxFrameSize);
         }
 
         /// <exclude />
diff --git a/src/netstandard/Extensions/WampSharp.Owin/Owin/OwinWebSocketTransport.cs b/src/netstandard/Extensions/WampSharp.Owin/Owin/OwinWebSocketTransport.cs
@@ -18,14 +18,17 @@ public class OwinWebSocketTransport : WebSocketTransport<WebSocketData>
         private const string SecWebSocketProtocolHeader = "Sec-WebSocket-Protocol";
 
         private Func<IOwinContext, Func<Task>, Task> mHandler;
+        private int? mMaxFrameSize;
 
         public OwinWebSocketTransport
-            (IAppBuilder app,
-             ICookieAuthenticatorFactory authenticatorFactory = null) :
+        (IAppBuilder app,
+         int? maxFrameSize,
+         ICookieAuthenticatorFactory authenticatorFactory = null) :
                  base(authenticatorFactory)
         {
             mHandler = this.EmptyHandler;
             app.Use(HttpHandler);
+            mMaxFrameSize = maxFrameSize;
         }
 
         public override void Dispose()
@@ -55,7 +58,8 @@ protected override IWampConnection<TMessage> CreateBinaryConnection<TMessage>
                 (new OwinWebSocketWrapper(connection.WebSocketContext),
                  binding,
                  new OwinCookieProvider(connection.OwinContext),
-                 AuthenticatorFactory);
+                 AuthenticatorFactory,
+                 mMaxFrameSize);
         }
 
         protected override IWampConnection<TMessage> CreateTextConnection<TMessage>
@@ -66,7 +70,8 @@ protected override IWampConnection<TMessage> CreateTextConnection<TMessage>
                 (new OwinWebSocketWrapper(connection.WebSocketContext),
                  binding,
                  new OwinCookieProvider(connection.OwinContext),
-                 AuthenticatorFactory);
+                 AuthenticatorFactory,
+                 mMaxFrameSize);
         }
 
         public override void Open()
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WAMP2/V2/Fluent/IWebSocketTransportSyntax.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WAMP2/V2/Fluent/IWebSocketTransportSyntax.cs
@@ -5,7 +5,9 @@ namespace WampSharp.V2.Fluent
 {
     public interface IWebSocketTransportSyntax : ChannelFactorySyntax.ITransportSyntax
     {
-        ChannelFactorySyntax.ITransportSyntax SetClientWebSocketOptions
+        IWebSocketTransportSyntax SetClientWebSocketOptions
             (Action<ClientWebSocketOptions> configureClientWebSocketOptions);
+
+        IWebSocketTransportSyntax SetMaxFrameSize(int maxFrameSize);
     }
 }
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WAMP2/V2/Fluent/WebSocketActivator.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WAMP2/V2/Fluent/WebSocketActivator.cs
@@ -20,6 +20,8 @@ public WebSocketActivator(Uri serverAddress)
 
         public Action<ClientWebSocketOptions> ConfigureOptions { get; set; }
 
+        public int? MaxFrameSize { get; set; }
+
         public IControlledWampConnection<TMessage> Activate<TMessage>(IWampBinding<TMessage> binding)
         {
             Func<IControlledWampConnection<TMessage>> factory = 
@@ -36,22 +38,24 @@ private IControlledWampConnection<TMessage> GetConnectionFactory<TMessage>(IWamp
             switch (binding)
             {
                 case IWampTextBinding<TMessage> textBinding:
-                    return CreateTextConnection(textBinding);
+                    return CreateTextConnection(textBinding, MaxFrameSize);
                 case IWampBinaryBinding<TMessage> binaryBinding:
-                    return CreateBinaryConnection(binaryBinding);
+                    return CreateBinaryConnection(binaryBinding, MaxFrameSize);
             }
 
             throw new Exception();
         }
 
-        protected IControlledWampConnection<TMessage> CreateBinaryConnection<TMessage>(IWampBinaryBinding<TMessage> binaryBinding)
+        protected IControlledWampConnection<TMessage> CreateBinaryConnection<TMessage>(
+            IWampBinaryBinding<TMessage> binaryBinding, int? maxFrameSize)
         {
-            return new ControlledBinaryWebSocketConnection<TMessage>(ActivateWebSocket(), mServerAddress, binaryBinding);
+            return new ControlledBinaryWebSocketConnection<TMessage>(ActivateWebSocket(), mServerAddress, binaryBinding, maxFrameSize);
         }
 
-        protected IControlledWampConnection<TMessage> CreateTextConnection<TMessage>(IWampTextBinding<TMessage> textBinding)
+        protected IControlledWampConnection<TMessage> CreateTextConnection<TMessage>(
+            IWampTextBinding<TMessage> textBinding, int? maxFrameSize)
         {
-            return new ControlledTextWebSocketConnection<TMessage>(ActivateWebSocket(), mServerAddress, textBinding);
+            return new ControlledTextWebSocketConnection<TMessage>(ActivateWebSocket(), mServerAddress, textBinding, maxFrameSize);
         }
 
         private ClientWebSocket ActivateWebSocket()
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WAMP2/V2/Fluent/WebSocketTransportSyntax.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WAMP2/V2/Fluent/WebSocketTransportSyntax.cs
@@ -10,12 +10,18 @@ public WebSocketTransportSyntax(ChannelState state)
             State = state;
         }
 
-        public ChannelFactorySyntax.ITransportSyntax SetClientWebSocketOptions(Action<ClientWebSocketOptions> configureClientWebSocketOptions)
+        public IWebSocketTransportSyntax SetClientWebSocketOptions(Action<ClientWebSocketOptions> configureClientWebSocketOptions)
         {
             ((WebSocketActivator) State.ConnectionActivator).ConfigureOptions = configureClientWebSocketOptions;
             return this;
         }
 
+        public IWebSocketTransportSyntax SetMaxFrameSize(int maxFrameSize)
+        {
+            ((WebSocketActivator) State.ConnectionActivator).MaxFrameSize = maxFrameSize;
+            return this;
+        }
+
         public ChannelState State { get; }
     }
 }
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/BinaryWebSocketConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/BinaryWebSocketConnection.cs
@@ -7,12 +7,15 @@ namespace WampSharp.WebSockets
 {
     public class BinaryWebSocketConnection<TMessage> : BinaryWebSocketWrapperConnection<TMessage>
     {
-        public BinaryWebSocketConnection(WebSocket webSocket, IWampBinaryBinding<TMessage> binding, ICookieProvider cookieProvider, ICookieAuthenticatorFactory cookieAuthenticatorFactory) : 
-            base(new WebSocketWrapper(webSocket), binding, cookieProvider, cookieAuthenticatorFactory)
+        public BinaryWebSocketConnection(WebSocket webSocket, IWampBinaryBinding<TMessage> binding,
+                                         ICookieProvider cookieProvider,
+                                         ICookieAuthenticatorFactory cookieAuthenticatorFactory, int? maxFrameSize) : 
+            base(new WebSocketWrapper(webSocket), binding, cookieProvider, cookieAuthenticatorFactory, maxFrameSize)
         {
         }
 
-        protected BinaryWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri, IWampBinaryBinding<TMessage> binding) : base(new ClientWebSocketWrapper(clientWebSocket), addressUri, binding)
+        protected BinaryWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri,
+                                            IWampBinaryBinding<TMessage> binding, int? maxFrameSize) : base(new ClientWebSocketWrapper(clientWebSocket), addressUri, binding, maxFrameSize)
         {
         }
     }
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/BinaryWebSocketWrapperConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/BinaryWebSocketWrapperConnection.cs
@@ -9,14 +9,18 @@ public class BinaryWebSocketWrapperConnection<TMessage> : WebSocketWrapperConnec
     {
         private readonly IWampBinaryBinding<TMessage> mBinding;
 
-        public BinaryWebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampBinaryBinding<TMessage> binding, ICookieProvider cookieProvider, ICookieAuthenticatorFactory cookieAuthenticatorFactory) : 
-            base(webSocket, binding, cookieProvider, cookieAuthenticatorFactory)
+        public BinaryWebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampBinaryBinding<TMessage> binding,
+                                                ICookieProvider cookieProvider,
+                                                ICookieAuthenticatorFactory cookieAuthenticatorFactory,
+                                                int? maxFrameSize) : 
+            base(webSocket, binding, cookieProvider, cookieAuthenticatorFactory, maxFrameSize)
         {
             mBinding = binding;
         }
 
-        protected BinaryWebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket, Uri addressUri, IWampBinaryBinding<TMessage> binding) :
-            base(clientWebSocket, addressUri, binding.Name, binding)
+        protected BinaryWebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket, Uri addressUri,
+                                                   IWampBinaryBinding<TMessage> binding, int? maxFrameSize) :
+            base(clientWebSocket, addressUri, binding.Name, binding, maxFrameSize)
         {
             mBinding = binding;
         }
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/ControlledBinaryWebSocketConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/ControlledBinaryWebSocketConnection.cs
@@ -7,13 +7,15 @@ namespace WampSharp.WebSockets
 {
     public class ControlledBinaryWebSocketConnection<TMessage> : BinaryWebSocketConnection<TMessage>, IControlledWampConnection<TMessage>
     {
-        public ControlledBinaryWebSocketConnection(Uri addressUri, IWampBinaryBinding<TMessage> binding) : 
-            this(new ClientWebSocket(), addressUri, binding)
+        public ControlledBinaryWebSocketConnection(Uri addressUri, IWampBinaryBinding<TMessage> binding,
+                                                   int? maxFrameSize) : 
+            this(new ClientWebSocket(), addressUri, binding, maxFrameSize)
         {
         }
 
-        public ControlledBinaryWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri, IWampBinaryBinding<TMessage> binding) :
-            base(clientWebSocket, addressUri, binding)
+        public ControlledBinaryWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri,
+                                                   IWampBinaryBinding<TMessage> binding, int? maxFrameSize) :
+            base(clientWebSocket, addressUri, binding, maxFrameSize)
         {
         }
 
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/ControlledTextWebSocketConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/ControlledTextWebSocketConnection.cs
@@ -7,11 +7,13 @@ namespace WampSharp.WebSockets
 {
     public class ControlledTextWebSocketConnection<TMessage> : TextWebSocketConnection<TMessage>, IControlledWampConnection<TMessage>
     {
-        public ControlledTextWebSocketConnection(Uri addressUri, IWampTextBinding<TMessage> binding) : this(new ClientWebSocket(), addressUri, binding)
+        public ControlledTextWebSocketConnection(Uri addressUri, IWampTextBinding<TMessage> binding, int? maxFrameSize) : 
+            this(new ClientWebSocket(), addressUri, binding, maxFrameSize)
         {
         }
 
-        public ControlledTextWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri, IWampTextBinding<TMessage> binding) : base(clientWebSocket, addressUri, binding)
+        public ControlledTextWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri,
+                                                 IWampTextBinding<TMessage> binding, int? maxFrameSize) : base(clientWebSocket, addressUri, binding, maxFrameSize)
         {
         }
 
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/TextWebSocketConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/TextWebSocketConnection.cs
@@ -7,11 +7,15 @@ namespace WampSharp.WebSockets
 {
     public class TextWebSocketConnection<TMessage> : TextWebSocketWrapperConnection<TMessage>
     {
-        public TextWebSocketConnection(WebSocket webSocket, IWampTextBinding<TMessage> binding, ICookieProvider cookieProvider, ICookieAuthenticatorFactory cookieAuthenticatorFactory) : base(new WebSocketWrapper(webSocket), binding, cookieProvider, cookieAuthenticatorFactory)
+        public TextWebSocketConnection(WebSocket webSocket, IWampTextBinding<TMessage> binding,
+                                       ICookieProvider cookieProvider,
+                                       ICookieAuthenticatorFactory cookieAuthenticatorFactory, int? maxFrameSize) : base(new WebSocketWrapper(webSocket), binding, cookieProvider, cookieAuthenticatorFactory, maxFrameSize)
         {
         }
 
-        protected TextWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri, IWampTextBinding<TMessage> binding) : base(new ClientWebSocketWrapper(clientWebSocket), addressUri, binding)
+        protected TextWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri,
+                                          IWampTextBinding<TMessage> binding, int? maxFrameSize) :
+            base(new ClientWebSocketWrapper(clientWebSocket), addressUri, binding, maxFrameSize)
         {
         }
     }
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/TextWebSocketWrapperConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/TextWebSocketWrapperConnection.cs
@@ -9,14 +9,17 @@ public class TextWebSocketWrapperConnection<TMessage> : WebSocketWrapperConnecti
     {
         private readonly IWampTextBinding<TMessage> mBinding;
 
-        public TextWebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampTextBinding<TMessage> binding, ICookieProvider cookieProvider, ICookieAuthenticatorFactory cookieAuthenticatorFactory) : 
-            base(webSocket, binding, cookieProvider, cookieAuthenticatorFactory)
+        public TextWebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampTextBinding<TMessage> binding,
+                                              ICookieProvider cookieProvider,
+                                              ICookieAuthenticatorFactory cookieAuthenticatorFactory, int? maxFrameSize) : 
+            base(webSocket, binding, cookieProvider, cookieAuthenticatorFactory, maxFrameSize)
         {
             mBinding = binding;
         }
 
-        protected TextWebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket, Uri addressUri, IWampTextBinding<TMessage> binding) :
-            base(clientWebSocket, addressUri, binding.Name, binding)
+        protected TextWebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket, Uri addressUri,
+                                                 IWampTextBinding<TMessage> binding, int? maxFrameSize) :
+            base(clientWebSocket, addressUri, binding.Name, binding, maxFrameSize)
         {
             mBinding = binding;
         }
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/WebSocketWrapperConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/WebSocketWrapperConnection.cs
diff --git a/src/netstandard/WampSharp.Default.Client/WAMP2/V2/DefaultWampChannelFactory.cs b/src/netstandard/WampSharp.Default.Client/WAMP2/V2/DefaultWampChannelFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@ namespace WampSharp.V2.Fluent`
`5`	`5`	`{`
`6`	`6`	`public interface IWebSocketTransportSyntax : ChannelFactorySyntax.ITransportSyntax`
`7`	`7`	`{`
`8`		`- ChannelFactorySyntax.ITransportSyntax SetClientWebSocketOptions`
	`8`	`+ IWebSocketTransportSyntax SetClientWebSocketOptions`
`9`	`9`	`(Action<ClientWebSocketOptions> configureClientWebSocketOptions);`
	`10`	`+`
	`11`	`+ IWebSocketTransportSyntax SetMaxFrameSize(int maxFrameSize);`
`10`	`12`	`}`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ public WebSocketActivator(Uri serverAddress)`
`20`	`20`
`21`	`21`	`public Action<ClientWebSocketOptions> ConfigureOptions { get; set; }`
`22`	`22`
	`23`	`+ public int? MaxFrameSize { get; set; }`
	`24`	`+`
`23`	`25`	`public IControlledWampConnection<TMessage> Activate<TMessage>(IWampBinding<TMessage> binding)`
`24`	`26`	`{`
`25`	`27`	`Func<IControlledWampConnection<TMessage>> factory =`
`@@ -36,22 +38,24 @@ private IControlledWampConnection<TMessage> GetConnectionFactory<TMessage>(IWamp`
`36`	`38`	`switch (binding)`
`37`	`39`	`{`
`38`	`40`	`case IWampTextBinding<TMessage> textBinding:`
`39`		`- return CreateTextConnection(textBinding);`
	`41`	`+ return CreateTextConnection(textBinding, MaxFrameSize);`
`40`	`42`	`case IWampBinaryBinding<TMessage> binaryBinding:`
`41`		`- return CreateBinaryConnection(binaryBinding);`
	`43`	`+ return CreateBinaryConnection(binaryBinding, MaxFrameSize);`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`throw new Exception();`
`45`	`47`	`}`
`46`	`48`
`47`		`- protected IControlledWampConnection<TMessage> CreateBinaryConnection<TMessage>(IWampBinaryBinding<TMessage> binaryBinding)`
	`49`	`+ protected IControlledWampConnection<TMessage> CreateBinaryConnection<TMessage>(`
	`50`	`+ IWampBinaryBinding<TMessage> binaryBinding, int? maxFrameSize)`
`48`	`51`	`{`
`49`		`- return new ControlledBinaryWebSocketConnection<TMessage>(ActivateWebSocket(), mServerAddress, binaryBinding);`
	`52`	`+ return new ControlledBinaryWebSocketConnection<TMessage>(ActivateWebSocket(), mServerAddress, binaryBinding, maxFrameSize);`
`50`	`53`	`}`
`51`	`54`
`52`		`- protected IControlledWampConnection<TMessage> CreateTextConnection<TMessage>(IWampTextBinding<TMessage> textBinding)`
	`55`	`+ protected IControlledWampConnection<TMessage> CreateTextConnection<TMessage>(`
	`56`	`+ IWampTextBinding<TMessage> textBinding, int? maxFrameSize)`
`53`	`57`	`{`
`54`		`- return new ControlledTextWebSocketConnection<TMessage>(ActivateWebSocket(), mServerAddress, textBinding);`
	`58`	`+ return new ControlledTextWebSocketConnection<TMessage>(ActivateWebSocket(), mServerAddress, textBinding, maxFrameSize);`
`55`	`59`	`}`
`56`	`60`
`57`	`61`	`private ClientWebSocket ActivateWebSocket()`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,18 @@ public WebSocketTransportSyntax(ChannelState state)`
`10`	`10`	`State = state;`
`11`	`11`	`}`
`12`	`12`
`13`		`- public ChannelFactorySyntax.ITransportSyntax SetClientWebSocketOptions(Action<ClientWebSocketOptions> configureClientWebSocketOptions)`
	`13`	`+ public IWebSocketTransportSyntax SetClientWebSocketOptions(Action<ClientWebSocketOptions> configureClientWebSocketOptions)`
`14`	`14`	`{`
`15`	`15`	`((WebSocketActivator) State.ConnectionActivator).ConfigureOptions = configureClientWebSocketOptions;`
`16`	`16`	`return this;`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ public IWebSocketTransportSyntax SetMaxFrameSize(int maxFrameSize)`
	`20`	`+ {`
	`21`	`+ ((WebSocketActivator) State.ConnectionActivator).MaxFrameSize = maxFrameSize;`
	`22`	`+ return this;`
	`23`	`+ }`
	`24`	`+`
`19`	`25`	`public ChannelState State { get; }`
`20`	`26`	`}`
`21`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,15 @@ namespace WampSharp.WebSockets`
`7`	`7`	`{`
`8`	`8`	`public class BinaryWebSocketConnection<TMessage> : BinaryWebSocketWrapperConnection<TMessage>`
`9`	`9`	`{`
`10`		`- public BinaryWebSocketConnection(WebSocket webSocket, IWampBinaryBinding<TMessage> binding, ICookieProvider cookieProvider, ICookieAuthenticatorFactory cookieAuthenticatorFactory) :`
`11`		`- base(new WebSocketWrapper(webSocket), binding, cookieProvider, cookieAuthenticatorFactory)`
	`10`	`+ public BinaryWebSocketConnection(WebSocket webSocket, IWampBinaryBinding<TMessage> binding,`
	`11`	`+ ICookieProvider cookieProvider,`
	`12`	`+ ICookieAuthenticatorFactory cookieAuthenticatorFactory, int? maxFrameSize) :`
	`13`	`+ base(new WebSocketWrapper(webSocket), binding, cookieProvider, cookieAuthenticatorFactory, maxFrameSize)`
`12`	`14`	`{`
`13`	`15`	`}`
`14`	`16`
`15`		`- protected BinaryWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri, IWampBinaryBinding<TMessage> binding) : base(new ClientWebSocketWrapper(clientWebSocket), addressUri, binding)`
	`17`	`+ protected BinaryWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri,`
	`18`	`+ IWampBinaryBinding<TMessage> binding, int? maxFrameSize) : base(new ClientWebSocketWrapper(clientWebSocket), addressUri, binding, maxFrameSize)`
`16`	`19`	`{`
`17`	`20`	`}`
`18`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,18 @@ public class BinaryWebSocketWrapperConnection<TMessage> : WebSocketWrapperConnec`
`9`	`9`	`{`
`10`	`10`	`private readonly IWampBinaryBinding<TMessage> mBinding;`
`11`	`11`
`12`		`- public BinaryWebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampBinaryBinding<TMessage> binding, ICookieProvider cookieProvider, ICookieAuthenticatorFactory cookieAuthenticatorFactory) :`
`13`		`- base(webSocket, binding, cookieProvider, cookieAuthenticatorFactory)`
	`12`	`+ public BinaryWebSocketWrapperConnection(IWebSocketWrapper webSocket, IWampBinaryBinding<TMessage> binding,`
	`13`	`+ ICookieProvider cookieProvider,`
	`14`	`+ ICookieAuthenticatorFactory cookieAuthenticatorFactory,`
	`15`	`+ int? maxFrameSize) :`
	`16`	`+ base(webSocket, binding, cookieProvider, cookieAuthenticatorFactory, maxFrameSize)`
`14`	`17`	`{`
`15`	`18`	`mBinding = binding;`
`16`	`19`	`}`
`17`	`20`
`18`		`- protected BinaryWebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket, Uri addressUri, IWampBinaryBinding<TMessage> binding) :`
`19`		`- base(clientWebSocket, addressUri, binding.Name, binding)`
	`21`	`+ protected BinaryWebSocketWrapperConnection(IClientWebSocketWrapper clientWebSocket, Uri addressUri,`
	`22`	`+ IWampBinaryBinding<TMessage> binding, int? maxFrameSize) :`
	`23`	`+ base(clientWebSocket, addressUri, binding.Name, binding, maxFrameSize)`
`20`	`24`	`{`
`21`	`25`	`mBinding = binding;`
`22`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,15 @@ namespace WampSharp.WebSockets`
`7`	`7`	`{`
`8`	`8`	`public class ControlledBinaryWebSocketConnection<TMessage> : BinaryWebSocketConnection<TMessage>, IControlledWampConnection<TMessage>`
`9`	`9`	`{`
`10`		`- public ControlledBinaryWebSocketConnection(Uri addressUri, IWampBinaryBinding<TMessage> binding) :`
`11`		`- this(new ClientWebSocket(), addressUri, binding)`
	`10`	`+ public ControlledBinaryWebSocketConnection(Uri addressUri, IWampBinaryBinding<TMessage> binding,`
	`11`	`+ int? maxFrameSize) :`
	`12`	`+ this(new ClientWebSocket(), addressUri, binding, maxFrameSize)`
`12`	`13`	`{`
`13`	`14`	`}`
`14`	`15`
`15`		`- public ControlledBinaryWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri, IWampBinaryBinding<TMessage> binding) :`
`16`		`- base(clientWebSocket, addressUri, binding)`
	`16`	`+ public ControlledBinaryWebSocketConnection(ClientWebSocket clientWebSocket, Uri addressUri,`
	`17`	`+ IWampBinaryBinding<TMessage> binding, int? maxFrameSize) :`
	`18`	`+ base(clientWebSocket, addressUri, binding, maxFrameSize)`
`17`	`19`	`{`
`18`	`20`	`}`
`19`	`21`