mirror of
https://github.com/esiur/esiur-dotnet.git
synced 2026-06-13 14:38:43 +00:00
up
This commit is contained in:
@@ -44,7 +44,7 @@ public abstract class PacketFilter : IResource
|
||||
public event DestroyedEvent OnDestroy;
|
||||
|
||||
|
||||
public abstract AsyncReply<bool> Trigger(ResourceTrigger trigger);
|
||||
public abstract AsyncReply<bool> Handle(ResourceOperation trigger);
|
||||
|
||||
public abstract bool Execute(Packet packet);
|
||||
|
||||
|
||||
@@ -67,36 +67,22 @@ public class PacketServer : IResource
|
||||
OnDestroy?.Invoke(this);
|
||||
}
|
||||
|
||||
public AsyncReply<bool> Trigger(ResourceTrigger trigger)
|
||||
public AsyncReply<bool> Trigger(ResourceOperation trigger)
|
||||
{
|
||||
if (trigger == ResourceTrigger.Initialize)
|
||||
if (trigger == ResourceOperation.Initialize)
|
||||
{
|
||||
/*
|
||||
foreach (var resource in Instance.Children<IResource>())
|
||||
{
|
||||
|
||||
if (resource is PacketFilter)
|
||||
{
|
||||
filters.Add(resource as PacketFilter);
|
||||
}
|
||||
else if (resource is PacketSource)
|
||||
{
|
||||
sources.Add(resource as PacketSource);
|
||||
}
|
||||
}
|
||||
*/
|
||||
foreach (var src in sources)
|
||||
{
|
||||
src.OnNewPacket += PacketReceived;
|
||||
src.Open();
|
||||
}
|
||||
}
|
||||
else if (trigger == ResourceTrigger.Terminate)
|
||||
else if (trigger == ResourceOperation.Terminate)
|
||||
{
|
||||
// foreach (var src in sources)
|
||||
// src.Close();
|
||||
foreach (var src in sources)
|
||||
src.Close();
|
||||
}
|
||||
else if (trigger == ResourceTrigger.SystemReload)
|
||||
else if (trigger == ResourceOperation.SystemReload)
|
||||
{
|
||||
foreach (var src in sources)
|
||||
{
|
||||
|
||||
@@ -44,7 +44,7 @@ public abstract class PacketSource : IResource
|
||||
}
|
||||
|
||||
|
||||
public abstract AsyncReply<bool> Trigger(ResourceTrigger trigger);
|
||||
public abstract AsyncReply<bool> Trigger(ResourceOperation trigger);
|
||||
|
||||
|
||||
public abstract bool RawMode
|
||||
|
||||
@@ -30,7 +30,7 @@ public class EpOverHttp : HttpFilter
|
||||
return new AsyncReply<bool>(true);
|
||||
}
|
||||
|
||||
public override AsyncReply<bool> Trigger(ResourceTrigger trigger)
|
||||
public override AsyncReply<bool> Trigger(ResourceOperation trigger)
|
||||
{
|
||||
return new AsyncReply<bool>(true);
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ public class EpOvwerWebsocket : HttpFilter
|
||||
|
||||
}
|
||||
|
||||
public override AsyncReply<bool> Trigger(ResourceTrigger trigger)
|
||||
public override AsyncReply<bool> Trigger(ResourceOperation trigger)
|
||||
{
|
||||
return new AsyncReply<bool>(true);
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public abstract class HttpFilter : IResource
|
||||
}
|
||||
|
||||
public event DestroyedEvent OnDestroy;
|
||||
public abstract AsyncReply<bool> Trigger(ResourceTrigger trigger);
|
||||
public abstract AsyncReply<bool> Trigger(ResourceOperation trigger);
|
||||
|
||||
/*
|
||||
public virtual void SessionModified(HTTPSession session, string key, object oldValue, object newValue)
|
||||
|
||||
@@ -291,10 +291,10 @@ public class HttpServer : NetworkServer<HttpConnection>, IResource
|
||||
*/
|
||||
|
||||
|
||||
public async AsyncReply<bool> Trigger(ResourceTrigger trigger)
|
||||
public async AsyncReply<bool> Trigger(ResourceOperation trigger)
|
||||
{
|
||||
|
||||
if (trigger == ResourceTrigger.Initialize)
|
||||
if (trigger == ResourceOperation.Initialize)
|
||||
{
|
||||
//var ip = (IPAddress)Instance.Attributes["ip"];
|
||||
//var port = (int)Instance.Attributes["port"];
|
||||
@@ -318,16 +318,16 @@ public class HttpServer : NetworkServer<HttpConnection>, IResource
|
||||
|
||||
Start(listener);
|
||||
}
|
||||
else if (trigger == ResourceTrigger.Terminate)
|
||||
else if (trigger == ResourceOperation.Terminate)
|
||||
{
|
||||
Stop();
|
||||
}
|
||||
else if (trigger == ResourceTrigger.SystemReload)
|
||||
else if (trigger == ResourceOperation.SystemReload)
|
||||
{
|
||||
await Trigger(ResourceTrigger.Terminate);
|
||||
await Trigger(ResourceTrigger.Initialize);
|
||||
await Trigger(ResourceOperation.Terminate);
|
||||
await Trigger(ResourceOperation.Initialize);
|
||||
}
|
||||
else if (trigger == ResourceTrigger.SystemInitialized)
|
||||
else if (trigger == ResourceOperation.SystemInitialized)
|
||||
{
|
||||
filters = await Instance.Children<HttpFilter>();
|
||||
}
|
||||
|
||||
@@ -149,7 +149,7 @@ namespace Esiur.Net.Sockets
|
||||
|
||||
}
|
||||
|
||||
public bool Trigger(ResourceTrigger trigger)
|
||||
public bool Trigger(ResourceOperation trigger)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -450,7 +450,7 @@ public class SSLSocket : ISocket
|
||||
}
|
||||
}
|
||||
|
||||
public bool Trigger(ResourceTrigger trigger)
|
||||
public bool Trigger(ResourceOperation trigger)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -177,7 +177,7 @@ public class WSocket : ISocket, INetworkReceiver<ISocket>
|
||||
return sock.Begin();
|
||||
}
|
||||
|
||||
public bool Trigger(ResourceTrigger trigger)
|
||||
public bool Trigger(ResourceOperation trigger)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public abstract class TcpFilter : IResource
|
||||
public event DestroyedEvent OnDestroy;
|
||||
|
||||
|
||||
public abstract AsyncReply<bool> Trigger(ResourceTrigger trigger);
|
||||
public abstract AsyncReply<bool> Trigger(ResourceOperation trigger);
|
||||
|
||||
public virtual bool Connected(TcpConnection sender)
|
||||
{
|
||||
|
||||
@@ -66,9 +66,9 @@ public class TcpServer : NetworkServer<TcpConnection>, IResource
|
||||
|
||||
TcpFilter[] filters = null;
|
||||
|
||||
public AsyncReply<bool> Trigger(ResourceTrigger trigger)
|
||||
public AsyncReply<bool> Trigger(ResourceOperation trigger)
|
||||
{
|
||||
if (trigger == ResourceTrigger.Initialize)
|
||||
if (trigger == ResourceOperation.Initialize)
|
||||
{
|
||||
TcpSocket listener;
|
||||
|
||||
@@ -82,16 +82,16 @@ public class TcpServer : NetworkServer<TcpConnection>, IResource
|
||||
|
||||
|
||||
}
|
||||
else if (trigger == ResourceTrigger.Terminate)
|
||||
else if (trigger == ResourceOperation.Terminate)
|
||||
{
|
||||
Stop();
|
||||
}
|
||||
else if (trigger == ResourceTrigger.SystemReload)
|
||||
else if (trigger == ResourceOperation.SystemReload)
|
||||
{
|
||||
Trigger(ResourceTrigger.Terminate);
|
||||
Trigger(ResourceTrigger.Initialize);
|
||||
Trigger(ResourceOperation.Terminate);
|
||||
Trigger(ResourceOperation.Initialize);
|
||||
}
|
||||
else if (trigger == ResourceTrigger.SystemInitialized)
|
||||
else if (trigger == ResourceOperation.SystemInitialized)
|
||||
{
|
||||
Instance.Children<TcpFilter>().Then(x => filters = x);
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ public abstract class UdpFilter : IResource
|
||||
|
||||
public event DestroyedEvent OnDestroy;
|
||||
|
||||
public abstract AsyncReply<bool> Trigger(ResourceTrigger trigger);
|
||||
public abstract AsyncReply<bool> Trigger(ResourceOperation trigger);
|
||||
|
||||
public abstract bool Execute(byte[] data, IPEndPoint sender);
|
||||
|
||||
|
||||
@@ -177,9 +177,9 @@ public class UdpServer : IResource
|
||||
OnDestroy?.Invoke(this);
|
||||
}
|
||||
|
||||
async AsyncReply<bool> IResource.Trigger(ResourceTrigger trigger)
|
||||
async AsyncReply<bool> IResource.Trigger(ResourceOperation trigger)
|
||||
{
|
||||
if (trigger == ResourceTrigger.Initialize)
|
||||
if (trigger == ResourceOperation.Initialize)
|
||||
{
|
||||
var address = IP == null ? IPAddress.Any : IPAddress.Parse(IP);
|
||||
|
||||
@@ -188,12 +188,12 @@ public class UdpServer : IResource
|
||||
receiver = new Thread(Receiving);
|
||||
receiver.Start();
|
||||
}
|
||||
else if (trigger == ResourceTrigger.Terminate)
|
||||
else if (trigger == ResourceOperation.Terminate)
|
||||
{
|
||||
if (receiver != null)
|
||||
receiver.Abort();
|
||||
}
|
||||
else if (trigger == ResourceTrigger.SystemInitialized)
|
||||
else if (trigger == ResourceOperation.SystemInitialized)
|
||||
{
|
||||
filters = await Instance.Children<UdpFilter>();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user