Commite01e5f3

committed

Merge implementation of IsAllowPacketFragmentation.

1 parent9a7a8bd commite01e5f3Copy full SHA for e01e5f3

File tree

+26

-19

lines changed

+26

-19

lines changed

Lines changed: 21 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,32 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`usingMQTTnet.Adapter;`
	`6`	`+usingMQTTnet.Server;`
`6`	`7`	`usingSystem;`
`7`	`8`
`8`	`9`	`namespaceMQTTnet.AspNetCore`
`9`	`10`	`{`
`10`	`11`	`sealedclassPacketFragmentationFeature(Func<IMqttChannelAdapter,bool>allowPacketFragmentationSelector)`
`11`	`12`	`{`
`12`		`-publicFunc<IMqttChannelAdapter,bool>AllowPacketFragmentationSelector{get;}=allowPacketFragmentationSelector;`
	`13`	`+publicFunc<IMqttChannelAdapter,bool>AllowPacketFragmentationSelector{get;}=allowPacketFragmentationSelector;`
	`14`	`+`
	`15`	`+publicstaticboolIsAllowPacketFragmentation(IMqttChannelAdapterchannelAdapter,MqttServerTcpEndpointBaseOptions?endpointOptions)`
	`16`	`+{`
	`17`	`+//if (endpointOptions != null && endpointOptions.AllowPacketFragmentationSelector != null)`
	`18`	`+//{`
	`19`	`+// return endpointOptions.AllowPacketFragmentationSelector(channelAdapter);`
	`20`	`+//}`
	`21`	`+`
	`22`	`+// In the AspNetCore environment, we need to exclude WebSocket before AllowPacketFragmentation.`
	`23`	`+if(channelAdapterisMqttServerChannelAdapterserverChannelAdapter)`
	`24`	`+{`
	`25`	`+if(serverChannelAdapter.IsWebSocketConnection)`
	`26`	`+{`
	`27`	`+returnfalse;`
	`28`	`+}`
	`29`	`+}`
	`30`	`+`
	`31`	`+returnendpointOptions==null\|\|endpointOptions.AllowPacketFragmentation;`
	`32`	`+}`
`13`	`33`	`}`
`14`	`34`	`}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,18 @@ private void SetAllowPacketFragmentation(ConnectionContext connection, HttpConte`
`24`	`24`	`// When connection is from MapMqtt(),`
`25`	`25`	`// the PacketFragmentationFeature instance is copied from kestrel's ConnectionContext.Features to HttpContext.Features,`
`26`	`26`	`// but no longer from HttpContext.Features to connection.Features.`
`27`		`-varfeature=httpContext==null`
	`27`	`+varpacketFragmentationFeature=httpContext==null`
`28`	`28`	`?connection.Features.Get<PacketFragmentationFeature>()`
`29`	`29`	`:httpContext.Features.Get<PacketFragmentationFeature>();`
`30`	`30`
`31`		`-if(feature==null)`
	`31`	`+if(packetFragmentationFeature==null)`
`32`	`32`	`{`
`33`		`-varvalue=!IsWebSocketConnection;`
	`33`	`+varvalue=PacketFragmentationFeature.IsAllowPacketFragmentation(this,null);`
`34`	`34`	`SetAllowPacketFragmentation(value);`
`35`	`35`	`}`
`36`	`36`	`else`
`37`	`37`	`{`
`38`		`-varvalue=feature.AllowPacketFragmentationSelector(this);`
	`38`	`+varvalue=packetFragmentationFeature.AllowPacketFragmentationSelector(this);`
`39`	`39`	`SetAllowPacketFragmentation(value);`
`40`	`40`	`}`
`41`	`41`	`}`

Lines changed: 1 addition & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`usingMicrosoft.AspNetCore.Server.Kestrel.Core;`
`7`	`7`	`usingMicrosoft.AspNetCore.Server.Kestrel.Https;`
`8`	`8`	`usingMicrosoft.Extensions.DependencyInjection;`
`9`		`-usingMQTTnet.Adapter;`
`10`	`9`	`usingMQTTnet.Exceptions;`
`11`	`10`	`usingMQTTnet.Server;`
`12`	`11`	`usingSystem;`
`@@ -91,19 +90,7 @@ void UseMiddleware(ListenOptions listenOptions)`
`91`	`90`	`tlsConfigure?.Invoke(httpsOptions);`
`92`	`91`	`});`
`93`	`92`	`}`
`94`		`-listenOptions.UseMqtt(protocols,AllowPacketFragmentationSelector);`
`95`		`-}`
`96`		`-`
`97`		`-boolAllowPacketFragmentationSelector(IMqttChannelAdapterchannelAdapter)`
`98`		`-{`
`99`		`-if(channelAdapterisMqttServerChannelAdapterserverChannelAdapter)`
`100`		`-{`
`101`		`-if(serverChannelAdapter.IsWebSocketConnection)`
`102`		`-{`
`103`		`-returnfalse;`
`104`		`-}`
`105`		`-}`
`106`		`-returnendpoint.AllowPacketFragmentation;`
	`93`	`+listenOptions.UseMqtt(protocols, channelAdapter=>PacketFragmentationFeature.IsAllowPacketFragmentation(channelAdapter,endpoint));`
`107`	`94`	`}`
`108`	`95`	`}`
`109`	`96`	`}`

Comments

(0)