KNEMC/KLALB
1
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

隧道链接改成标准URI格式

Browse Source
This commit is contained in:
KNEMC
2026-07-11 22:28:50 +08:00
parent 053450429c
commit 314f90b5f3
66 changed files with 1578 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/kne/cloud/network/scanner/ScanRange.java
+8 -8
View File
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.net.UnknownHostException;
import java.util.Objects;
import org.kne.cloud.network.MultipurposeSocketAddress;
import org.kne.cloud.network.MultiProtocolSocketAddress;
public class ScanRange implements Serializable {
public ScanRange(String range) throws UnknownHostException {
@@ -12,21 +12,21 @@ public class ScanRange implements Serializable {
}
protected void setMsaString(String range) throws UnknownHostException {
String[]sp=range.split("~");
MultipurposeSocketAddress begin=new MultipurposeSocketAddress(sp[0]);
MultipurposeSocketAddress end;
MultiProtocolSocketAddress begin=new MultiProtocolSocketAddress(sp[0]);
MultiProtocolSocketAddress end;
if(sp.length>1) {
end=new MultipurposeSocketAddress(sp[1]);
end=new MultiProtocolSocketAddress(sp[1]);
}else {
end=new MultipurposeSocketAddress(sp[0]);
end=new MultiProtocolSocketAddress(sp[0]);
}
setMsa(begin, end);
}
public ScanRange(MultipurposeSocketAddress begin,MultipurposeSocketAddress end) throws UnknownHostException {
public ScanRange(MultiProtocolSocketAddress begin, MultiProtocolSocketAddress end) throws UnknownHostException {
setMsa(begin,end);
}
protected void setMsa(MultipurposeSocketAddress begin, MultipurposeSocketAddress end) throws UnknownHostException {
protected void setMsa(MultiProtocolSocketAddress begin, MultiProtocolSocketAddress end) throws UnknownHostException {
this.addressRange=new InetAddressRange(begin.getHost(), end.getHost());
this.portRange=new PortRange(begin.getPort(), end.getPort());
}
@@ -47,7 +47,7 @@ public class ScanRange implements Serializable {
}
public String toString() {
return new MultipurposeSocketAddress(addressRange.getBeginHost(), portRange.getBegin())+"~"+new MultipurposeSocketAddress(addressRange.getEndHost(), portRange.getEnd());
return new MultiProtocolSocketAddress(addressRange.getBeginHost(), portRange.getBegin())+"~"+new MultiProtocolSocketAddress(addressRange.getEndHost(), portRange.getEnd());
}
@Override
public int hashCode() {
src/org/kne/cloud/network/scanner/TCPNetworkScanner.java
+9 -10
View File
@@ -10,7 +10,6 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
@@ -20,11 +19,11 @@ import java.util.concurrent.locks.ReentrantLock;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import org.kne.cloud.network.MultipurposeSocketAddress;
import org.kne.cloud.network.MultiProtocolSocketAddress;
import org.kne.cloud.network.ThreadTool;
public class TCPNetworkScanner implements Runnable {
private BiConsumer<MultipurposeSocketAddress,Socket> consumer;
private BiConsumer<MultiProtocolSocketAddress,Socket> consumer;
private Consumer<Float>processConsumer;
public Consumer<Float> getProcessConsumer() {
@@ -44,11 +43,11 @@ public class TCPNetworkScanner implements Runnable {
return ranges;
}
public BiConsumer<MultipurposeSocketAddress,Socket> getConsumer() {
public BiConsumer<MultiProtocolSocketAddress,Socket> getConsumer() {
return consumer;
}
public void setConsumer(BiConsumer<MultipurposeSocketAddress,Socket> consumer) {
public void setConsumer(BiConsumer<MultiProtocolSocketAddress,Socket> consumer) {
this.consumer = consumer;
}
@@ -128,13 +127,13 @@ ThreadPoolExecutor excd=(ThreadPoolExecutor) Executors.newFixedThreadPool(8);
exc.execute(()->{
MultipurposeSocketAddress mpsa;
MultiProtocolSocketAddress mpsa;
if (currAddress.equals(inetAddressRange.getBegin())) {
mpsa = new MultipurposeSocketAddress(inetAddressRange.getBeginHost(), curport0);
mpsa = new MultiProtocolSocketAddress(inetAddressRange.getBeginHost(), curport0);
}else if (currAddress.equals(inetAddressRange.getEnd())) {
mpsa = new MultipurposeSocketAddress(inetAddressRange.getEndHost(), curport0);
mpsa = new MultiProtocolSocketAddress(inetAddressRange.getEndHost(), curport0);
} else {
mpsa = new MultipurposeSocketAddress(currAddress.getHostAddress(),
mpsa = new MultiProtocolSocketAddress(currAddress.getHostAddress(),
curport0);
}
Socket s = null;
@@ -228,7 +227,7 @@ ThreadPoolExecutor excd=(ThreadPoolExecutor) Executors.newFixedThreadPool(8);
System.arraycopy( new BigInteger(curr).add(BigInteger.valueOf(1)).toByteArray(), 0, curr, 0, curr.length); ;
}
protected void acceptMultipurposeSocketAddress(MultipurposeSocketAddress scanned, Socket s) {
protected void acceptMultipurposeSocketAddress(MultiProtocolSocketAddress scanned, Socket s) {
consumer.accept(scanned,s);
}