Timerix/DTLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fsp change

Browse Source
This commit is contained in:
Timerix22 2024-01-07 14:44:44 +06:00
parent ea03818fe4
commit 5297231205
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DTLib.Network/DTLib.Network.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<!--package info-->
<PackageId>DTLib.Network</PackageId>
<Version>1.4.0</Version>
<Version>1.4.1</Version>
<Authors>Timerix</Authors>
<Description>Some sick network protocols</Description>
<RepositoryType>GIT</RepositoryType>

16
DTLib.Network/FSP.cs
View File

@ -58,15 +58,20 @@ public class FSP
return fileStream.ToArray();
}
private static readonly byte[] fspHeaderStrBytes = "FSP_file_size:".ToBytes();
public void DownloadToStream(System.IO.Stream fileStream)
{
lock (MainSocket)
{
BytesDownloaded = 0;
Filesize = BitConverter.ToInt64(MainSocket.GetPackage(), 0);
var fspHeader = MainSocket.GetPackage();
if (!fspHeader.StartsWith(fspHeaderStrBytes))
throw new Exception(
$"invalid fsp header: '{fspHeader.BytesToString()}' " +
$"({fspHeader.MergeToString(',')})");
Filesize = BitConverter.ToInt64(fspHeader, fspHeaderStrBytes.Length);
if (Filesize < 0)
throw new Exception("FileSize < 0");
MainSocket.SendPackage("ready");
while (BytesDownloaded < Filesize)
{
@ -89,8 +94,11 @@ public class FSP
Filesize = fileStream.Length;
lock (MainSocket)
{
MainSocket.SendPackage(BitConverter.GetBytes(Filesize));
MainSocket.GetAnswer("ready");
byte[] filesizeBytes = BitConverter.GetBytes(Filesize);
byte[] fspHeader = new byte[fspHeaderStrBytes.Length + filesizeBytes.Length];
fspHeaderStrBytes.CopyTo(fspHeader, 0);
filesizeBytes.CopyTo(fspHeader, fspHeaderStrBytes.Length);
MainSocket.SendPackage(fspHeader);
while (BytesUploaded < Filesize)
{