IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 05:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build

Browse source
This commit is contained in:
Li 2022-11-18 19:51:25 +13:00
parent 458748e6b0
commit 7fcaf412df
5 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
HorseIsleServer/HISPd/Properties/AssemblyInfo.cs
View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.45.0")] [assembly: AssemblyVersion("1.8.46.0")]
[assembly: AssemblyFileVersion("1.8.45.0")] [assembly: AssemblyFileVersion("1.8.46.0")]

2
HorseIsleServer/HISPd/Resources/DEBIAN/control
View file

@ -1,5 +1,5 @@
Package: hisp Package: hisp
Version: 1.8.45 Version: 1.8.46
Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
Maintainer: Li Maintainer: Li
Homepage: https://islehorse.com Homepage: https://islehorse.com

4
HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.45.0")] [assembly: AssemblyVersion("1.8.46.0")]
[assembly: AssemblyFileVersion("1.8.45.0")] [assembly: AssemblyFileVersion("1.8.46.0")]

34
HorseIsleServer/LibHISP/Server/Network/Hybrid.cs
View file

@ -5,7 +5,6 @@ namespace HISP.Server.Network
{ {
public class Hybrid : Transport public class Hybrid : Transport
{ {
Transport actualTransport = null; Transport actualTransport = null;
@ -58,29 +57,24 @@ namespace HISP.Server.Network
public override void ProcessReceivedPackets(int available, byte[] buffer) public override void ProcessReceivedPackets(int available, byte[] buffer)
{ {
for (int i = 0; i < available; i++)
base.currentPacket.Add(buffer[i]);
if (currentPacket.Count >= 3) if (ConfigReader.EnableWebSocket && WebSocket.IsStartOfHandshake(buffer))
{ {
if (ConfigReader.EnableWebSocket && WebSocket.IsStartOfHandshake(currentPacket.ToArray())) Logger.InfoPrint(this.Ip + " Switching to WebSocket");
{ actualTransport = new WebSocket();
Logger.InfoPrint(this.Ip + " Switching to WebSocket");
actualTransport = new WebSocket();
actualTransport.passObjects(this.socket, this.onReceiveCallback, this.onDisconnectCallback); actualTransport.passObjects(this.socket, this.onReceiveCallback, this.onDisconnectCallback);
actualTransport.ProcessReceivedPackets(available, buffer); actualTransport.ProcessReceivedPackets(available, buffer);
actualTransport.Accept(base.socket, base.onReceiveCallback, base.onDisconnectCallback); actualTransport.Accept(base.socket, base.onReceiveCallback, base.onDisconnectCallback);
} }
else else
{ {
Logger.InfoPrint(this.Ip + " Switching to XmlSocket"); Logger.InfoPrint(this.Ip + " Switching to XmlSocket");
actualTransport = new XmlSocket(); actualTransport = new XmlSocket();
actualTransport.passObjects(this.socket, this.onReceiveCallback, this.onDisconnectCallback); actualTransport.passObjects(this.socket, this.onReceiveCallback, this.onDisconnectCallback);
actualTransport.ProcessReceivedPackets(available, buffer); actualTransport.ProcessReceivedPackets(available, buffer);
actualTransport.Accept(base.socket, base.onReceiveCallback, base.onDisconnectCallback); actualTransport.Accept(base.socket, base.onReceiveCallback, base.onDisconnectCallback);
}
} }
} }

4
HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs
View file

@ -30,8 +30,8 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.45.0")] [assembly: AssemblyVersion("1.8.46.0")]
[assembly: AssemblyFileVersion("1.8.45.0")] [assembly: AssemblyFileVersion("1.8.46.0")]