Renamed DNS to INS
This commit is contained in:
@@ -5,20 +5,20 @@ import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.openautonomousconnection.protocol.annotations.ProtocolInfo;
|
||||
import org.openautonomousconnection.protocol.listeners.ClientListener;
|
||||
import org.openautonomousconnection.protocol.listeners.DNSServerListener;
|
||||
import org.openautonomousconnection.protocol.listeners.INSServerListener;
|
||||
import org.openautonomousconnection.protocol.listeners.WebServerListener;
|
||||
import org.openautonomousconnection.protocol.packets.OACPacket;
|
||||
import org.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket;
|
||||
import org.openautonomousconnection.protocol.packets.v1_0_0.beta.GetDestinationPacket;
|
||||
import org.openautonomousconnection.protocol.packets.v1_0_0.beta.UnsupportedClassicPacket;
|
||||
import org.openautonomousconnection.protocol.packets.v1_0_0.beta.ValidateDomainPacket;
|
||||
import org.openautonomousconnection.protocol.packets.v1_0_0.beta.ValidateInfoNamePacket;
|
||||
import org.openautonomousconnection.protocol.packets.v1_0_0.classic.Classic_DomainPacket;
|
||||
import org.openautonomousconnection.protocol.side.client.ProtocolClient;
|
||||
import org.openautonomousconnection.protocol.side.dns.ProtocolDNSServer;
|
||||
import org.openautonomousconnection.protocol.side.ins.ProtocolINSServer;
|
||||
import org.openautonomousconnection.protocol.side.web.ProtocolWebServer;
|
||||
import org.openautonomousconnection.protocol.versions.ProtocolVersion;
|
||||
import org.openautonomousconnection.protocol.versions.v1_0_0.classic.handlers.ClassicHandlerClient;
|
||||
import org.openautonomousconnection.protocol.versions.v1_0_0.classic.handlers.ClassicHandlerDNSServer;
|
||||
import org.openautonomousconnection.protocol.versions.v1_0_0.classic.handlers.ClassicHandlerINSServer;
|
||||
import org.openautonomousconnection.protocol.versions.v1_0_0.classic.handlers.ClassicHandlerWebServer;
|
||||
import org.openautonomousconnection.protocol.versions.v1_0_0.classic.utils.Classic_ClientListener;
|
||||
|
||||
@@ -53,7 +53,7 @@ public final class ProtocolBridge {
|
||||
* The protocol side instances
|
||||
*/
|
||||
@Getter
|
||||
private ProtocolDNSServer protocolDNSServer;
|
||||
private ProtocolINSServer protocolINSServer;
|
||||
|
||||
/**
|
||||
* The protocol side instances
|
||||
@@ -68,11 +68,11 @@ public final class ProtocolBridge {
|
||||
private ProtocolWebServer protocolWebServer;
|
||||
|
||||
/**
|
||||
* The classic protocol handlers for dns server side
|
||||
* The classic protocol handlers for INS server side
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
private ClassicHandlerDNSServer classicHandlerDNSServer;
|
||||
private ClassicHandlerINSServer classicHandlerINSServer;
|
||||
|
||||
/**
|
||||
* The classic protocol handlers for web server side
|
||||
@@ -96,19 +96,19 @@ public final class ProtocolBridge {
|
||||
private Proxy proxy;
|
||||
|
||||
/**
|
||||
* Initialize the ProtocolBridge instance for the DNS server side
|
||||
* Initialize the ProtocolBridge instance for the INS server side
|
||||
*
|
||||
* @param protocolDNSServer The ProtocolDNSServer instance
|
||||
* @param protocolINSServer The ProtocolINSServer instance
|
||||
* @param protocolSettings The ProtocolSettings instance
|
||||
* @param protocolVersion The ProtocolVersion instance
|
||||
* @param logFolder The folder to store the log files
|
||||
* @throws Exception if an error occurs while initializing the ProtocolBridge
|
||||
*/
|
||||
@ProtocolInfo(protocolSide = ProtocolVersion.ProtocolSide.DNS)
|
||||
public ProtocolBridge(ProtocolDNSServer protocolDNSServer, ProtocolSettings protocolSettings, ProtocolVersion protocolVersion, File logFolder) throws Exception {
|
||||
@ProtocolInfo(protocolSide = ProtocolVersion.ProtocolSide.INS)
|
||||
public ProtocolBridge(ProtocolINSServer protocolINSServer, ProtocolSettings protocolSettings, ProtocolVersion protocolVersion, File logFolder) throws Exception {
|
||||
// Assign the parameters to the class fields
|
||||
this.protocolDNSServer = protocolDNSServer;
|
||||
this.protocolDNSServer.setProtocolBridge(this);
|
||||
this.protocolINSServer = protocolINSServer;
|
||||
this.protocolINSServer.setProtocolBridge(this);
|
||||
this.protocolSettings = protocolSettings;
|
||||
this.protocolVersion = protocolVersion;
|
||||
|
||||
@@ -189,14 +189,14 @@ public final class ProtocolBridge {
|
||||
// 1.0.0-BETA packets
|
||||
AuthPacket v100bAuthPath = new AuthPacket();
|
||||
UnsupportedClassicPacket v100bUnsupportedClassicPacket = new UnsupportedClassicPacket();
|
||||
ValidateDomainPacket v100bValidateDomainPacket = new ValidateDomainPacket();
|
||||
ValidateInfoNamePacket v100BValidateInfoNamePacket = new ValidateInfoNamePacket();
|
||||
GetDestinationPacket v100bGetDestinationPacket = new GetDestinationPacket();
|
||||
|
||||
if (isPacketSupported(v100bAuthPath)) protocolSettings.packetHandler.registerPacket(v100bAuthPath);
|
||||
if (isPacketSupported(v100bUnsupportedClassicPacket))
|
||||
protocolSettings.packetHandler.registerPacket(v100bUnsupportedClassicPacket);
|
||||
if (isPacketSupported(v100bValidateDomainPacket))
|
||||
protocolSettings.packetHandler.registerPacket(v100bValidateDomainPacket);
|
||||
if (isPacketSupported(v100BValidateInfoNamePacket))
|
||||
protocolSettings.packetHandler.registerPacket(v100BValidateInfoNamePacket);
|
||||
if (isPacketSupported(v100bGetDestinationPacket))
|
||||
protocolSettings.packetHandler.registerPacket(v100bGetDestinationPacket);
|
||||
}
|
||||
@@ -211,9 +211,9 @@ public final class ProtocolBridge {
|
||||
if (isClassicSupported()) protocolSettings.eventManager.registerListener(Classic_ClientListener.class);
|
||||
else protocolSettings.eventManager.unregisterListener(Classic_ClientListener.class);
|
||||
|
||||
// DNS Listeners
|
||||
if (isRunningAsDNSServer()) {
|
||||
protocolSettings.eventManager.registerListener(DNSServerListener.class);
|
||||
// INS Listeners
|
||||
if (isRunningAsINSServer()) {
|
||||
protocolSettings.eventManager.registerListener(INSServerListener.class);
|
||||
protocolSettings.eventManager.unregisterListener(WebServerListener.class);
|
||||
protocolSettings.eventManager.unregisterListener(ClientListener.class);
|
||||
}
|
||||
@@ -221,14 +221,14 @@ public final class ProtocolBridge {
|
||||
// Web Listeners
|
||||
if (isRunningAsWebServer()) {
|
||||
protocolSettings.eventManager.registerListener(WebServerListener.class);
|
||||
protocolSettings.eventManager.unregisterListener(DNSServerListener.class);
|
||||
protocolSettings.eventManager.unregisterListener(INSServerListener.class);
|
||||
protocolSettings.eventManager.unregisterListener(ClientListener.class);
|
||||
}
|
||||
|
||||
// Client Listeners
|
||||
if (isRunningAsClient()) {
|
||||
protocolSettings.eventManager.registerListener(ClientListener.class);
|
||||
protocolSettings.eventManager.unregisterListener(DNSServerListener.class);
|
||||
protocolSettings.eventManager.unregisterListener(INSServerListener.class);
|
||||
protocolSettings.eventManager.unregisterListener(WebServerListener.class);
|
||||
}
|
||||
}
|
||||
@@ -333,27 +333,27 @@ public final class ProtocolBridge {
|
||||
return
|
||||
(isRunningAsClient() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.CLIENT) ||
|
||||
(isRunningAsClient() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.CLIENT_WEB) ||
|
||||
(isRunningAsClient() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.CLIENT_DNS) ||
|
||||
(isRunningAsClient() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.CLIENT_INS) ||
|
||||
(isRunningAsClient() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.ALL) ||
|
||||
|
||||
(isRunningAsWebServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.WEB) ||
|
||||
(isRunningAsWebServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.CLIENT_WEB) ||
|
||||
(isRunningAsWebServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.WEB_DNS) ||
|
||||
(isRunningAsWebServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.WEB_INS) ||
|
||||
(isRunningAsWebServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.ALL) ||
|
||||
|
||||
(isRunningAsDNSServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.DNS) ||
|
||||
(isRunningAsDNSServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.WEB_DNS) ||
|
||||
(isRunningAsDNSServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.CLIENT_DNS) ||
|
||||
(isRunningAsDNSServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.ALL);
|
||||
(isRunningAsINSServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.INS) ||
|
||||
(isRunningAsINSServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.WEB_INS) ||
|
||||
(isRunningAsINSServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.CLIENT_INS) ||
|
||||
(isRunningAsINSServer() && protocolVersion.getProtocolSide() == ProtocolVersion.ProtocolSide.ALL);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the current instance is running as a DNS server
|
||||
* Check if the current instance is running as a INS server
|
||||
*
|
||||
* @return true if the current instance is running as a DNS server, false otherwise
|
||||
* @return true if the current instance is running as a INS server, false otherwise
|
||||
*/
|
||||
public boolean isRunningAsDNSServer() {
|
||||
return protocolDNSServer != null;
|
||||
public boolean isRunningAsINSServer() {
|
||||
return protocolINSServer != null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user