themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed compilation errors with PacketBuffer.

Browse source 
Updated submodule
This commit is contained in:
White 2015-07-04 22:17:36 +09:30
parent 952c7ef333
commit d15b0fd59c
4 changed files with 47 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

55
TShockAPI/PacketBufferer.cs
View file

@ -36,7 +36,7 @@ namespace TShockAPI
private readonly TShock plugin;
private PacketBuffer[] buffers = new PacketBuffer[Netplay.serverSock.Length];
private PacketBuffer[] buffers = new PacketBuffer[Netplay.Clients.Length];
private int[] Bytes = new int[52];
private int[] Packets = new int[52];
@ -117,29 +117,32 @@ namespace TShockAPI
public void FlushAll()
{
for (int i = 0; i < Netplay.serverSock.Length; i++)
for (int i = 0; i < Netplay.Clients.Length; i++)
{
Flush(Netplay.serverSock[i]);
Flush(Netplay.Clients[i]);
}
}
public bool Flush(ServerSock socket)
public bool Flush(RemoteClient client)
{
try
{
if (socket == null || !socket.active)
if (client == null || !client.IsActive)
return false;
if (buffers[socket.whoAmI].Count < 1)
if (!client.Socket.IsConnected())
return false;
if (buffers[client.Id].Count < 1)
return false;
byte[] buff = buffers[socket.whoAmI].GetBytes(BytesPerUpdate);
byte[] buff = buffers[client.Id].GetBytes(BytesPerUpdate);
if (buff == null)
return false;
if (SendBytes(socket, buff))
if (SendBytes(client, buff))
{
buffers[socket.whoAmI].Pop(buff.Length);
buffers[client.Id].Pop(buff.Length);
return true;
}
}
@ -153,22 +156,22 @@ namespace TShockAPI
private void ServerHooks_SocketReset(SocketResetEventArgs args)
{
buffers[args.Socket.whoAmI] = new PacketBuffer();
buffers[args.Socket.Id] = new PacketBuffer();
}
public bool SendBytes(ServerSock socket, byte[] buffer)
public bool SendBytes(RemoteClient client, byte[] buffer)
{
return SendBytes(socket, buffer, 0, buffer.Length);
return SendBytes(client, buffer, 0, buffer.Length);
}
public void BufferBytes(ServerSock socket, byte[] buffer)
public void BufferBytes(RemoteClient client, byte[] buffer)
{
BufferBytes(socket, buffer, 0, buffer.Length);
BufferBytes(client, buffer, 0, buffer.Length);
}
public void BufferBytes(ServerSock socket, byte[] buffer, int offset, int count)
public void BufferBytes(RemoteClient client, byte[] buffer, int offset, int count)
{
lock (buffers[socket.whoAmI])
lock (buffers[client.Id])
{
#if DEBUG_NET
int size = (count - offset);
@ -180,27 +183,27 @@ namespace TShockAPI
#endif
using (var ms = new MemoryStream(buffer, offset, count))
{
buffers[socket.whoAmI].AddRange(ms.ToArray());
buffers[client.Id].AddRange(ms.ToArray());
}
if (TShock.Config.EnableMaxBytesInBuffer && buffers[socket.whoAmI].Count > TShock.Config.MaxBytesInBuffer)
if (TShock.Config.EnableMaxBytesInBuffer && buffers[client.Id].Count > TShock.Config.MaxBytesInBuffer)
{
buffers[socket.whoAmI].Clear();
socket.kill = true;
buffers[client.Id].Clear();
client.PendingTermination = true;
}
}
}
public bool SendBytes(ServerSock socket, byte[] buffer, int offset, int count)
public bool SendBytes(RemoteClient client, byte[] buffer, int offset, int count)
{
try
{
if (socket.tcpClient.Client != null && socket.tcpClient.Client.Poll(0, SelectMode.SelectWrite))
if (client.Socket != null && client.Socket.IsConnected())
{
if (ServerApi.RunningMono && !ServerApi.UseAsyncSocketsInMono)
socket.networkStream.Write(buffer, offset, count);
else
socket.networkStream.BeginWrite(buffer, offset, count, socket.ServerWriteCallBack, socket.networkStream);
//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;
}
}

8
TShockAPI/TShockAPI.csproj
View file

@ -177,9 +177,9 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TerrariaServerAPI\TerrariaAPI-Server.csproj">
<Project>{549A7941-D9C9-4544-BAC8-D9EEEAB4D777}</Project>
<Name>TerrariaAPI-Server</Name>
<ProjectReference Include="..\TerrariaServerAPI\TerrariaServer.csproj">
<Project>{6877506e-adc6-4142-98a6-79e4fa02855a}</Project>
<Name>TerrariaServer</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@ -193,7 +193,7 @@
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
<UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.