Remove PacketBufferer
The packet bufferer was obsolete.
This commit is contained in:
Lucas Nicodemus
parent
b15dfbc1ec
commit
a8b4bf1d95
3 changed files with 0 additions and 299 deletions
|
|
@ -1,295 +0,0 @@
|
||||||
/*
|
|
||||||
TShock, a server mod for Terraria
|
|
||||||
Copyright (C) 2011-2016 Nyx Studios (fka. The TShock Team)
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.IO;
|
|
||||||
using System.Net.Sockets;
|
|
||||||
using System.Text;
|
|
||||||
using Terraria;
|
|
||||||
using TerrariaApi.Server;
|
|
||||||
|
|
||||||
namespace TShockAPI
|
|
||||||
{
|
|
||||||
[Obsolete("This class is no longer used")]
|
|
||||||
public class PacketBufferer : IDisposable
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
/// <summary>
|
|
||||||
/// Maximum number of bytes to send per update per socket
|
|
||||||
/// </summary>
|
|
||||||
public int BytesPerUpdate { get; set; }
|
|
||||||
|
|
||||||
private readonly TShock plugin;
|
|
||||||
|
|
||||||
private PacketBuffer[] buffers = new PacketBuffer[Netplay.Clients.Length];
|
|
||||||
|
|
||||||
private int[] Bytes = new int[52];
|
|
||||||
private int[] Packets = new int[52];
|
|
||||||
private int[] Compressed = new int[52];
|
|
||||||
|
|
||||||
#if DEBUG_NET
|
|
||||||
Command dump;
|
|
||||||
Command flush;
|
|
||||||
#endif
|
|
||||||
*/
|
|
||||||
public PacketBufferer(TShock p)
|
|
||||||
{
|
|
||||||
/*plugin = p;
|
|
||||||
BytesPerUpdate = 0xFFFF;
|
|
||||||
for (int i = 0; i < buffers.Length; i++)
|
|
||||||
buffers[i] = new PacketBuffer();
|
|
||||||
|
|
||||||
#if DEBUG_NET
|
|
||||||
dump = new Command("superadmin", Dump, "netdump");
|
|
||||||
flush = new Command("superadmin", Flush, "netflush");
|
|
||||||
Commands.ChatCommands.Add(dump);
|
|
||||||
Commands.ChatCommands.Add(flush);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ServerApi.Hooks.NetSendBytes.Register(plugin, ServerHooks_SendBytes);
|
|
||||||
ServerApi.Hooks.ServerSocketReset.Register(plugin, ServerHooks_SocketReset);
|
|
||||||
ServerApi.Hooks.GamePostUpdate.Register(plugin, GameHooks_Update);*/
|
|
||||||
}
|
|
||||||
|
|
||||||
~PacketBufferer()
|
|
||||||
{
|
|
||||||
/*Dispose(false);*/
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
/*Dispose(true);
|
|
||||||
GC.SuppressFinalize(this);*/
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
/*if (disposing)
|
|
||||||
{
|
|
||||||
#if DEBUG_NET
|
|
||||||
Commands.ChatCommands.Remove(dump);
|
|
||||||
Commands.ChatCommands.Remove(flush);
|
|
||||||
#endif
|
|
||||||
ServerApi.Hooks.NetSendBytes.Deregister(plugin, ServerHooks_SendBytes);
|
|
||||||
ServerApi.Hooks.ServerSocketReset.Deregister(plugin, ServerHooks_SocketReset);
|
|
||||||
ServerApi.Hooks.GamePostUpdate.Deregister(plugin, GameHooks_Update);
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Dump(CommandArgs args)
|
|
||||||
{
|
|
||||||
/*var sb = new StringBuilder();
|
|
||||||
sb.AppendLine("{0,-25}{1,-25}{2,-25}{3}".SFormat("Name:", "Packets", "Bytes", "Compression"));
|
|
||||||
for (int i = 1; i < Bytes.Length; i++)
|
|
||||||
{
|
|
||||||
sb.AppendLine("{0,-25}{1,-25}{2,-25}{3}".SFormat(Enum.GetName(typeof (PacketTypes), i) + ":", Packets[i], Bytes[i],
|
|
||||||
Compressed[i]));
|
|
||||||
}
|
|
||||||
File.WriteAllText(Path.Combine(TShock.SavePath, "dmp.txt"), sb.ToString());*/
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Flush(CommandArgs args)
|
|
||||||
{
|
|
||||||
/*Bytes = new int[52];
|
|
||||||
Packets = new int[52];
|
|
||||||
Compressed = new int[52];*/
|
|
||||||
}
|
|
||||||
|
|
||||||
private void GameHooks_Update(EventArgs args)
|
|
||||||
{
|
|
||||||
/*FlushAll();*/
|
|
||||||
}
|
|
||||||
|
|
||||||
public void FlushAll()
|
|
||||||
{
|
|
||||||
/*for (int i = 0; i < Netplay.Clients.Length; i++)
|
|
||||||
{
|
|
||||||
Flush(Netplay.Clients[i]);
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool Flush(RemoteClient client)
|
|
||||||
{
|
|
||||||
/*try
|
|
||||||
{
|
|
||||||
if (client == null || !client.IsActive)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (!client.Socket.IsConnected())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (buffers[client.Id].Count < 1)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
byte[] buff = buffers[client.Id].GetBytes(BytesPerUpdate);
|
|
||||||
if (buff == null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (SendBytes(client, buff))
|
|
||||||
{
|
|
||||||
buffers[client.Id].Pop(buff.Length);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
TShock.Log.ConsoleError(e.ToString());
|
|
||||||
}*/
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void ServerHooks_SocketReset(SocketResetEventArgs args)
|
|
||||||
{
|
|
||||||
/*buffers[args.Socket.Id] = new PacketBuffer();*/
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool SendBytes(RemoteClient client, byte[] buffer)
|
|
||||||
{
|
|
||||||
/*return SendBytes(client, buffer, 0, buffer.Length);*/
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void BufferBytes(RemoteClient client, byte[] buffer)
|
|
||||||
{
|
|
||||||
/*BufferBytes(client, buffer, 0, buffer.Length);*/
|
|
||||||
}
|
|
||||||
|
|
||||||
public void BufferBytes(RemoteClient client, byte[] buffer, int offset, int count)
|
|
||||||
{
|
|
||||||
/*lock (buffers[client.Id])
|
|
||||||
{
|
|
||||||
#if DEBUG_NET
|
|
||||||
int size = (count - offset);
|
|
||||||
var pt = buffer[offset + 4];
|
|
||||||
|
|
||||||
Packets[pt]++;
|
|
||||||
Bytes[pt] += size;
|
|
||||||
Compressed[pt] += Compress(buffer, offset, count);
|
|
||||||
#endif
|
|
||||||
using (var ms = new MemoryStream(buffer, offset, count))
|
|
||||||
{
|
|
||||||
buffers[client.Id].AddRange(ms.ToArray());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TShock.Config.EnableMaxBytesInBuffer && buffers[client.Id].Count > TShock.Config.MaxBytesInBuffer)
|
|
||||||
{
|
|
||||||
buffers[client.Id].Clear();
|
|
||||||
client.PendingTermination = true;
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool SendBytes(RemoteClient client, byte[] buffer, int offset, int count)
|
|
||||||
{
|
|
||||||
/*try
|
|
||||||
{
|
|
||||||
if (client.Socket != null && client.Socket.IsConnected())
|
|
||||||
{
|
|
||||||
//if (ServerApi.RunningMono && !ServerApi.UseAsyncSocketsInMono)
|
|
||||||
client.Socket.AsyncSend(buffer, offset, count, null);
|
|
||||||
//else
|
|
||||||
//client.networkStream.BeginWrite(buffer, offset, count, socket.ServerWriteCallBack, socket.networkStream);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (ObjectDisposedException e)
|
|
||||||
{
|
|
||||||
TShock.Log.Warn(e.ToString());
|
|
||||||
}
|
|
||||||
catch (SocketException e)
|
|
||||||
{
|
|
||||||
switch ((uint)e.ErrorCode)
|
|
||||||
{
|
|
||||||
case 0x80004005:
|
|
||||||
case 10053:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
TShock.Log.Warn(e.ToString());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
if (e.InnerException is SocketException)
|
|
||||||
{
|
|
||||||
switch (((SocketException)e.InnerException).SocketErrorCode)
|
|
||||||
{
|
|
||||||
case SocketError.Shutdown:
|
|
||||||
case SocketError.ConnectionReset:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
TShock.Log.Warn(e.ToString());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
TShock.Log.Warn(e.ToString());
|
|
||||||
}*/
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ServerHooks_SendBytes(SendBytesEventArgs args)
|
|
||||||
{
|
|
||||||
/*args.Handled = true;
|
|
||||||
BufferBytes(args.Socket, args.Buffer, args.Offset, args.Count);*/
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
#if DEBUG_NET
|
|
||||||
static int Compress(byte[] buffer, int offset, int count)
|
|
||||||
{
|
|
||||||
using (var ms = new MemoryStream())
|
|
||||||
{
|
|
||||||
using (var gzip = new GZipStream(ms, CompressionMode.Compress, true))
|
|
||||||
{
|
|
||||||
gzip.Write(buffer, offset, count);
|
|
||||||
}
|
|
||||||
return (int)ms.Length;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
[Obsolete("This class is no longer used")]
|
|
||||||
public class PacketBuffer : List<byte>
|
|
||||||
{
|
|
||||||
/*public byte[] GetBytes(int max)
|
|
||||||
{
|
|
||||||
lock (this)
|
|
||||||
{
|
|
||||||
if (this.Count < 1)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
var ret = new byte[Math.Min(max, this.Count)];
|
|
||||||
this.CopyTo(0, ret, 0, ret.Length);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Pop(int count)
|
|
||||||
{
|
|
||||||
lock (this)
|
|
||||||
{
|
|
||||||
this.RemoveRange(0, count);
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -107,9 +107,6 @@ namespace TShockAPI
|
||||||
public static IDbConnection DB;
|
public static IDbConnection DB;
|
||||||
/// <summary>OverridePort - Determines if TShock should override the server port.</summary>
|
/// <summary>OverridePort - Determines if TShock should override the server port.</summary>
|
||||||
public static bool OverridePort;
|
public static bool OverridePort;
|
||||||
/// <summary>PacketBuffer - Static reference to the packet bufferer system, which buffers packets to clients for better performance.</summary>
|
|
||||||
[Obsolete("PacketBufferer is no longer used", true)]
|
|
||||||
public static PacketBufferer PacketBuffer;
|
|
||||||
/// <summary>Geo - Static reference to the GeoIP system which determines the location of an IP address.</summary>
|
/// <summary>Geo - Static reference to the GeoIP system which determines the location of an IP address.</summary>
|
||||||
public static GeoIPCountry Geo;
|
public static GeoIPCountry Geo;
|
||||||
/// <summary>RestApi - Static reference to the Rest API authentication manager.</summary>
|
/// <summary>RestApi - Static reference to the Rest API authentication manager.</summary>
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,6 @@
|
||||||
<Compile Include="Net\ProjectileRemoveMsg.cs" />
|
<Compile Include="Net\ProjectileRemoveMsg.cs" />
|
||||||
<Compile Include="Net\SpawnMsg.cs" />
|
<Compile Include="Net\SpawnMsg.cs" />
|
||||||
<Compile Include="Net\WorldInfoMsg.cs" />
|
<Compile Include="Net\WorldInfoMsg.cs" />
|
||||||
<Compile Include="PacketBufferer.cs" />
|
|
||||||
<Compile Include="Permissions.cs" />
|
<Compile Include="Permissions.cs" />
|
||||||
<Compile Include="DB\RememberedPosManager.cs" />
|
<Compile Include="DB\RememberedPosManager.cs" />
|
||||||
<Compile Include="Resources.Designer.cs">
|
<Compile Include="Resources.Designer.cs">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue