diff --git a/Esiur/Net/HTTP/IIPoHTTP.cs b/Esiur/Net/HTTP/IIPoHTTP.cs index 6b3a64f..26484ec 100644 --- a/Esiur/Net/HTTP/IIPoHTTP.cs +++ b/Esiur/Net/HTTP/IIPoHTTP.cs @@ -17,9 +17,9 @@ public class IIPoHTTP : HTTPFilter if (sender.Request.URL != "iip") return new AsyncReply(false); - IIPPacketAction action = (IIPPacketAction)Convert.ToByte(sender.Request.Query["a"]); + IIPPacketRequest action = (IIPPacketRequest)Convert.ToByte(sender.Request.Query["a"]); - if (action == IIPPacketAction.QueryLink) + if (action == IIPPacketRequest.QueryLink) { EntryPoint.Query(sender.Request.Query["l"], null).Then(x => { diff --git a/Esiur/Net/IIP/DistributedConnection.cs b/Esiur/Net/IIP/DistributedConnection.cs index 6eaa0e0..ea1e184 100644 --- a/Esiur/Net/IIP/DistributedConnection.cs +++ b/Esiur/Net/IIP/DistributedConnection.cs @@ -372,7 +372,7 @@ public partial class DistributedConnection : NetworkConnection, IStore lastKeepAliveSent = now; - SendRequest(IIPPacketAction.KeepAlive) + SendRequest(IIPPacketRequest.KeepAlive) .AddDateTime(now) .AddUInt32(interval) .Done() @@ -463,63 +463,63 @@ public partial class DistributedConnection : NetworkConnection, IStore switch (packet.Action) { // Manage - case IIPPacketAction.AttachResource: + case IIPPacketRequest.AttachResource: IIPRequestAttachResource(packet.CallbackId, packet.ResourceId); break; - case IIPPacketAction.ReattachResource: + case IIPPacketRequest.ReattachResource: IIPRequestReattachResource(packet.CallbackId, packet.ResourceId, packet.ResourceAge); break; - case IIPPacketAction.DetachResource: + case IIPPacketRequest.DetachResource: IIPRequestDetachResource(packet.CallbackId, packet.ResourceId); break; - case IIPPacketAction.CreateResource: + case IIPPacketRequest.CreateResource: //@TODO : fix this //IIPRequestCreateResource(packet.CallbackId, packet.StoreId, packet.ResourceId, packet.Content); break; - case IIPPacketAction.DeleteResource: + case IIPPacketRequest.DeleteResource: IIPRequestDeleteResource(packet.CallbackId, packet.ResourceId); break; - case IIPPacketAction.AddChild: + case IIPPacketRequest.AddChild: IIPRequestAddChild(packet.CallbackId, packet.ResourceId, packet.ChildId); break; - case IIPPacketAction.RemoveChild: + case IIPPacketRequest.RemoveChild: IIPRequestRemoveChild(packet.CallbackId, packet.ResourceId, packet.ChildId); break; - case IIPPacketAction.RenameResource: + case IIPPacketRequest.RenameResource: IIPRequestRenameResource(packet.CallbackId, packet.ResourceId, packet.ResourceName); break; // Inquire - case IIPPacketAction.TemplateFromClassName: + case IIPPacketRequest.TemplateFromClassName: IIPRequestTemplateFromClassName(packet.CallbackId, packet.ClassName); break; - case IIPPacketAction.TemplateFromClassId: + case IIPPacketRequest.TemplateFromClassId: IIPRequestTemplateFromClassId(packet.CallbackId, packet.ClassId); break; - case IIPPacketAction.TemplateFromResourceId: + case IIPPacketRequest.TemplateFromResourceId: IIPRequestTemplateFromResourceId(packet.CallbackId, packet.ResourceId); break; - case IIPPacketAction.QueryLink: + case IIPPacketRequest.QueryLink: IIPRequestQueryResources(packet.CallbackId, packet.ResourceLink); break; - case IIPPacketAction.ResourceChildren: + case IIPPacketRequest.ResourceChildren: IIPRequestResourceChildren(packet.CallbackId, packet.ResourceId); break; - case IIPPacketAction.ResourceParents: + case IIPPacketRequest.ResourceParents: IIPRequestResourceParents(packet.CallbackId, packet.ResourceId); break; - case IIPPacketAction.ResourceHistory: + case IIPPacketRequest.ResourceHistory: IIPRequestInquireResourceHistory(packet.CallbackId, packet.ResourceId, packet.FromDate, packet.ToDate); break; - case IIPPacketAction.LinkTemplates: + case IIPPacketRequest.LinkTemplates: IIPRequestLinkTemplates(packet.CallbackId, packet.ResourceLink); break; // Invoke - case IIPPacketAction.InvokeFunction: + case IIPPacketRequest.InvokeFunction: IIPRequestInvokeFunction(packet.CallbackId, packet.ResourceId, packet.MethodIndex, (TransmissionType)packet.DataType, msg); break; @@ -534,53 +534,53 @@ public partial class DistributedConnection : NetworkConnection, IStore // IIPRequestGetPropertyIfModifiedSince(packet.CallbackId, packet.ResourceId, packet.MethodIndex, packet.ResourceAge); // break; - case IIPPacketAction.Listen: + case IIPPacketRequest.Listen: IIPRequestListen(packet.CallbackId, packet.ResourceId, packet.MethodIndex); break; - case IIPPacketAction.Unlisten: + case IIPPacketRequest.Unlisten: IIPRequestUnlisten(packet.CallbackId, packet.ResourceId, packet.MethodIndex); break; - case IIPPacketAction.SetProperty: + case IIPPacketRequest.SetProperty: IIPRequestSetProperty(packet.CallbackId, packet.ResourceId, packet.MethodIndex, (TransmissionType)packet.DataType, msg); break; // Attribute - case IIPPacketAction.GetAllAttributes: + case IIPPacketRequest.GetAllAttributes: // @TODO : fix this //IIPRequestGetAttributes(packet.CallbackId, packet.ResourceId, packet.Content, true); break; - case IIPPacketAction.UpdateAllAttributes: + case IIPPacketRequest.UpdateAllAttributes: // @TODO : fix this //IIPRequestUpdateAttributes(packet.CallbackId, packet.ResourceId, packet.Content, true); break; - case IIPPacketAction.ClearAllAttributes: + case IIPPacketRequest.ClearAllAttributes: // @TODO : fix this //IIPRequestClearAttributes(packet.CallbackId, packet.ResourceId, packet.Content, true); break; - case IIPPacketAction.GetAttributes: + case IIPPacketRequest.GetAttributes: // @TODO : fix this //IIPRequestGetAttributes(packet.CallbackId, packet.ResourceId, packet.Content, false); break; - case IIPPacketAction.UpdateAttributes: + case IIPPacketRequest.UpdateAttributes: // @TODO : fix this //IIPRequestUpdateAttributes(packet.CallbackId, packet.ResourceId, packet.Content, false); break; - case IIPPacketAction.ClearAttributes: + case IIPPacketRequest.ClearAttributes: // @TODO : fix this //IIPRequestClearAttributes(packet.CallbackId, packet.ResourceId, packet.Content, false); break; - case IIPPacketAction.KeepAlive: + case IIPPacketRequest.KeepAlive: IIPRequestKeepAlive(packet.CallbackId, packet.CurrentTime, packet.Interval); break; - case IIPPacketAction.ProcedureCall: + case IIPPacketRequest.ProcedureCall: IIPRequestProcedureCall(packet.CallbackId, packet.Procedure, (TransmissionType)packet.DataType, msg); break; - case IIPPacketAction.StaticCall: + case IIPPacketRequest.StaticCall: IIPRequestStaticCall(packet.CallbackId, packet.ClassId, packet.MethodIndex, (TransmissionType)packet.DataType, msg); break; @@ -591,51 +591,51 @@ public partial class DistributedConnection : NetworkConnection, IStore switch (packet.Action) { // Manage - case IIPPacketAction.AttachResource: + case IIPPacketRequest.AttachResource: IIPReply(packet.CallbackId, packet.ClassId, packet.ResourceAge, packet.ResourceLink, packet.DataType, msg); break; - case IIPPacketAction.ReattachResource: + case IIPPacketRequest.ReattachResource: IIPReply(packet.CallbackId, packet.ResourceAge, packet.DataType, msg); break; - case IIPPacketAction.DetachResource: + case IIPPacketRequest.DetachResource: IIPReply(packet.CallbackId); break; - case IIPPacketAction.CreateResource: + case IIPPacketRequest.CreateResource: IIPReply(packet.CallbackId, packet.ResourceId); break; - case IIPPacketAction.DeleteResource: - case IIPPacketAction.AddChild: - case IIPPacketAction.RemoveChild: - case IIPPacketAction.RenameResource: + case IIPPacketRequest.DeleteResource: + case IIPPacketRequest.AddChild: + case IIPPacketRequest.RemoveChild: + case IIPPacketRequest.RenameResource: IIPReply(packet.CallbackId); break; // Inquire - case IIPPacketAction.TemplateFromClassName: - case IIPPacketAction.TemplateFromClassId: - case IIPPacketAction.TemplateFromResourceId: + case IIPPacketRequest.TemplateFromClassName: + case IIPPacketRequest.TemplateFromClassId: + case IIPPacketRequest.TemplateFromResourceId: var content = msg.Clip(packet.DataType.Value.Offset, (uint)packet.DataType.Value.ContentLength); IIPReply(packet.CallbackId, TypeTemplate.Parse(content)); break; - case IIPPacketAction.QueryLink: - case IIPPacketAction.ResourceChildren: - case IIPPacketAction.ResourceParents: - case IIPPacketAction.ResourceHistory: - case IIPPacketAction.LinkTemplates: + case IIPPacketRequest.QueryLink: + case IIPPacketRequest.ResourceChildren: + case IIPPacketRequest.ResourceParents: + case IIPPacketRequest.ResourceHistory: + case IIPPacketRequest.LinkTemplates: IIPReply(packet.CallbackId, (TransmissionType)packet.DataType, msg);// packet.Content); break; // Invoke - case IIPPacketAction.InvokeFunction: - case IIPPacketAction.StaticCall: - case IIPPacketAction.ProcedureCall: + case IIPPacketRequest.InvokeFunction: + case IIPPacketRequest.StaticCall: + case IIPPacketRequest.ProcedureCall: IIPReplyInvoke(packet.CallbackId, (TransmissionType)packet.DataType, msg);// packet.Content); break; @@ -647,26 +647,26 @@ public partial class DistributedConnection : NetworkConnection, IStore // IIPReply(packet.CallbackId, packet.Content); // break; - case IIPPacketAction.Listen: - case IIPPacketAction.Unlisten: - case IIPPacketAction.SetProperty: + case IIPPacketRequest.Listen: + case IIPPacketRequest.Unlisten: + case IIPPacketRequest.SetProperty: IIPReply(packet.CallbackId); break; // Attribute - case IIPPacketAction.GetAllAttributes: - case IIPPacketAction.GetAttributes: + case IIPPacketRequest.GetAllAttributes: + case IIPPacketRequest.GetAttributes: IIPReply(packet.CallbackId, (TransmissionType)packet.DataType, msg);// packet.Content); break; - case IIPPacketAction.UpdateAllAttributes: - case IIPPacketAction.UpdateAttributes: - case IIPPacketAction.ClearAllAttributes: - case IIPPacketAction.ClearAttributes: + case IIPPacketRequest.UpdateAllAttributes: + case IIPPacketRequest.UpdateAttributes: + case IIPPacketRequest.ClearAllAttributes: + case IIPPacketRequest.ClearAttributes: IIPReply(packet.CallbackId); break; - case IIPPacketAction.KeepAlive: + case IIPPacketRequest.KeepAlive: IIPReply(packet.CallbackId, packet.CurrentTime, packet.Jitter); break; } @@ -1653,7 +1653,7 @@ public partial class DistributedConnection : NetworkConnection, IStore try { - var ar = await SendRequest(IIPPacketAction.QueryLink) + var ar = await SendRequest(IIPPacketRequest.QueryLink) .AddUInt16((ushort)link.Length) .AddUInt8Array(link) .Done(); diff --git a/Esiur/Net/IIP/DistributedConnectionProtocol.cs b/Esiur/Net/IIP/DistributedConnectionProtocol.cs index 7a2420d..d622564 100644 --- a/Esiur/Net/IIP/DistributedConnectionProtocol.cs +++ b/Esiur/Net/IIP/DistributedConnectionProtocol.cs @@ -76,7 +76,7 @@ partial class DistributedConnection /// Packet action. /// Arguments to send. /// - SendList SendRequest(IIPPacketAction action) + SendList SendRequest(IIPPacketRequest action) { var reply = new AsyncReply(); var c = callbackCounter++; // avoid thread racing @@ -102,7 +102,7 @@ partial class DistributedConnection //uint maxcallerid = 0; - internal SendList SendReply(IIPPacketAction action, uint callbackId) + internal SendList SendReply(IIPPacketRequest action, uint callbackId) { return (SendList)SendParams().AddUInt8((byte)(0x80 | (byte)action)).AddUInt32(callbackId); } @@ -118,7 +118,7 @@ partial class DistributedConnection var c = callbackCounter++; requests.Add(c, reply); - SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketAction.Listen)) + SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketRequest.Listen)) .AddUInt32(c) .AddUInt32(instanceId) .AddUInt8(index) @@ -133,7 +133,7 @@ partial class DistributedConnection var c = callbackCounter++; requests.Add(c, reply); - SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketAction.Unlisten)) + SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketRequest.Unlisten)) .AddUInt32(c) .AddUInt32(instanceId) .AddUInt8(index) @@ -152,7 +152,7 @@ partial class DistributedConnection requests.Add(c, reply); - SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketAction.StaticCall)) + SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketRequest.StaticCall)) .AddUInt32(c) .AddUUID(classId) .AddUInt8(index) @@ -180,7 +180,7 @@ partial class DistributedConnection var callName = DC.ToBytes(procedureCall); - SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketAction.ProcedureCall)) + SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketRequest.ProcedureCall)) .AddUInt32(c) .AddUInt16((ushort)callName.Length) .AddUInt8Array(callName) @@ -198,7 +198,7 @@ partial class DistributedConnection var c = callbackCounter++; requests.Add(c, reply); - SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketAction.InvokeFunction)) + SendParams().AddUInt8((byte)(0x40 | (byte)IIPPacketRequest.InvokeFunction)) .AddUInt32(c) .AddUInt32(instanceId) .AddUInt8(index) @@ -211,7 +211,7 @@ partial class DistributedConnection { var cv = Codec.Compose(value, this); - return SendRequest(IIPPacketAction.SetProperty) + return SendRequest(IIPPacketRequest.SetProperty) .AddUInt32(instanceId) .AddUInt8(index) .AddUInt8Array(cv) @@ -237,7 +237,7 @@ partial class DistributedConnection } if (sendDetach) - return SendRequest(IIPPacketAction.DetachResource) + return SendRequest(IIPPacketRequest.DetachResource) .AddUInt32(instanceId) .Done(); @@ -576,7 +576,7 @@ partial class DistributedConnection if (r is DistributedResource) { // reply ok - SendReply(IIPPacketAction.AttachResource, callback) + SendReply(IIPPacketRequest.AttachResource, callback) .AddUUID(r.Instance.Template.ClassId) .AddUInt64(r.Instance.Age) .AddUInt16((ushort)link.Length) @@ -588,7 +588,7 @@ partial class DistributedConnection else { // reply ok - SendReply(IIPPacketAction.AttachResource, callback) + SendReply(IIPPacketRequest.AttachResource, callback) .AddUUID(r.Instance.Template.ClassId) .AddUInt64(r.Instance.Age) .AddUInt16((ushort)link.Length) @@ -713,7 +713,7 @@ partial class DistributedConnection //r.Instance.Attributes.OnModified += Attributes_OnModified; // reply ok - SendReply(IIPPacketAction.ReattachResource, callback) + SendReply(IIPPacketRequest.ReattachResource, callback) .AddUInt64(r.Instance.Age) .AddUInt8Array(Codec.Compose(r.Instance.Serialize(), this)) .Done(); @@ -742,7 +742,7 @@ partial class DistributedConnection //attachedResources.Remove(res); // reply ok - SendReply(IIPPacketAction.DetachResource, callback).Done(); + SendReply(IIPPacketRequest.DetachResource, callback).Done(); } else { @@ -869,7 +869,7 @@ partial class DistributedConnection Warehouse.Put(name, resource, store as IStore, parent).Then(ok => { - SendReply(IIPPacketAction.CreateResource, callback) + SendReply(IIPPacketRequest.CreateResource, callback) .AddUInt32(resource.Instance.Id) .Done(); @@ -902,7 +902,7 @@ partial class DistributedConnection } if (Warehouse.Remove(r)) - SendReply(IIPPacketAction.DeleteResource, callback).Done(); + SendReply(IIPPacketRequest.DeleteResource, callback).Done(); //SendParams((byte)0x84, callback); else SendError(ErrorType.Management, callback, (ushort)ExceptionCode.DeleteFailed); @@ -934,7 +934,7 @@ partial class DistributedConnection var st = r.Instance.GetAttributes(attrs); if (st != null) - SendReply(all ? IIPPacketAction.GetAllAttributes : IIPPacketAction.GetAttributes, callback) + SendReply(all ? IIPPacketRequest.GetAllAttributes : IIPPacketRequest.GetAttributes, callback) .AddUInt8Array(Codec.Compose(st, this)) .Done(); else @@ -975,7 +975,7 @@ partial class DistributedConnection parent.Instance.Store.AddChild(parent, child); - SendReply(IIPPacketAction.AddChild, callback).Done(); + SendReply(IIPPacketRequest.AddChild, callback).Done(); //child.Instance.Parents }); @@ -1014,7 +1014,7 @@ partial class DistributedConnection parent.Instance.Store.RemoveChild(parent, child);// Children.Remove(child); - SendReply(IIPPacketAction.RemoveChild, callback).Done(); + SendReply(IIPPacketRequest.RemoveChild, callback).Done(); //child.Instance.Parents }); @@ -1039,7 +1039,7 @@ partial class DistributedConnection resource.Instance.Name = name; - SendReply(IIPPacketAction.RenameResource, callback).Done(); + SendReply(IIPPacketRequest.RenameResource, callback).Done(); }); } @@ -1055,7 +1055,7 @@ partial class DistributedConnection resource.Instance.Children().Then(children => { - SendReply(IIPPacketAction.ResourceChildren, callback) + SendReply(IIPPacketRequest.ResourceChildren, callback) .AddUInt8Array(Codec.Compose(children, this))// Codec.ComposeResourceArray(children, this, true)) .Done(); @@ -1077,7 +1077,7 @@ partial class DistributedConnection resource.Instance.Parents().Then(parents => { - SendReply(IIPPacketAction.ResourceParents, callback) + SendReply(IIPPacketRequest.ResourceParents, callback) .AddUInt8Array(Codec.Compose(parents, this)) //.AddUInt8Array(Codec.ComposeResourceArray(parents, this, true)) .Done(); @@ -1109,7 +1109,7 @@ partial class DistributedConnection attrs = attributes.GetStringArray(0, (uint)attributes.Length); if (r.Instance.RemoveAttributes(attrs)) - SendReply(all ? IIPPacketAction.ClearAllAttributes : IIPPacketAction.ClearAttributes, callback).Done(); + SendReply(all ? IIPPacketRequest.ClearAllAttributes : IIPPacketRequest.ClearAttributes, callback).Done(); else SendError(ErrorType.Management, callback, (ushort)ExceptionCode.UpdateAttributeFailed); @@ -1136,7 +1136,7 @@ partial class DistributedConnection DataDeserializer.TypedMapParser(attributes, 0, (uint)attributes.Length, this, null).Then(attrs => { if (r.Instance.SetAttributes((Map)attrs, clearAttributes)) - SendReply(clearAttributes ? IIPPacketAction.ClearAllAttributes : IIPPacketAction.ClearAttributes, + SendReply(clearAttributes ? IIPPacketRequest.ClearAllAttributes : IIPPacketRequest.ClearAttributes, callback).Done(); else SendError(ErrorType.Management, callback, (ushort)ExceptionCode.UpdateAttributeFailed); @@ -1175,7 +1175,7 @@ partial class DistributedConnection } // digggg - SendReply(IIPPacketAction.LinkTemplates, callback) + SendReply(IIPPacketRequest.LinkTemplates, callback) //.AddInt32(msg.Length) //.AddUInt8Array(msg.ToArray()) .AddUInt8Array(TransmissionType.Compose(TransmissionTypeIdentifier.RawData, msg.ToArray())) @@ -1195,7 +1195,7 @@ partial class DistributedConnection var t = Warehouse.GetTemplateByClassName(className); if (t != null) - SendReply(IIPPacketAction.TemplateFromClassName, callback) + SendReply(IIPPacketRequest.TemplateFromClassName, callback) .AddUInt8Array(TransmissionType.Compose(TransmissionTypeIdentifier.RawData, t.Content)) //.AddInt32(t.Content.Length) //.AddUInt8Array(t.Content) @@ -1212,7 +1212,7 @@ partial class DistributedConnection var t = Warehouse.GetTemplateByClassId(classId); if (t != null) - SendReply(IIPPacketAction.TemplateFromClassId, callback) + SendReply(IIPPacketRequest.TemplateFromClassId, callback) .AddUInt8Array(TransmissionType.Compose(TransmissionTypeIdentifier.RawData, t.Content)) //.AddInt32(t.Content.Length) //.AddUInt8Array(t.Content) @@ -1231,7 +1231,7 @@ partial class DistributedConnection Warehouse.GetById(resourceId).Then((r) => { if (r != null) - SendReply(IIPPacketAction.TemplateFromResourceId, callback) + SendReply(IIPPacketRequest.TemplateFromResourceId, callback) .AddInt32(r.Instance.Template.Content.Length) .AddUInt8Array(r.Instance.Template.Content) .Done(); @@ -1260,7 +1260,7 @@ partial class DistributedConnection if (list.Length == 0) SendError(ErrorType.Management, callback, (ushort)ExceptionCode.ResourceNotFound); else - SendReply(IIPPacketAction.QueryLink, callback) + SendReply(IIPPacketRequest.QueryLink, callback) .AddUInt8Array(Codec.Compose(list, this)) //.AddUInt8Array(Codec.ComposeResourceArray(list, this, true)) .Done(); @@ -1326,7 +1326,7 @@ partial class DistributedConnection // return; //} - InvokeFunction(call.Value.Template, callback, arguments, IIPPacketAction.ProcedureCall, call.Value.Delegate.Target); + InvokeFunction(call.Value.Template, callback, arguments, IIPPacketRequest.ProcedureCall, call.Value.Delegate.Target); }).Error(x => { @@ -1379,7 +1379,7 @@ partial class DistributedConnection // return; //} - InvokeFunction(ft, callback, arguments, IIPPacketAction.StaticCall, null); + InvokeFunction(ft, callback, arguments, IIPPacketRequest.StaticCall, null); }).Error(x => { @@ -1425,7 +1425,7 @@ partial class DistributedConnection { rt.Then(res => { - SendReply(IIPPacketAction.InvokeFunction, callback) + SendReply(IIPPacketRequest.InvokeFunction, callback) .AddUInt8Array(Codec.Compose(res, this)) .Done(); }); @@ -1456,7 +1456,7 @@ partial class DistributedConnection return; } - InvokeFunction(ft, callback, arguments, IIPPacketAction.InvokeFunction, r); + InvokeFunction(ft, callback, arguments, IIPPacketRequest.InvokeFunction, r); } }); }); @@ -1464,7 +1464,7 @@ partial class DistributedConnection - void InvokeFunction(FunctionTemplate ft, uint callback, Map arguments, IIPPacketAction actionType, object target = null) + void InvokeFunction(FunctionTemplate ft, uint callback, Map arguments, IIPPacketRequest actionType, object target = null) { // cast arguments @@ -1629,7 +1629,7 @@ partial class DistributedConnection { (r as DistributedResource).Listen(et).Then(x => { - SendReply(IIPPacketAction.Listen, callback).Done(); + SendReply(IIPPacketRequest.Listen, callback).Done(); }).Error(x => SendError(ErrorType.Exception, callback, (ushort)ExceptionCode.GeneralFailure)); } else @@ -1650,7 +1650,7 @@ partial class DistributedConnection subscriptions[r].Add(index); - SendReply(IIPPacketAction.Listen, callback).Done(); + SendReply(IIPPacketRequest.Listen, callback).Done(); } } } @@ -1683,7 +1683,7 @@ partial class DistributedConnection { (r as DistributedResource).Unlisten(et).Then(x => { - SendReply(IIPPacketAction.Unlisten, callback).Done(); + SendReply(IIPPacketRequest.Unlisten, callback).Done(); }).Error(x => SendError(ErrorType.Exception, callback, (ushort)ExceptionCode.GeneralFailure)); } else @@ -1704,7 +1704,7 @@ partial class DistributedConnection subscriptions[r].Remove(index); - SendReply(IIPPacketAction.Unlisten, callback).Done(); + SendReply(IIPPacketRequest.Unlisten, callback).Done(); } } } @@ -1797,7 +1797,7 @@ partial class DistributedConnection }*/ - SendReply(IIPPacketAction.ResourceHistory, callback) + SendReply(IIPPacketRequest.ResourceHistory, callback) .AddUInt8Array(history) .Done(); @@ -1874,7 +1874,7 @@ partial class DistributedConnection // propagation (r as DistributedResource)._Set(index, value).Then((x) => { - SendReply(IIPPacketAction.SetProperty, callback).Done(); + SendReply(IIPPacketRequest.SetProperty, callback).Done(); }).Error(x => { SendError(x.Type, callback, (ushort)x.Code, x.Message); @@ -1925,7 +1925,7 @@ partial class DistributedConnection { pi.SetValue(r, value); - SendReply(IIPPacketAction.SetProperty, callback).Done(); + SendReply(IIPPacketRequest.SetProperty, callback).Done(); } catch (Exception ex) { @@ -2107,7 +2107,7 @@ partial class DistributedConnection var reply = new AsyncReply(); templateRequests.Add(classId, reply); - SendRequest(IIPPacketAction.TemplateFromClassId) + SendRequest(IIPPacketRequest.TemplateFromClassId) .AddUUID(classId) .Done() .Then((rt) => @@ -2139,7 +2139,7 @@ partial class DistributedConnection var classNameBytes = DC.ToBytes(className); - SendRequest(IIPPacketAction.TemplateFromClassName) + SendRequest(IIPPacketRequest.TemplateFromClassName) .AddUInt8((byte)classNameBytes.Length) .AddUInt8Array(classNameBytes) .Done() @@ -2233,7 +2233,7 @@ partial class DistributedConnection var l = DC.ToBytes(link); - SendRequest(IIPPacketAction.LinkTemplates) + SendRequest(IIPPacketRequest.LinkTemplates) .AddUInt16((ushort)l.Length) .AddUInt8Array(l) .Done() @@ -2312,7 +2312,7 @@ partial class DistributedConnection var reply = new AsyncReply(); resourceRequests.Add(id, new DistributedResourceAttachRequestInfo(reply, newSequence)); - SendRequest(IIPPacketAction.AttachResource) + SendRequest(IIPPacketRequest.AttachResource) .AddUInt32(id) .Done() .Then((rt) => @@ -2415,7 +2415,7 @@ partial class DistributedConnection { var rt = new AsyncReply(); - SendRequest(IIPPacketAction.ResourceChildren) + SendRequest(IIPPacketRequest.ResourceChildren) .AddUInt32(resource.Instance.Id) .Done() .Then(ar => @@ -2441,7 +2441,7 @@ partial class DistributedConnection { var rt = new AsyncReply(); - SendRequest(IIPPacketAction.ResourceParents) + SendRequest(IIPPacketRequest.ResourceParents) .AddUInt32(resource.Instance.Id) .Done() .Then(ar => @@ -2467,7 +2467,7 @@ partial class DistributedConnection var rt = new AsyncReply(); if (attributes == null) - SendRequest(IIPPacketAction.ClearAllAttributes) + SendRequest(IIPPacketRequest.ClearAllAttributes) .AddUInt32(resource.Instance.Id) .Done() .Then(ar => rt.Trigger(true)) @@ -2475,7 +2475,7 @@ partial class DistributedConnection else { var attrs = DC.ToBytes(attributes); - SendRequest(IIPPacketAction.ClearAttributes) + SendRequest(IIPPacketRequest.ClearAttributes) .AddUInt32(resource.Instance.Id) .AddInt32(attrs.Length) .AddUInt8Array(attrs) @@ -2491,7 +2491,7 @@ partial class DistributedConnection { var rt = new AsyncReply(); - SendRequest(clearAttributes ? IIPPacketAction.UpdateAllAttributes : IIPPacketAction.UpdateAttributes) + SendRequest(clearAttributes ? IIPPacketRequest.UpdateAllAttributes : IIPPacketRequest.UpdateAttributes) .AddUInt32(resource.Instance.Id) //.AddUInt8Array(Codec.ComposeStructure(attributes, this, true, true, true)) .AddUInt8Array(Codec.Compose(attributes, this)) @@ -2508,7 +2508,7 @@ partial class DistributedConnection if (attributes == null) { - SendRequest(IIPPacketAction.GetAllAttributes) + SendRequest(IIPPacketRequest.GetAllAttributes) .AddUInt32(resource.Instance.Id) .Done() .Then(ar => @@ -2529,7 +2529,7 @@ partial class DistributedConnection else { var attrs = DC.ToBytes(attributes); - SendRequest(IIPPacketAction.GetAttributes) + SendRequest(IIPPacketRequest.GetAttributes) .AddUInt32(resource.Instance.Id) .AddInt32(attrs.Length) .AddUInt8Array(attrs) @@ -2571,7 +2571,7 @@ partial class DistributedConnection var reply = new AsyncReply>(); - SendRequest(IIPPacketAction.ResourceHistory) + SendRequest(IIPPacketRequest.ResourceHistory) .AddUInt32(dr.DistributedResourceInstanceId) .AddDateTime(fromDate) .AddDateTime(toDate) @@ -2601,7 +2601,7 @@ partial class DistributedConnection var str = DC.ToBytes(path); var reply = new AsyncReply(); - SendRequest(IIPPacketAction.QueryLink) + SendRequest(IIPPacketRequest.QueryLink) .AddUInt16((ushort)str.Length) .AddUInt8Array(str) .Done() @@ -2647,7 +2647,7 @@ partial class DistributedConnection pkt.InsertInt32(8, pkt.Length); - SendRequest(IIPPacketAction.CreateResource) + SendRequest(IIPPacketRequest.CreateResource) .AddUInt8Array(pkt.ToArray()) .Done() .Then(args => @@ -2810,7 +2810,7 @@ partial class DistributedConnection } SendParams() - .AddUInt8((byte)(0x80 | (byte)IIPPacketAction.KeepAlive)) + .AddUInt8((byte)(0x80 | (byte)IIPPacketRequest.KeepAlive)) .AddUInt32(callbackId) .AddDateTime(now) .AddUInt32(jitter) diff --git a/Esiur/Net/Packets/IIPPacket.cs b/Esiur/Net/Packets/IIPPacket.cs index 6a6dfb8..6ab0cc0 100644 --- a/Esiur/Net/Packets/IIPPacket.cs +++ b/Esiur/Net/Packets/IIPPacket.cs @@ -37,103 +37,56 @@ class IIPPacket : Packet public override string ToString() { - var rt = Command.ToString(); + var rt = Method.ToString(); - if (Command == IIPPacketCommand.Event) + if (Method == IIPPacketMethod.Notification) { - rt += " " + Event.ToString(); - //if (Event == IIPPacketEvent.AttributesUpdated) - // rt += + rt += " " + Notification.ToString(); } - else if (Command == IIPPacketCommand.Request) + else if (Method == IIPPacketMethod.Request) { - rt += " " + Action.ToString(); - if (Action == IIPPacketAction.AttachResource) - { - rt += " CID: " + CallbackId + " RID: " + ResourceId; - } + rt += " " + Request.ToString(); + } + else if (Method == IIPPacketMethod.Reply) + { + rt += " " + Reply.ToString(); } - else if (Command == IIPPacketCommand.Reply) - rt += " " + Action.ToString(); - else if (Command == IIPPacketCommand.Report) - rt += " " + Report.ToString(); return rt; } + public uint CallbackId { get; set; } - public IIPPacketReport Report + + public IIPPacketMethod Method + { + get; + set; + } + public IIPPacketRequest Request + { + get; + set; + } + public IIPPacketReply Reply { get; set; } - public IIPPacketCommand Command - { - get; - set; - } - public IIPPacketAction Action + public byte Extention { get; set; } + + public IIPPacketNotification Notification { get; set; } - public IIPPacketEvent Event - { - get; - set; - } - public IIPPacketCommand PreviousCommand - { - get; - set; - } - public IIPPacketAction PreviousAction - { - get; - set; - } - - public IIPPacketEvent PreviousEvent - { - get; - set; - } public TransmissionType? DataType { get; set; } - public uint ResourceId { get; set; } - public uint NewResourceId { get; set; } - //public uint ParentId { get; set; } - public uint ChildId { get; set; } - public uint StoreId { get; set; } - - public ulong ResourceAge { get; set; } - //public byte[] Content { get; set; } - public ushort ErrorCode { get; set; } - public string ErrorMessage { get; set; } - public string ClassName { get; set; } - public string ResourceLink { get; set; } - - public string ResourceName { get; set; } - public UUID ClassId { get; set; } - public byte MethodIndex { get; set; } - public string MethodName { get; set; } - public uint CallbackId { get; set; } - public int ProgressValue { get; set; } - public int ProgressMax { get; set; } - public DateTime FromDate { get; set; } - public DateTime ToDate { get; set; } - public ulong FromAge { get; set; } - public ulong ToAge { get; set; } - - public DateTime CurrentTime { get; set; } - public uint Interval { get; set; } - public uint Jitter { get; set; } - public string Procedure { get; set; } private uint dataLengthNeeded; private uint originalOffset; @@ -163,23 +116,18 @@ class IIPPacket : Packet if (NotEnough(offset, ends, 1)) return -dataLengthNeeded; - PreviousCommand = Command; + var hasDTU = (data[offset] & 0x20) == 0x20; - Command = (IIPPacketCommand)(data[offset] >> 6); + Method = (IIPPacketMethod)(data[offset] >> 6); - if (Command == IIPPacketCommand.Event) + if (Method == IIPPacketMethod.Notification) { - Event = (IIPPacketEvent)(data[offset++] & 0x3f); + Notification = (IIPPacketNotification)(data[offset++] & 0x3f); - if (NotEnough(offset, ends, 4)) - return -dataLengthNeeded; - - ResourceId = data.GetUInt32(offset, Endian.Little); - offset += 4; } - else if (Command == IIPPacketCommand.Report) + else if (Method == IIPPacketMethod.Request) { - Report = (IIPPacketReport)(data[offset++] & 0x3f); + Request = (IIPPacketRequest)(data[offset++] & 0x3f); if (NotEnough(offset, ends, 4)) return -dataLengthNeeded; @@ -187,10 +135,9 @@ class IIPPacket : Packet CallbackId = data.GetUInt32(offset, Endian.Little); offset += 4; } - else + else if (Method == IIPPacketMethod.Reply) { - PreviousAction = Action; - Action = (IIPPacketAction)(data[offset++] & 0x3f); + Reply = (IIPPacketReply)(data[offset++] & 0x3f); if (NotEnough(offset, ends, 4)) return -dataLengthNeeded; @@ -198,7 +145,11 @@ class IIPPacket : Packet CallbackId = data.GetUInt32(offset, Endian.Little); offset += 4; } - + else if (Method == IIPPacketMethod.Extension) + { + Extention = (byte)(data[offset++] & 0x3f); + } + if (Command == IIPPacketCommand.Event) { if (Event == IIPPacketEvent.ResourceReassigned) @@ -299,7 +250,7 @@ class IIPPacket : Packet } else if (Command == IIPPacketCommand.Request) { - if (Action == IIPPacketAction.AttachResource) + if (Action == IIPPacketRequest.AttachResource) { if (NotEnough(offset, ends, 4)) return -dataLengthNeeded; @@ -307,7 +258,7 @@ class IIPPacket : Packet ResourceId = data.GetUInt32(offset, Endian.Little); offset += 4; } - else if (Action == IIPPacketAction.ReattachResource) + else if (Action == IIPPacketRequest.ReattachResource) { if (NotEnough(offset, ends, 12)) return -dataLengthNeeded; @@ -319,7 +270,7 @@ class IIPPacket : Packet offset += 8; } - else if (Action == IIPPacketAction.DetachResource) + else if (Action == IIPPacketRequest.DetachResource) { if (NotEnough(offset, ends, 4)) return -dataLengthNeeded; @@ -328,7 +279,7 @@ class IIPPacket : Packet offset += 4; } - else if (Action == IIPPacketAction.CreateResource) + else if (Action == IIPPacketRequest.CreateResource) { if (NotEnough(offset, ends, 12)) return -dataLengthNeeded; @@ -347,7 +298,7 @@ class IIPPacket : Packet // @TODO: fix this //this.Content = data.Clip(offset, cl); } - else if (Action == IIPPacketAction.DeleteResource) + else if (Action == IIPPacketRequest.DeleteResource) { if (NotEnough(offset, ends, 4)) return -dataLengthNeeded; @@ -356,8 +307,8 @@ class IIPPacket : Packet offset += 4; } - else if (Action == IIPPacketAction.AddChild - || Action == IIPPacketAction.RemoveChild) + else if (Action == IIPPacketRequest.AddChild + || Action == IIPPacketRequest.RemoveChild) { if (NotEnough(offset, ends, 8)) return -dataLengthNeeded; @@ -367,7 +318,7 @@ class IIPPacket : Packet ChildId = data.GetUInt32(offset, Endian.Little); offset += 4; } - else if (Action == IIPPacketAction.RenameResource) + else if (Action == IIPPacketRequest.RenameResource) { if (NotEnough(offset, ends, 6)) return -dataLengthNeeded; @@ -384,7 +335,7 @@ class IIPPacket : Packet //Content = data.Clip(offset, cl); offset += cl; } - else if (Action == IIPPacketAction.TemplateFromClassName) + else if (Action == IIPPacketRequest.TemplateFromClassName) { if (NotEnough(offset, ends, 1)) return -dataLengthNeeded; @@ -398,7 +349,7 @@ class IIPPacket : Packet offset += cl; } - else if (Action == IIPPacketAction.TemplateFromClassId) + else if (Action == IIPPacketRequest.TemplateFromClassId) { if (NotEnough(offset, ends, 16)) return -dataLengthNeeded; @@ -407,7 +358,7 @@ class IIPPacket : Packet offset += 16; } - else if (Action == IIPPacketAction.TemplateFromResourceId) + else if (Action == IIPPacketRequest.TemplateFromResourceId) { if (NotEnough(offset, ends, 4)) return -dataLengthNeeded; @@ -415,8 +366,8 @@ class IIPPacket : Packet ResourceId = data.GetUInt32(offset, Endian.Little); offset += 4; } - else if (Action == IIPPacketAction.QueryLink - || Action == IIPPacketAction.LinkTemplates) + else if (Action == IIPPacketRequest.QueryLink + || Action == IIPPacketRequest.LinkTemplates) { if (NotEnough(offset, ends, 2)) return -dataLengthNeeded; @@ -430,8 +381,8 @@ class IIPPacket : Packet ResourceLink = data.GetString(offset, cl); offset += cl; } - else if (Action == IIPPacketAction.ResourceChildren - || Action == IIPPacketAction.ResourceParents) + else if (Action == IIPPacketRequest.ResourceChildren + || Action == IIPPacketRequest.ResourceParents) { if (NotEnough(offset, ends, 4)) return -dataLengthNeeded; @@ -439,7 +390,7 @@ class IIPPacket : Packet ResourceId = data.GetUInt32(offset, Endian.Little); offset += 4; } - else if (Action == IIPPacketAction.ResourceHistory) + else if (Action == IIPPacketRequest.ResourceHistory) { if (NotEnough(offset, ends, 20)) return -dataLengthNeeded; @@ -454,7 +405,7 @@ class IIPPacket : Packet offset += 8; } - else if (Action == IIPPacketAction.InvokeFunction) + else if (Action == IIPPacketRequest.InvokeFunction) { if (NotEnough(offset, ends, 6)) return -dataLengthNeeded; @@ -482,8 +433,8 @@ class IIPPacket : Packet //offset += cl; } - else if (Action == IIPPacketAction.Listen - || Action == IIPPacketAction.Unlisten)// .GetProperty) + else if (Action == IIPPacketRequest.Listen + || Action == IIPPacketRequest.Unlisten)// .GetProperty) { if (NotEnough(offset, ends, 5)) return -dataLengthNeeded; @@ -508,7 +459,7 @@ class IIPPacket : Packet // offset += 8; //} - else if (Action == IIPPacketAction.SetProperty) + else if (Action == IIPPacketRequest.SetProperty) { if (NotEnough(offset, ends, 6)) return -dataLengthNeeded; @@ -530,10 +481,10 @@ class IIPPacket : Packet } // Attributes - else if (Action == IIPPacketAction.UpdateAllAttributes - || Action == IIPPacketAction.GetAttributes - || Action == IIPPacketAction.UpdateAttributes - || Action == IIPPacketAction.ClearAttributes) + else if (Action == IIPPacketRequest.UpdateAllAttributes + || Action == IIPPacketRequest.GetAttributes + || Action == IIPPacketRequest.UpdateAttributes + || Action == IIPPacketRequest.ClearAttributes) { if (NotEnough(offset, ends, 8)) return -dataLengthNeeded; @@ -551,7 +502,7 @@ class IIPPacket : Packet offset += cl; } - else if (Action == IIPPacketAction.KeepAlive) + else if (Action == IIPPacketRequest.KeepAlive) { if (NotEnough(offset, ends, 12)) return -dataLengthNeeded; @@ -562,7 +513,7 @@ class IIPPacket : Packet offset += 4; } - else if (Action == IIPPacketAction.ProcedureCall) + else if (Action == IIPPacketRequest.ProcedureCall) { if (NotEnough(offset, ends, 2)) return -dataLengthNeeded; @@ -587,7 +538,7 @@ class IIPPacket : Packet offset += (uint)size; } - else if (Action == IIPPacketAction.StaticCall) + else if (Action == IIPPacketRequest.StaticCall) { if (NotEnough(offset, ends, 18)) return -dataLengthNeeded; @@ -608,8 +559,8 @@ class IIPPacket : Packet } else if (Command == IIPPacketCommand.Reply) { - if (Action == IIPPacketAction.AttachResource - || Action == IIPPacketAction.ReattachResource) + if (Action == IIPPacketRequest.AttachResource + || Action == IIPPacketRequest.ReattachResource) { if (NotEnough(offset, ends, 26)) @@ -644,11 +595,11 @@ class IIPPacket : Packet //Content = data.Clip(DataType.Value.Offset, (uint)DataType.Value.ContentLength); } - else if (Action == IIPPacketAction.DetachResource) + else if (Action == IIPPacketRequest.DetachResource) { // nothing to do } - else if (Action == IIPPacketAction.CreateResource) + else if (Action == IIPPacketRequest.CreateResource) { if (NotEnough(offset, ends, 20)) return -dataLengthNeeded; @@ -660,22 +611,22 @@ class IIPPacket : Packet offset += 4; } - else if (Action == IIPPacketAction.DetachResource) + else if (Action == IIPPacketRequest.DetachResource) { // nothing to do } // Inquire - else if (Action == IIPPacketAction.TemplateFromClassName - || Action == IIPPacketAction.TemplateFromClassId - || Action == IIPPacketAction.TemplateFromResourceId - || Action == IIPPacketAction.QueryLink - || Action == IIPPacketAction.ResourceChildren - || Action == IIPPacketAction.ResourceParents - || Action == IIPPacketAction.ResourceHistory - || Action == IIPPacketAction.LinkTemplates + else if (Action == IIPPacketRequest.TemplateFromClassName + || Action == IIPPacketRequest.TemplateFromClassId + || Action == IIPPacketRequest.TemplateFromResourceId + || Action == IIPPacketRequest.QueryLink + || Action == IIPPacketRequest.ResourceChildren + || Action == IIPPacketRequest.ResourceParents + || Action == IIPPacketRequest.ResourceHistory + || Action == IIPPacketRequest.LinkTemplates // Attribute - || Action == IIPPacketAction.GetAllAttributes - || Action == IIPPacketAction.GetAttributes) + || Action == IIPPacketRequest.GetAllAttributes + || Action == IIPPacketRequest.GetAttributes) { if (NotEnough(offset, ends, 1)) return -dataLengthNeeded; @@ -696,9 +647,9 @@ class IIPPacket : Packet //Content = data.Clip(offset, cl); //offset += cl; } - else if (Action == IIPPacketAction.InvokeFunction - || Action == IIPPacketAction.ProcedureCall - || Action == IIPPacketAction.StaticCall) + else if (Action == IIPPacketRequest.InvokeFunction + || Action == IIPPacketRequest.ProcedureCall + || Action == IIPPacketRequest.StaticCall) { if (NotEnough(offset, ends, 1)) return -dataLengthNeeded; @@ -712,13 +663,13 @@ class IIPPacket : Packet //Content = data.Clip(DataType.Value.Offset, (uint)DataType.Value.ContentLength); } - else if (Action == IIPPacketAction.SetProperty - || Action == IIPPacketAction.Listen - || Action == IIPPacketAction.Unlisten) + else if (Action == IIPPacketRequest.SetProperty + || Action == IIPPacketRequest.Listen + || Action == IIPPacketRequest.Unlisten) { // nothing to do } - else if (Action == IIPPacketAction.KeepAlive) + else if (Action == IIPPacketRequest.KeepAlive) { if (NotEnough(offset, ends, 12)) return -dataLengthNeeded; diff --git a/Esiur/Net/Packets/IIPPacketAction.cs b/Esiur/Net/Packets/IIPPacketAction.cs deleted file mode 100644 index ef14df3..0000000 --- a/Esiur/Net/Packets/IIPPacketAction.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Esiur.Net.Packets -{ - public enum IIPPacketAction : byte - { - // Request Manage - AttachResource = 0, - ReattachResource, - DetachResource, - CreateResource, - DeleteResource, - AddChild, - RemoveChild, - RenameResource, - - // Request Inquire - TemplateFromClassName = 0x8, - TemplateFromClassId, - TemplateFromResourceId, - QueryLink, - ResourceHistory, - ResourceChildren, - ResourceParents, - LinkTemplates, - - // Request Invoke - InvokeFunction = 0x10, - Reserved, - Listen, - Unlisten, - SetProperty, - - // Request Attribute - GetAllAttributes = 0x18, - UpdateAllAttributes, - ClearAllAttributes, - GetAttributes, - UpdateAttributes, - ClearAttributes, - - - // Static calling - KeepAlive = 0x20, - ProcedureCall, - StaticCall - } -} diff --git a/Esiur/Net/Packets/IIPPacketCommand.cs b/Esiur/Net/Packets/IIPPacketCommand.cs index c3d6b3f..648a954 100644 --- a/Esiur/Net/Packets/IIPPacketCommand.cs +++ b/Esiur/Net/Packets/IIPPacketCommand.cs @@ -4,11 +4,11 @@ using System.Text; namespace Esiur.Net.Packets { - public enum IIPPacketCommand : byte + public enum IIPPacketMethod : byte { - Event = 0, + Notification = 0, Request, Reply, - Report, + Extension, } } diff --git a/Esiur/Net/Packets/IIPPacketEvent.cs b/Esiur/Net/Packets/IIPPacketEvent.cs deleted file mode 100644 index 52e0da8..0000000 --- a/Esiur/Net/Packets/IIPPacketEvent.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Esiur.Net.Packets -{ - public enum IIPPacketEvent : byte - { - // Event Manage - ResourceReassigned = 0, - ResourceDestroyed, - ChildAdded, - ChildRemoved, - Renamed, - // Event Invoke - PropertyUpdated = 0x10, - EventOccurred, - - // Attribute - AttributesUpdated = 0x18 - } -} diff --git a/Esiur/Net/Packets/IIPPacketNotification.cs b/Esiur/Net/Packets/IIPPacketNotification.cs new file mode 100644 index 0000000..0085c4d --- /dev/null +++ b/Esiur/Net/Packets/IIPPacketNotification.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Esiur.Net.Packets +{ + public enum IIPPacketNotification : byte + { + // Event Manage + ResourceDestroyed = 0, + ResourceReassigned, + ResourceMoved, + SystemFailure, + // Event Invoke + PropertyModified = 0x8, + EventOccurred, + } +} diff --git a/Esiur/Net/Packets/IIPPacketReply.cs b/Esiur/Net/Packets/IIPPacketReply.cs new file mode 100644 index 0000000..76e85e8 --- /dev/null +++ b/Esiur/Net/Packets/IIPPacketReply.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Esiur.Net.Packets +{ + public enum IIPPacketReply : byte + { + // Success + Completed = 0x0, + Propagated = 0x1, + + // Error + Permission = 0x81, + Execution = 0x82, + + // Partial + Progress = 0x10, + Chunk = 0x11, + Warning = 0x12 + } +} diff --git a/Esiur/Net/Packets/IIPPacketRequest.cs b/Esiur/Net/Packets/IIPPacketRequest.cs new file mode 100644 index 0000000..c0b13a3 --- /dev/null +++ b/Esiur/Net/Packets/IIPPacketRequest.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Esiur.Net.Packets +{ + public enum IIPPacketRequest : byte + { + // Request Manage + AttachResource = 0x0, + ReattachResource = 0x1, + DetachResource = 0x2, + CreateResource = 0x3, + DeleteResource = 0x4, + MoveResource = 0x5, + + // Request Inquire + TemplateFromClassName = 0x8, + TemplateFromClassId = 0x9, + TemplateFromResourceId = 0xA, + QueryLink = 0xB, + LinkTemplates = 0xC, + Token = 0xD, + + // Request Invoke + InvokeFunction = 0x10, + Subscribe = 0x11, + Unsubscribe = 0x12, + SetProperty = 0x13, + + // Static calling + KeepAlive = 0x18, + ProcedureCall = 0x19, + StaticCall = 0x1A + } +}