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

some changes

Browse Source
This commit is contained in:
Timerix
2021-10-03 00:13:34 +03:00
parent d352bc69ea
commit ced9f72279
6 changed files with 26 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Network/FSP.cs
View File

@@ -69,7 +69,7 @@ namespace DTLib.Network
Mutex.Execute(() =>
{
BytesDownloaded = 0;
Filesize = mainSocket.GetPackage().ToStr().ToUInt();
Filesize = SimpleConverter.ToString(mainSocket.GetPackage()).ToUInt();
mainSocket.SendPackage("ready".ToBytes());
int packagesCount = 0;
byte[] buffer = new byte[5120];
@@ -144,7 +144,7 @@ namespace DTLib.Network
if (!dirOnClient.EndsWith("\\")) dirOnClient += "\\";
if (!dirOnServer.EndsWith("\\")) dirOnServer += "\\";
Debug("b", "downloading manifest <", "c", dirOnServer + "manifest.dtsod", "b", ">\n");
var manifest = new DtsodV23(DownloadFileToMemory(dirOnServer + "manifest.dtsod").ToStr());
var manifest = new DtsodV23(SimpleConverter.ToString(DownloadFileToMemory(dirOnServer + "manifest.dtsod")));
Debug("g", $"found {manifest.Values.Count} files in manifest\n");
var hasher = new Hasher();
foreach (string fileOnServer in manifest.Keys)

6
Network/Package.cs
View File

@@ -21,7 +21,7 @@ namespace DTLib.Network
if (packageSize == 0 && socket.Available >= 2)
{
socket.Receive(data, data.Length, 0);
packageSize = data.BytesToInt();
packageSize = data.ToInt();
}
if (packageSize != 0 && socket.Available >= packageSize)
{
@@ -40,7 +40,7 @@ namespace DTLib.Network
if (data.Length > 65536) throw new Exception($"SendPackage() error: package is too big ({data.Length} bytes)");
if (data.Length == 0) throw new Exception($"SendPackage() error: package has zero size");
var list = new List<byte>();
byte[] packageSize = data.Length.IntToBytes();
byte[] packageSize = data.Length.ToBytes();
if (packageSize.Length == 1) list.Add(0);
list.AddRange(packageSize);
list.AddRange(data);
@@ -51,7 +51,7 @@ namespace DTLib.Network
// получает пакет и выбрасывает исключение, если пакет не соответствует образцу
public static void GetAnswer(this Socket socket, string answer)
{
var rec = socket.GetPackage().ToStr();
var rec = SimpleConverter.ToString(socket.GetPackage());
if (rec != answer) throw new Exception($"GetAnswer() error: invalid answer: <{rec}>");
}