esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2025-06-27 05:23:13 +00:00
Code Issues Projects Releases Wiki Activity

Guid to UUID

Browse Source
This commit is contained in:
ahmed
2025-03-03 04:48:53 +03:00
parent 47272f5463
commit 276e7b17fd
14 changed files with 195 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Esiur/Net/IIP/DistributedConnectionProtocol.cs
View File

@ -48,12 +48,12 @@ partial class DistributedConnection
KeyList<uint, WeakReference<DistributedResource>> suspendedResources = new KeyList<uint, WeakReference<DistributedResource>>();
KeyList<uint, DistributedResourceAttachRequestInfo> resourceRequests = new KeyList<uint, DistributedResourceAttachRequestInfo>();
KeyList<Guid, AsyncReply<TypeTemplate>> templateRequests = new KeyList<Guid, AsyncReply<TypeTemplate>>();
KeyList<UUID, AsyncReply<TypeTemplate>> templateRequests = new KeyList<UUID, AsyncReply<TypeTemplate>>();
KeyList<string, AsyncReply<TypeTemplate>> templateByNameRequests = new KeyList<string, AsyncReply<TypeTemplate>>();
Dictionary<Guid, TypeTemplate> templates = new Dictionary<Guid, TypeTemplate>();
Dictionary<UUID, TypeTemplate> templates = new Dictionary<UUID, TypeTemplate>();
KeyList<uint, AsyncReply> requests = new KeyList<uint, AsyncReply>();
@ -143,7 +143,7 @@ partial class DistributedConnection
}
public AsyncReply<object> StaticCall(Guid classId, byte index, Map<byte, object> parameters)
public AsyncReply<object> StaticCall(UUID classId, byte index, Map<byte, object> parameters)
{
var pb = Codec.Compose(parameters, this);// Codec.ComposeVarArray(parameters, this, true);
@ -154,7 +154,7 @@ partial class DistributedConnection
SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketAction.StaticCall))
.AddUInt32(c)
.AddGuid(classId)
.AddUUID(classId)
.AddUInt8(index)
.AddUInt8Array(pb)
.Done();
@ -577,7 +577,7 @@ partial class DistributedConnection
{
// reply ok
SendReply(IIPPacketAction.AttachResource, callback)
.AddGuid(r.Instance.Template.ClassId)
.AddUUID(r.Instance.Template.ClassId)
.AddUInt64(r.Instance.Age)
.AddUInt16((ushort)link.Length)
.AddUInt8Array(link)
@ -589,7 +589,7 @@ partial class DistributedConnection
{
// reply ok
SendReply(IIPPacketAction.AttachResource, callback)
.AddGuid(r.Instance.Template.ClassId)
.AddUUID(r.Instance.Template.ClassId)
.AddUInt64(r.Instance.Age)
.AddUInt16((ushort)link.Length)
.AddUInt8Array(link)
@ -1207,7 +1207,7 @@ partial class DistributedConnection
}
}
void IIPRequestTemplateFromClassId(uint callback, Guid classId)
void IIPRequestTemplateFromClassId(uint callback, UUID classId)
{
var t = Warehouse.GetTemplateByClassId(classId);
@ -1334,7 +1334,7 @@ partial class DistributedConnection
});
}
void IIPRequestStaticCall(uint callback, Guid classId, byte index, TransmissionType transmissionType, byte[] content)
void IIPRequestStaticCall(uint callback, UUID classId, byte index, TransmissionType transmissionType, byte[] content)
{
var template = Warehouse.GetTemplateByClassId(classId);
@ -2097,7 +2097,7 @@ partial class DistributedConnection
/// </summary>
/// <param name="classId">Class GUID.</param>
/// <returns>ResourceTemplate.</returns>
public AsyncReply<TypeTemplate> GetTemplate(Guid classId)
public AsyncReply<TypeTemplate> GetTemplate(UUID classId)
{
if (templates.ContainsKey(classId))
return new AsyncReply<TypeTemplate>(templates[classId]);
@ -2108,7 +2108,7 @@ partial class DistributedConnection
templateRequests.Add(classId, reply);
SendRequest(IIPPacketAction.TemplateFromClassId)
.AddGuid(classId)
.AddUUID(classId)
.Done()
.Then((rt) =>
{
@ -2327,7 +2327,7 @@ partial class DistributedConnection
DistributedResource dr;
TypeTemplate template = null;
Guid classId = (Guid)rt[0];
UUID classId = (UUID)rt[0];
if (resource == null)
{
@ -2370,7 +2370,7 @@ partial class DistributedConnection
if (template == null)
{
GetTemplate((Guid)rt[0]).Then((tmp) =>
GetTemplate((UUID)rt[0]).Then((tmp) =>
{
// ClassId, ResourceAge, ResourceLink, Content
if (resource == null)

8
Esiur/Net/Packets/IIPPacket.cs
View File

@ -119,7 +119,7 @@ class IIPPacket : Packet
public string ResourceLink { get; set; }
public string ResourceName { get; set; }
public Guid ClassId { get; set; }
public UUID ClassId { get; set; }
public byte MethodIndex { get; set; }
public string MethodName { get; set; }
public uint CallbackId { get; set; }
@ -403,7 +403,7 @@ class IIPPacket : Packet
if (NotEnough(offset, ends, 16))
return -dataLengthNeeded;
ClassId = data.GetGuid(offset);
ClassId = data.GetUUID(offset);
offset += 16;
}
@ -592,7 +592,7 @@ class IIPPacket : Packet
if (NotEnough(offset, ends, 18))
return -dataLengthNeeded;
ClassId = data.GetGuid(offset);//, Endian.Little);
ClassId = data.GetUUID(offset);//, Endian.Little);
offset += 16;
MethodIndex = data[offset++];
@ -615,7 +615,7 @@ class IIPPacket : Packet
if (NotEnough(offset, ends, 26))
return -dataLengthNeeded;
ClassId = data.GetGuid(offset);
ClassId = data.GetUUID(offset);
offset += 16;
ResourceAge = data.GetUInt64(offset, Endian.Little);

7
Esiur/Net/Packets/IIPPacketAttachInfo.cs
View File

@ -1,4 +1,5 @@
using System;
using Esiur.Data;
using System;
using System.Collections.Generic;
using System.Text;
@ -9,9 +10,9 @@ struct IIPPacketAttachInfo
public string Link;
public ulong Age;
public byte[] Content;
public Guid ClassId;
public UUID ClassId;
public IIPPacketAttachInfo(Guid classId, ulong age, string link, byte[] content)
public IIPPacketAttachInfo(UUID classId, ulong age, string link, byte[] content)
{
ClassId = classId;
Age = age;