diff --git a/src/main/java/com/loafle/overflow/model/discovery/DiscoverHost.java b/src/main/java/com/loafle/overflow/model/discovery/DiscoverHost.java index d96e6c7..178ebaa 100644 --- a/src/main/java/com/loafle/overflow/model/discovery/DiscoverHost.java +++ b/src/main/java/com/loafle/overflow/model/discovery/DiscoverHost.java @@ -4,43 +4,80 @@ package com.loafle.overflow.model.discovery; * DiscoveryHost */ public class DiscoverHost { - private String firstScanRange; - private String lastScanRange; - private String[] excludeHosts; - private String[] includeHosts; + private String firstScanRangev4; + private String lastScanRangev4; + private String[] excludeHostsv4; + private String[] includeHostsv4; + + private String firstScanRangev6; + private String lastScanRangev6; + private String[] excludeHostsv6; + private String[] includeHostsv6; private DiscoverPort discoverPort; - public String getFirstScanRange() { - return firstScanRange; + public String getFirstScanRangev4() { + return firstScanRangev4; } - public void setFirstScanRange(String firstScanRange) { - this.firstScanRange = firstScanRange; + public void setFirstScanRangev4(String firstScanRangev4) { + this.firstScanRangev4 = firstScanRangev4; } - public String getLastScanRange() { - return lastScanRange; + public String getLastScanRangev4() { + return lastScanRangev4; } - public void setLastScanRange(String lastScanRange) { - this.lastScanRange = lastScanRange; + public void setLastScanRangev4(String lastScanRangev4) { + this.lastScanRangev4 = lastScanRangev4; } - public String[] getExcludeHosts() { - return excludeHosts; + public String[] getExcludeHostsv4() { + return excludeHostsv4; } - public void setExcludeHosts(String[] excludeHosts) { - this.excludeHosts = excludeHosts; + public void setExcludeHostsv4(String[] excludeHostsv4) { + this.excludeHostsv4 = excludeHostsv4; } - public String[] getIncludeHosts() { - return includeHosts; + public String[] getIncludeHostsv4() { + return includeHostsv4; } - public void setIncludeHosts(String[] includeHosts) { - this.includeHosts = includeHosts; + public void setIncludeHostsv4(String[] includeHostsv4) { + this.includeHostsv4 = includeHostsv4; + } + + public String getFirstScanRangev6() { + return firstScanRangev6; + } + + public void setFirstScanRangev6(String firstScanRangev6) { + this.firstScanRangev6 = firstScanRangev6; + } + + public String getLastScanRangev6() { + return lastScanRangev6; + } + + public void setLastScanRangev6(String lastScanRangev6) { + this.lastScanRangev6 = lastScanRangev6; + } + + public String[] getExcludeHostsv6() { + return excludeHostsv6; + } + + public void setExcludeHostsv6(String[] excludeHostsv6) { + this.excludeHostsv6 = excludeHostsv6; + } + + public String[] getIncludeHostsv6() { + return includeHostsv6; + } + + public void setIncludeHostsv6(String[] includeHostsv6) { + this.includeHostsv6 = includeHostsv6; } public DiscoverPort getDiscoverPort() { diff --git a/src/main/java/com/loafle/overflow/model/discovery/DiscoveryStartInfo.java b/src/main/java/com/loafle/overflow/model/discovery/DiscoveryStartInfo.java index 8ae660f..336338b 100644 --- a/src/main/java/com/loafle/overflow/model/discovery/DiscoveryStartInfo.java +++ b/src/main/java/com/loafle/overflow/model/discovery/DiscoveryStartInfo.java @@ -6,35 +6,64 @@ import java.util.List; * Created by snoop on 17. 9. 29. */ public class DiscoveryStartInfo { - String startIp; - String endIP; - String excludeIp; + String startIpv4; + String endIPv4; + String excludeIpv4; + + String startIpv6; + String endIPv6; + String excludeIpv6; + String startPort; String endPort; List services; - public String getStartIp() { - return startIp; + public String getStartIpv4() { + return startIpv4; } - public void setStartIp(String startIp) { - this.startIp = startIp; + public void setStartIpv4(String startIpv4) { + this.startIpv4 = startIpv4; } - public String getEndIP() { - return endIP; + public String getEndIPv4() { + return endIPv4; } - public void setEndIP(String endIP) { - this.endIP = endIP; + public void setEndIPv4(String endIPv4) { + this.endIPv4 = endIPv4; } - public String getExcludeIp() { - return excludeIp; + public String getExcludeIpv4() { + return excludeIpv4; } - public void setExcludeIp(String excludeIp) { - this.excludeIp = excludeIp; + public void setExcludeIpv4(String excludeIpv4) { + this.excludeIpv4 = excludeIpv4; + } + + public String getStartIpv6() { + return startIpv6; + } + + public void setStartIpv6(String startIpv6) { + this.startIpv6 = startIpv6; + } + + public String getEndIPv6() { + return endIPv6; + } + + public void setEndIPv6(String endIPv6) { + this.endIPv6 = endIPv6; + } + + public String getExcludeIpv6() { + return excludeIpv6; + } + + public void setExcludeIpv6(String excludeIpv6) { + this.excludeIpv6 = excludeIpv6; } public String getStartPort() { diff --git a/src/main/java/com/loafle/overflow/model/discovery/Host.java b/src/main/java/com/loafle/overflow/model/discovery/Host.java index d8b14cb..0f234cf 100644 --- a/src/main/java/com/loafle/overflow/model/discovery/Host.java +++ b/src/main/java/com/loafle/overflow/model/discovery/Host.java @@ -10,7 +10,8 @@ import java.util.List; public class Host { private long id; - private String ip; + private String ipv4; + private String ipv6; private String mac; private String os; @@ -30,12 +31,20 @@ public class Host { this.id = id; } - public String getIp() { - return ip; + public String getIpv4() { + return ipv4; } - public void setIp(String ip) { - this.ip = ip; + public void setIpv4(String ipv4) { + this.ipv4 = ipv4; + } + + public String getIpv6() { + return ipv6; + } + + public void setIpv6(String ipv6) { + this.ipv6 = ipv6; } public String getMac() { diff --git a/src/main/java/com/loafle/overflow/model/discovery/Zone.java b/src/main/java/com/loafle/overflow/model/discovery/Zone.java index df311ee..bfc34d3 100644 --- a/src/main/java/com/loafle/overflow/model/discovery/Zone.java +++ b/src/main/java/com/loafle/overflow/model/discovery/Zone.java @@ -8,9 +8,66 @@ import java.util.Date; public class Zone { private long id; private String network; - private String ip; + private String ipv4; + private String ipv6; private String iface; private String mac; private Date discoveredDate; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getNetwork() { + return network; + } + + public void setNetwork(String network) { + this.network = network; + } + + public String getIpv4() { + return ipv4; + } + + public void setIpv4(String ipv4) { + this.ipv4 = ipv4; + } + + public String getIpv6() { + return ipv6; + } + + public void setIpv6(String ipv6) { + this.ipv6 = ipv6; + } + + public String getIface() { + return iface; + } + + public void setIface(String iface) { + this.iface = iface; + } + + public String getMac() { + return mac; + } + + public void setMac(String mac) { + this.mac = mac; + } + + public Date getDiscoveredDate() { + return discoveredDate; + } + + public void setDiscoveredDate(Date discoveredDate) { + this.discoveredDate = discoveredDate; + } } \ No newline at end of file