charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove vars (#819)

Browse Source
This commit is contained in:
MichalPetryka 2019-04-16 12:38:48 +02:00 committed by vis2k
parent 6eaea267d5
commit 2327498b31
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Mirror/Editor/Weaver/Helpers.cs
View File

@ -97,7 +97,7 @@ public static ReaderParameters ReaderParameters(string assemblyPath, IEnumerable
helper.AddSearchDirectory(Path.GetDirectoryName(mirrorNetDLLPath)); helper.AddSearchDirectory(Path.GetDirectoryName(mirrorNetDLLPath));
if (extraPaths != null) if (extraPaths != null)
{ {
foreach (var path in extraPaths) foreach (string path in extraPaths)
helper.AddSearchDirectory(path); helper.AddSearchDirectory(path);
} }
parameters.AssemblyResolver = assemblyResolver; parameters.AssemblyResolver = assemblyResolver;

2
Assets/Mirror/Editor/Weaver/Resolvers.cs
View File

@ -58,7 +58,7 @@ public static MethodReference ResolveMethodInParents(TypeReference tr, AssemblyD
// System.Byte[] arguments need a version with a string // System.Byte[] arguments need a version with a string
public static MethodReference ResolveMethodWithArg(TypeReference tr, AssemblyDefinition scriptDef, string name, string argTypeFullName) public static MethodReference ResolveMethodWithArg(TypeReference tr, AssemblyDefinition scriptDef, string name, string argTypeFullName)
{ {
foreach (var methodRef in tr.Resolve().Methods) foreach (MethodDefinition methodRef in tr.Resolve().Methods)
{ {
if (methodRef.Name == name) if (methodRef.Name == name)
{ {

4
Assets/Mirror/Runtime/Transport/Websocket/Client.cs
View File

@ -53,7 +53,7 @@ public async void Connect(Uri uri)
cancellation = new CancellationTokenSource(); cancellation = new CancellationTokenSource();
var clientFactory = new WebSocketClientFactory(); WebSocketClientFactory clientFactory = new WebSocketClientFactory();
try try
{ {
@ -84,7 +84,7 @@ public async void Connect(Uri uri)
async Task ReceiveLoop(WebSocket webSocket, CancellationToken token) async Task ReceiveLoop(WebSocket webSocket, CancellationToken token)
{ {
var buffer = new byte[MaxMessageSize]; byte[] buffer = new byte[MaxMessageSize];
while (true) while (true)
{ {

2
Assets/Mirror/Runtime/Transport/Websocket/Ninja.WebSockets/BufferPool.cs
View File

@ -139,7 +139,7 @@ void EnlargeBufferIfRequired(int count)
newSize = (int)Math.Pow(2, Math.Ceiling(Math.Log(requiredSize) / Math.Log(2))); ; newSize = (int)Math.Pow(2, Math.Ceiling(Math.Log(requiredSize) / Math.Log(2))); ;
} }
var newBuffer = new byte[newSize]; byte[] newBuffer = new byte[newSize];
Buffer.BlockCopy(_buffer, 0, newBuffer, 0, position); Buffer.BlockCopy(_buffer, 0, newBuffer, 0, position);
_ms = new MemoryStream(newBuffer, 0, newBuffer.Length, true, true) _ms = new MemoryStream(newBuffer, 0, newBuffer.Length, true, true)
{ {

2
Assets/Mirror/Runtime/Transport/Websocket/Ninja.WebSockets/Internal/WebSocketFrameReader.cs
View File

@ -45,7 +45,7 @@ internal static class WebSocketFrameReader
public static async Task<WebSocketFrame> ReadAsync(Stream fromStream, ArraySegment<byte> intoBuffer, CancellationToken cancellationToken) public static async Task<WebSocketFrame> ReadAsync(Stream fromStream, ArraySegment<byte> intoBuffer, CancellationToken cancellationToken)
{ {
// allocate a small buffer to read small chunks of data from the stream // allocate a small buffer to read small chunks of data from the stream
var smallBuffer = new ArraySegment<byte>(new byte[8]); ArraySegment<byte> smallBuffer = new ArraySegment<byte>(new byte[8]);
await BinaryReaderWriter.ReadExactly(2, fromStream, smallBuffer, cancellationToken); await BinaryReaderWriter.ReadExactly(2, fromStream, smallBuffer, cancellationToken);
byte byte1 = smallBuffer.Array[0]; byte byte1 = smallBuffer.Array[0];

6
Assets/Mirror/Runtime/Transport/Websocket/Ninja.WebSockets/Internal/WebSocketImplementation.cs
View File

@ -96,7 +96,7 @@ internal WebSocketImplementation(Guid guid, Func<MemoryStream> recycledStreamFac
// the ping pong manager starts a task // the ping pong manager starts a task
// but we don't have to keep a reference to it // but we don't have to keep a reference to it
#pragma warning disable 0219 #pragma warning disable 0219
var pingPongManager = new PingPongManager(guid, this, keepAliveInterval, _internalReadCts.Token); PingPongManager pingPongManager = new PingPongManager(guid, this, keepAliveInterval, _internalReadCts.Token);
#pragma warning restore 0219 #pragma warning restore 0219
} }
} }
@ -232,7 +232,7 @@ public override async Task SendAsync(ArraySegment<byte> buffer, WebSocketMessage
DeflateStream deflateStream = new DeflateStream(temp, CompressionMode.Compress); DeflateStream deflateStream = new DeflateStream(temp, CompressionMode.Compress);
deflateStream.Write(buffer.Array, buffer.Offset, buffer.Count); deflateStream.Write(buffer.Array, buffer.Offset, buffer.Count);
deflateStream.Flush(); deflateStream.Flush();
var compressedBuffer = new ArraySegment<byte>(temp.ToArray()); ArraySegment<byte> compressedBuffer = new ArraySegment<byte>(temp.ToArray());
WebSocketFrameWriter.Write(opCode, compressedBuffer, stream, endOfMessage, _isClient); WebSocketFrameWriter.Write(opCode, compressedBuffer, stream, endOfMessage, _isClient);
Events.Log.SendingFrame(_guid, opCode, endOfMessage, compressedBuffer.Count, true); Events.Log.SendingFrame(_guid, opCode, endOfMessage, compressedBuffer.Count, true);
} }
@ -566,7 +566,7 @@ async Task CloseOutputAutoTimeoutAsync(WebSocketCloseStatus closeStatus, string
statusDescription = statusDescription + "\r\n\r\n" + ex.ToString(); statusDescription = statusDescription + "\r\n\r\n" + ex.ToString();
} }
var autoCancel = new CancellationTokenSource(timeSpan); CancellationTokenSource autoCancel = new CancellationTokenSource(timeSpan);
await CloseOutputAsync(closeStatus, statusDescription, autoCancel.Token); await CloseOutputAsync(closeStatus, statusDescription, autoCancel.Token);
} }
catch (OperationCanceledException) catch (OperationCanceledException)

2
Assets/Mirror/Runtime/Transport/Websocket/Ninja.WebSockets/PingPongManager.cs
View File

@ -61,7 +61,7 @@ public class PingPongManager : IPingPongManager
/// if keepAliveInterval is positive</param> /// if keepAliveInterval is positive</param>
public PingPongManager(Guid guid, WebSocket webSocket, TimeSpan keepAliveInterval, CancellationToken cancellationToken) public PingPongManager(Guid guid, WebSocket webSocket, TimeSpan keepAliveInterval, CancellationToken cancellationToken)
{ {
var webSocketImpl = webSocket as WebSocketImplementation; WebSocketImplementation webSocketImpl = webSocket as WebSocketImplementation;
_webSocket = webSocketImpl; _webSocket = webSocketImpl;
if (_webSocket == null) if (_webSocket == null)
throw new InvalidCastException("Cannot cast WebSocket to an instance of WebSocketImplementation. Please use the web socket factories to create a web socket"); throw new InvalidCastException("Cannot cast WebSocket to an instance of WebSocketImplementation. Please use the web socket factories to create a web socket");

2
Assets/Mirror/Runtime/Transport/Websocket/Ninja.WebSockets/WebSocketClientFactory.cs
View File

@ -86,7 +86,7 @@ public WebSocketClientFactory(Func<MemoryStream> bufferFactory)
Guid guid = Guid.NewGuid(); Guid guid = Guid.NewGuid();
string host = uri.Host; string host = uri.Host;
int port = uri.Port; int port = uri.Port;
var tcpClient = new TcpClient(AddressFamily.InterNetworkV6); TcpClient tcpClient = new TcpClient(AddressFamily.InterNetworkV6);
tcpClient.NoDelay = options.NoDelay; tcpClient.NoDelay = options.NoDelay;
tcpClient.Client.DualMode = true; tcpClient.Client.DualMode = true;
string uriScheme = uri.Scheme.ToLower(); string uriScheme = uri.Scheme.ToLower();

4
Assets/Mirror/Runtime/Transport/Websocket/Server.cs
View File

@ -124,14 +124,14 @@ async void ProcessTcpClient(TcpClient tcpClient, CancellationToken token)
Stream stream = tcpClient.GetStream(); Stream stream = tcpClient.GetStream();
if (_secure) if (_secure)
{ {
var sslStream = new SslStream(stream, false, CertVerificationCallback); SslStream sslStream = new SslStream(stream, false, CertVerificationCallback);
sslStream.AuthenticateAsServer(_sslConfig.Certificate, _sslConfig.ClientCertificateRequired, _sslConfig.EnabledSslProtocols, _sslConfig.CheckCertificateRevocation); sslStream.AuthenticateAsServer(_sslConfig.Certificate, _sslConfig.ClientCertificateRequired, _sslConfig.EnabledSslProtocols, _sslConfig.CheckCertificateRevocation);
stream = sslStream; stream = sslStream;
} }
WebSocketHttpContext context = await webSocketServerFactory.ReadHttpHeaderFromStreamAsync(stream, token); WebSocketHttpContext context = await webSocketServerFactory.ReadHttpHeaderFromStreamAsync(stream, token);
if (context.IsWebSocketRequest) if (context.IsWebSocketRequest)
{ {
var options = new WebSocketServerOptions() { KeepAliveInterval = TimeSpan.FromSeconds(30), SubProtocol = "binary" }; WebSocketServerOptions options = new WebSocketServerOptions() { KeepAliveInterval = TimeSpan.FromSeconds(30), SubProtocol = "binary" };
WebSocket webSocket = await webSocketServerFactory.AcceptWebSocketAsync(context, options); WebSocket webSocket = await webSocketServerFactory.AcceptWebSocketAsync(context, options);