diff --git a/src/org/kne/cloud/network/ByteBufferAllocator.java b/src/org/kne/cloud/network/ByteBufferAllocator.java index 594c301..6a0e7c2 100644 --- a/src/org/kne/cloud/network/ByteBufferAllocator.java +++ b/src/org/kne/cloud/network/ByteBufferAllocator.java @@ -1,23 +1,8 @@ package org.kne.cloud.network; import java.lang.foreign.Arena; -import java.lang.foreign.MemorySegment; -import java.lang.foreign.SegmentAllocator; -import java.lang.ref.Cleaner; -import java.lang.ref.PhantomReference; -import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; -import java.lang.ref.WeakReference; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.nio.BufferOverflowException; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicReference; -import org.kne.debug.TimeDebugger; import org.kne.membandboost.MembandBoost; public class ByteBufferAllocator { diff --git a/src/org/kne/cloud/network/DatagramServerSocket.java b/src/org/kne/cloud/network/DatagramServerSocket.java index 5d10d99..670dfce 100644 --- a/src/org/kne/cloud/network/DatagramServerSocket.java +++ b/src/org/kne/cloud/network/DatagramServerSocket.java @@ -1,34 +1,24 @@ package org.kne.cloud.network; import java.io.IOException; -import java.io.InterruptedIOException; import java.net.DatagramPacket; import java.net.DatagramSocket; -import java.net.DatagramSocketImpl; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.NetworkInterface; -import java.net.ServerSocket; import java.net.SocketAddress; import java.net.SocketException; import java.net.SocketTimeoutException; -import java.util.Collections; import java.util.Enumeration; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Vector; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.locks.LockSupport; -import org.kne.cloud.network.klalb.DATATPacket; -import org.kne.cloud.network.klalb.KLALBRemoteLink; - public class DatagramServerSocket implements java.io.Closeable{ public static final ByteArrayPool dataarraypool=new ByteArrayPool(100, 65535); @@ -93,10 +83,7 @@ public class DatagramServerSocket implements java.io.Closeable{ if (backlog < 1) backlog = 50; - @SuppressWarnings("removal") - SecurityManager security = System.getSecurityManager(); - if (security != null) - security.checkListen(epoint.getPort()); + synchronized (stateLock) { if (closed) diff --git a/src/org/kne/cloud/network/IPMulticastDiscovery.java b/src/org/kne/cloud/network/IPMulticastDiscovery.java index 344197c..f540110 100644 --- a/src/org/kne/cloud/network/IPMulticastDiscovery.java +++ b/src/org/kne/cloud/network/IPMulticastDiscovery.java @@ -15,12 +15,10 @@ import java.net.NetworkInterface; import java.net.NoRouteToHostException; import java.net.SocketException; import java.net.UnknownHostException; -import java.time.Duration; import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Set; import java.util.UUID; import java.util.function.Consumer; diff --git a/src/org/kne/cloud/network/NetworkPacket.java b/src/org/kne/cloud/network/NetworkPacket.java index c83cf37..0815c0e 100644 --- a/src/org/kne/cloud/network/NetworkPacket.java +++ b/src/org/kne/cloud/network/NetworkPacket.java @@ -3,12 +3,6 @@ package org.kne.cloud.network; import java.io.IOException; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.kne.cloud.network.klalb.KLALBPacket; -import org.kne.debug.TimeDebugger; public abstract class NetworkPacket{ diff --git a/src/org/kne/cloud/network/SocketChannelListener.java b/src/org/kne/cloud/network/SocketChannelListener.java index f01c99a..8fb3702 100644 --- a/src/org/kne/cloud/network/SocketChannelListener.java +++ b/src/org/kne/cloud/network/SocketChannelListener.java @@ -2,17 +2,12 @@ package org.kne.cloud.network; import java.io.Closeable; import java.io.IOException; -import java.net.InetAddress; -import java.net.ServerSocket; -import java.net.Socket; import java.net.SocketException; import java.net.UnknownHostException; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.util.function.Consumer; -import javax.net.ServerSocketFactory; - public class SocketChannelListener implements Closeable,AutoCloseable{ protected ServerSocketChannel serverSocketChannel; public ServerSocketChannel getServerSocketChannel() { diff --git a/src/org/kne/cloud/network/congestion/ArrayListMessageBatcher.java b/src/org/kne/cloud/network/congestion/ArrayListMessageBatcher.java index 93ce8c7..73445e5 100644 --- a/src/org/kne/cloud/network/congestion/ArrayListMessageBatcher.java +++ b/src/org/kne/cloud/network/congestion/ArrayListMessageBatcher.java @@ -2,13 +2,9 @@ package org.kne.cloud.network.congestion; import java.lang.ref.Cleaner; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.LockSupport; -import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; import org.kne.cloud.network.ThreadTool; @@ -120,7 +116,7 @@ class ArrayListMessageBatcherReleaser extends Releaser,Cloneable{ private IPv6AddressGroup destination; private IPv6Address nexthop; diff --git a/src/org/kne/cloud/network/klalb/BindableConsumer.java b/src/org/kne/cloud/network/klalb/BindableConsumer.java index e5e3a72..4a5c7d4 100644 --- a/src/org/kne/cloud/network/klalb/BindableConsumer.java +++ b/src/org/kne/cloud/network/klalb/BindableConsumer.java @@ -1,7 +1,6 @@ package org.kne.cloud.network.klalb; import java.net.InetAddress; -import java.net.ServerSocket; import java.util.function.Consumer; public interface BindableConsumer extends Consumer { diff --git a/src/org/kne/cloud/network/klalb/KLALBController.java b/src/org/kne/cloud/network/klalb/KLALBController.java index baeed18..4ad7189 100644 --- a/src/org/kne/cloud/network/klalb/KLALBController.java +++ b/src/org/kne/cloud/network/klalb/KLALBController.java @@ -10,8 +10,6 @@ import java.net.NetworkInterface; import java.net.SocketException; import java.net.SocketTimeoutException; import java.net.UnknownHostException; -import java.nio.channels.AsynchronousSocketChannel; -import java.nio.channels.DatagramChannel; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashSet; diff --git a/src/org/kne/cloud/network/klalb/KLALBControllerConfigItem.java b/src/org/kne/cloud/network/klalb/KLALBControllerConfigItem.java index 63d5a0b..0178a84 100644 --- a/src/org/kne/cloud/network/klalb/KLALBControllerConfigItem.java +++ b/src/org/kne/cloud/network/klalb/KLALBControllerConfigItem.java @@ -1,16 +1,11 @@ package org.kne.cloud.network.klalb; import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import org.kne.cloud.network.MultipurposeSocketAddress; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - public class KLALBControllerConfigItem extends KLALBConfigItem { private String language; private boolean nogui; diff --git a/src/org/kne/cloud/network/klalb/KLALBInputStream.java b/src/org/kne/cloud/network/klalb/KLALBInputStream.java index 51ca13b..d1f36d2 100644 --- a/src/org/kne/cloud/network/klalb/KLALBInputStream.java +++ b/src/org/kne/cloud/network/klalb/KLALBInputStream.java @@ -1,13 +1,9 @@ package org.kne.cloud.network.klalb; -import static org.kne.cloud.network.klalb.KLALBPacket.*; -import java.io.DataInput; import java.io.DataInputStream; -import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.io.StreamCorruptedException; -import java.net.Inet6Address; import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; diff --git a/src/org/kne/cloud/network/klalb/KLALBMain.java b/src/org/kne/cloud/network/klalb/KLALBMain.java index 894fdcc..ba10b7e 100644 --- a/src/org/kne/cloud/network/klalb/KLALBMain.java +++ b/src/org/kne/cloud/network/klalb/KLALBMain.java @@ -4,7 +4,6 @@ import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.channels.ServerSocketChannel; -import java.nio.channels.SocketChannel; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -12,18 +11,14 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.Scanner; -import javax.swing.JFrame; - import org.kne.cloud.network.MultipurposeSocketAddress; import org.kne.cloud.network.SocketChannelListener; -import org.kne.cloud.network.SocketListener; import org.kne.cloud.network.ipv6.IPv6NetworkLink; import org.kne.cloud.network.ipv6.RouteItem; import org.kne.cloud.network.klalb.ui.KLALBStateGUI3; import org.kne.cloud.network.klalb.ui.UIEnv; import org.kne.cloud.network.perf.Kperf; import org.kne.cloud.network.perf.NodeBenchmark; -import org.kne.debug.Debuger; import org.kne.debug.TimeDebugger; import org.kne.membandboost.MembandBenchmark; import org.kne.membandboost.ObjectPoolBandwidthTest; diff --git a/src/org/kne/cloud/network/klalb/KLALBPacket.java b/src/org/kne/cloud/network/klalb/KLALBPacket.java index 942d4a8..03c8124 100644 --- a/src/org/kne/cloud/network/klalb/KLALBPacket.java +++ b/src/org/kne/cloud/network/klalb/KLALBPacket.java @@ -9,10 +9,6 @@ import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; import org.kne.cloud.network.NetworkPacket; import org.kne.cloud.network.ipv6.IPv6Packet; diff --git a/src/org/kne/cloud/network/klalb/KLALBProxySystem.java b/src/org/kne/cloud/network/klalb/KLALBProxySystem.java index 8c45807..dadba00 100644 --- a/src/org/kne/cloud/network/klalb/KLALBProxySystem.java +++ b/src/org/kne/cloud/network/klalb/KLALBProxySystem.java @@ -5,39 +5,20 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.Reader; -import java.net.Inet6Address; -import java.net.InetAddress; import java.net.InetSocketAddress; -import java.net.NetworkInterface; -import java.net.Socket; -import java.net.SocketException; -import java.net.SocketTimeoutException; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import org.kne.cloud.network.*; import org.kne.cloud.network.klalb.ui.KLALBStateGUI3; import org.kne.cloud.network.klalb.ui.Language; import org.kne.cloud.network.klalb.ui.UIEnv; -import org.kne.cloud.network.minecraft.MinecraftSocketBridge; import java.util.Set; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.google.gson.JsonPrimitive; public class KLALBProxySystem { private Set proxys=new HashSet<>(); diff --git a/src/org/kne/cloud/network/klalb/KLALBRemoteLink.java b/src/org/kne/cloud/network/klalb/KLALBRemoteLink.java index 3ba0a98..335a004 100644 --- a/src/org/kne/cloud/network/klalb/KLALBRemoteLink.java +++ b/src/org/kne/cloud/network/klalb/KLALBRemoteLink.java @@ -1,17 +1,8 @@ package org.kne.cloud.network.klalb; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.PrintStream; import java.io.StreamCorruptedException; -import java.lang.ModuleLayer.Controller; -import java.math.BigInteger; -import java.net.Inet6Address; -import java.net.InetAddress; import java.net.SocketTimeoutException; -import java.net.UnknownHostException; import java.nio.channels.UnresolvedAddressException; import java.security.SecureRandom; import java.util.ArrayList; @@ -19,20 +10,11 @@ import java.util.Iterator; import java.util.List; import java.util.Queue; import java.util.UUID; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.LockSupport; -import java.util.concurrent.locks.ReentrantLock; -import java.util.function.BiConsumer; import java.util.function.Consumer; -import java.util.function.Supplier; - -import javax.management.RuntimeErrorException; import org.jctools.queues.MpscArrayQueue; import org.kne.cloud.clock.HighAccuracyClock; @@ -40,48 +22,33 @@ import org.kne.cloud.clock.NTPTimestamps; import org.kne.cloud.clock.ReliabilityBackoffTimeClock; import org.kne.cloud.clock.WatchDogTimer; import org.kne.cloud.network.MultipurposeSocketAddress; -import org.kne.cloud.network.SpeedLimiter; import org.kne.cloud.network.ThreadTool; import org.kne.cloud.network.congestion.BBRCongestionAlgorithm; -import org.kne.cloud.network.congestion.BBRCongestionAlgorithmFactory; import org.kne.cloud.network.congestion.CongestionAlgorithm; import org.kne.cloud.network.congestion.CongestionAlgorithms; import org.kne.cloud.network.congestion.DetnetCongestionAlgorithm; import org.kne.cloud.network.congestion.SendPacketSlidingWindow; -import org.kne.cloud.network.congestion.Vegas2CongestionAlgorithm; import org.kne.cloud.network.ipv6.ControlledIPv6NetworkLink; -import org.kne.cloud.network.ipv6.ICMPv6PostcardPacket; import org.kne.cloud.network.ipv6.IPv6Address; import org.kne.cloud.network.ipv6.IPv6HopByHopTLV; -import org.kne.cloud.network.ipv6.IPv6NetworkLink; import org.kne.cloud.network.ipv6.IPv6Packet; import org.kne.cloud.network.ipv6.IPv6Packet.IPv6HopByHopHeader; -import org.kne.cloud.network.ipv6.IPv6Packet.IPv6SegmentRoutingHeader; import org.kne.cloud.network.ipv6.IPv6AddressGroup; import org.kne.cloud.network.ipv6.KLALBOAMHopByHopTLV; import org.kne.cloud.network.ipv6.KLALBPassportHopByHopTLV; import org.kne.cloud.network.ipv6.Neighbor; -import org.kne.cloud.network.ipv6.PacketID; -import org.kne.cloud.network.ipv6.PacketIDGenerator; import org.kne.cloud.network.ipv6.PostcardEntry; import org.kne.cloud.network.ipv6.RouteItem; import org.kne.cloud.network.monitor.CostSupplierFactory; import org.kne.cloud.network.monitor.DelayMonitorData; import org.kne.cloud.network.monitor.LinkStatus; -import org.kne.cloud.network.monitor.MonitorData; import org.kne.cloud.network.monitor.SpeedAndTrafficAndDelayMonitorDataImpl; import org.kne.cloud.network.perf.TESTNPacket; -import org.kne.cloud.network.srv6.ACKSEQSSegmentRoutingTLV; -import org.kne.cloud.network.srv6.IPv6SegmentRoutingTLV; -import org.kne.cloud.network.srv6.SRv6Router; import org.kne.cloud.network.te.BandwidthDistributer; -import org.kne.concurrent.HighPerformanceExecutor2; import org.kne.concurrent.SpinLock; import org.kne.concurrent.ThreadParker; import org.kne.math.Long128; -import com.github.f4b6a3.uuid.UuidCreator; - public class KLALBRemoteLink extends AbstractControlledIPv6NetworkLink implements ControlledIPv6NetworkLink { private static final int HEADER_CALIBRATE = 40; diff --git a/src/org/kne/cloud/network/klalb/KLALBRemoteManagement.java b/src/org/kne/cloud/network/klalb/KLALBRemoteManagement.java index ba60d9b..34fcf96 100644 --- a/src/org/kne/cloud/network/klalb/KLALBRemoteManagement.java +++ b/src/org/kne/cloud/network/klalb/KLALBRemoteManagement.java @@ -1,22 +1,17 @@ package org.kne.cloud.network.klalb; import java.io.IOException; -import java.net.SocketException; import java.net.SocketTimeoutException; import java.nio.charset.Charset; import java.util.Iterator; import java.util.List; -import java.util.Set; import org.kne.cloud.network.MultipurposeSocketAddress; -import org.kne.cloud.network.Proxy; import org.kne.cloud.network.SocketListener; import org.kne.cloud.network.ipv6.IPv6NetworkLink; import org.kne.cloud.network.monitor.LinkStatus; -import org.kne.cloud.network.monitor.MonitorData; import com.google.gson.JsonArray; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonPrimitive; diff --git a/src/org/kne/cloud/network/klalb/KLALBUtils.java b/src/org/kne/cloud/network/klalb/KLALBUtils.java index 658c737..fdacab2 100644 --- a/src/org/kne/cloud/network/klalb/KLALBUtils.java +++ b/src/org/kne/cloud/network/klalb/KLALBUtils.java @@ -10,7 +10,6 @@ import java.net.UnknownHostException; import java.security.SecureRandom; import java.util.List; import java.util.UUID; -import java.util.concurrent.LinkedBlockingQueue; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/org/kne/cloud/network/klalb/KLALBVirtualDatagramSocketImpl.java b/src/org/kne/cloud/network/klalb/KLALBVirtualDatagramSocketImpl.java index a1fae6a..d9d13e0 100644 --- a/src/org/kne/cloud/network/klalb/KLALBVirtualDatagramSocketImpl.java +++ b/src/org/kne/cloud/network/klalb/KLALBVirtualDatagramSocketImpl.java @@ -3,7 +3,6 @@ package org.kne.cloud.network.klalb; import java.io.IOException; import java.net.BindException; import java.net.DatagramPacket; -import java.net.DatagramSocketImpl; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; @@ -18,13 +17,10 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.LockSupport; -import org.kne.cloud.network.NetworkPacket; import org.kne.cloud.network.VirtualDatagramSocketImpl; import org.kne.cloud.network.ipv6.IPv6Address; import org.kne.cloud.network.ipv6.IPv6Packet; import org.kne.cloud.network.tcp.UDPPacket; -import org.kne.concurrent.HighPerformanceExecutor2; -import org.kne.io.KNEChannels; public class KLALBVirtualDatagramSocketImpl extends VirtualDatagramSocketImpl implements BindableConsumer{ diff --git a/src/org/kne/cloud/network/klalb/KLALBVirtualRawSocketImpl.java b/src/org/kne/cloud/network/klalb/KLALBVirtualRawSocketImpl.java index 9058558..933b103 100644 --- a/src/org/kne/cloud/network/klalb/KLALBVirtualRawSocketImpl.java +++ b/src/org/kne/cloud/network/klalb/KLALBVirtualRawSocketImpl.java @@ -16,25 +16,16 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.LockSupport; import java.util.function.BiConsumer; -import java.util.function.Consumer; import java.util.function.Supplier; -import org.kne.cloud.network.ByteBufferAllocator; -import org.kne.cloud.network.NetworkPacket; -import org.kne.cloud.network.RawSocketImpl; -import org.kne.cloud.network.ThreadTool; import org.kne.cloud.network.VirtualRawSocketImpl; import org.kne.cloud.network.ipv6.IPv6Packet; import org.kne.cloud.network.ipv6.IPv6Packet.IPv6DefaultPayload; -import org.kne.cloud.network.ipv6.IPv6Packet.IPv6Payload; import org.kne.cloud.network.ipv6.IPv6ProtocolRegister; import org.kne.cloud.network.ipv6.IPv6Address; import org.kne.cloud.network.ipv6.IPv6AddressGroup; import org.kne.cloud.network.ipv6.IPv6NetworkLink; import org.kne.cloud.network.ipv6.LoopbackIPv6NetworkLink; -import org.kne.cloud.network.srv6.IPv6PacketConsumer; -import org.kne.cloud.network.srv6.SRv6Router; -import org.kne.concurrent.HighPerformanceExecutor2; import org.kne.io.KNEChannels; public class KLALBVirtualRawSocketImpl extends VirtualRawSocketImpl implements IPv6ProtocolRegister{ diff --git a/src/org/kne/cloud/network/klalb/KLALBVirtualSocketChannel.java b/src/org/kne/cloud/network/klalb/KLALBVirtualSocketChannel.java index f25da9a..8e9a3fb 100644 --- a/src/org/kne/cloud/network/klalb/KLALBVirtualSocketChannel.java +++ b/src/org/kne/cloud/network/klalb/KLALBVirtualSocketChannel.java @@ -7,7 +7,6 @@ import java.net.SocketException; import java.net.SocketOption; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; -import java.nio.channels.spi.SelectorProvider; import java.util.Set; import org.kne.cloud.network.kltp.KLTPInputStream; import org.kne.cloud.network.kltp.KLTPOutputStream; diff --git a/src/org/kne/cloud/network/klalb/KLALBVirtualSocketImpl.java b/src/org/kne/cloud/network/klalb/KLALBVirtualSocketImpl.java index f2c7f21..c1ec57b 100644 --- a/src/org/kne/cloud/network/klalb/KLALBVirtualSocketImpl.java +++ b/src/org/kne/cloud/network/klalb/KLALBVirtualSocketImpl.java @@ -15,50 +15,15 @@ import java.net.SocketException; import java.net.SocketImpl; import java.net.SocketOptions; import java.net.SocketTimeoutException; -import java.nio.ByteBuffer; -import java.nio.channels.ReadableByteChannel; -import java.nio.channels.WritableByteChannel; -import java.util.Iterator; -import java.util.Map; -import java.util.TimerTask; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.LockSupport; -import java.util.concurrent.locks.ReentrantLock; -import java.util.zip.Deflater; -import java.util.zip.DeflaterOutputStream; -import java.util.zip.Inflater; -import java.util.zip.InflaterInputStream; -import org.kne.cloud.clock.HighAccuracyClock; -import org.kne.cloud.network.NetworkPacket; -import org.kne.cloud.network.PortPair; -import org.kne.cloud.network.SpeedLimiter; import org.kne.cloud.network.VirtualSocketImpl; -import org.kne.cloud.network.congestion.CongestionAlgorithm; -import org.kne.cloud.network.congestion.DCTCP2CongestionAlgorithm; -import org.kne.cloud.network.congestion.ReceivePacketSlidingWindow; -import org.kne.cloud.network.congestion.SendPacketSlidingWindow; import org.kne.cloud.network.ipv6.IPv6Address; -import org.kne.cloud.network.ipv6.PacketID; -import org.kne.cloud.network.ipv6.PacketIDGenerator; import org.kne.cloud.network.kltp.KLTPInputStream; import org.kne.cloud.network.kltp.KLTPOutputStream; import org.kne.cloud.network.kltp.KLTPSessionPacket; -import org.kne.cloud.network.monitor.SpeedAndTrafficAndDelayMonitorDataImpl; -import org.kne.concurrent.SpinLock; -import org.kne.concurrent.ThreadParker; -import org.kne.debug.TimeDebugger; -import com.github.f4b6a3.uuid.UuidCreator; - public class KLALBVirtualSocketImpl extends VirtualSocketImpl implements BindableConsumer{ private static final boolean debug = false; @@ -301,10 +266,6 @@ public class KLALBVirtualSocketImpl extends VirtualSocketImpl implements Bindabl } - @Override - protected void setPerformancePreferences(int connectionTime, int latency, int bandwidth) { - super.setPerformancePreferences(connectionTime, latency, bandwidth); - } @Override protected void close() throws IOException { diff --git a/src/org/kne/cloud/network/klalb/LineDecitionComparator.java b/src/org/kne/cloud/network/klalb/LineDecitionComparator.java index cc08954..a1e719c 100644 --- a/src/org/kne/cloud/network/klalb/LineDecitionComparator.java +++ b/src/org/kne/cloud/network/klalb/LineDecitionComparator.java @@ -1,12 +1,10 @@ package org.kne.cloud.network.klalb; -import java.net.SocketException; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; public class LineDecitionComparator implements Comparator { private Map predictedlatencys=new HashMap<>(); diff --git a/src/org/kne/cloud/network/klalb/PortBinder.java b/src/org/kne/cloud/network/klalb/PortBinder.java index 1e23c41..7bf70c4 100644 --- a/src/org/kne/cloud/network/klalb/PortBinder.java +++ b/src/org/kne/cloud/network/klalb/PortBinder.java @@ -1,26 +1,16 @@ package org.kne.cloud.network.klalb; import java.net.BindException; -import java.net.Inet6Address; -import java.net.InetAddress; import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.SocketTimeoutException; -import java.net.UnknownHostException; -import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.kne.cloud.network.IPv6SocketAddress; -import org.kne.cloud.network.NetworkPacket; import org.kne.cloud.network.ipv6.IPv6Address; import com.google.gson.internal.Pair; diff --git a/src/org/kne/cloud/network/klalb/StreamChannelKLALBPacketLink.java b/src/org/kne/cloud/network/klalb/StreamChannelKLALBPacketLink.java index b0be808..405dd65 100644 --- a/src/org/kne/cloud/network/klalb/StreamChannelKLALBPacketLink.java +++ b/src/org/kne/cloud/network/klalb/StreamChannelKLALBPacketLink.java @@ -1,39 +1,21 @@ package org.kne.cloud.network.klalb; -import java.io.BufferedOutputStream; -import java.io.EOFException; import java.io.IOException; -import java.io.InputStream; -import java.io.InterruptedIOException; import java.io.StreamCorruptedException; import java.net.InetSocketAddress; -import java.net.ProtocolFamily; -import java.net.Socket; import java.net.SocketException; -import java.net.SocketOption; -import java.net.SocketOptions; -import java.net.StandardProtocolFamily; import java.net.StandardSocketOptions; -import java.nio.Buffer; import java.nio.ByteBuffer; -import java.nio.channels.AsynchronousSocketChannel; import java.nio.channels.Channels; import java.nio.channels.GatheringByteChannel; -import java.nio.channels.ReadableByteChannel; import java.nio.channels.ScatteringByteChannel; import java.nio.channels.SocketChannel; -import java.nio.channels.WritableByteChannel; -import java.util.List; -import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.atomic.AtomicLong; import org.kne.cloud.network.BufferedChannel; -import org.kne.cloud.network.ByteBufferAllocator; import org.kne.cloud.network.MultipurposeSocketAddress; import org.kne.cloud.network.NetworkPacket; import org.kne.cloud.network.ThreadTool; -import org.kne.cloud.network.TimeoutTimer; import org.kne.io.KNEChannels; public class StreamChannelKLALBPacketLink extends AbstractKLALBPacketLink implements KLALBPacketLink { diff --git a/src/org/kne/cloud/network/klalb/ui/DialPanel.java b/src/org/kne/cloud/network/klalb/ui/DialPanel.java index 86b8c10..44974de 100644 --- a/src/org/kne/cloud/network/klalb/ui/DialPanel.java +++ b/src/org/kne/cloud/network/klalb/ui/DialPanel.java @@ -4,11 +4,7 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.GradientPaint; -import java.awt.geom.Point2D; -import java.awt.geom.Rectangle2D; -import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; @@ -24,7 +20,6 @@ import org.jfree.chart.plot.dial.StandardDialRange; import org.jfree.chart.plot.dial.StandardDialScale; import org.jfree.chart.title.TextTitle; import org.jfree.data.general.DefaultValueDataset; -import org.kne.cloud.network.klalb.KLALBUtils; import org.kne.ui.LinearGradientColor; public class DialPanel extends JPanel { diff --git a/src/org/kne/cloud/network/klalb/ui/KLALBStateGUI3.java b/src/org/kne/cloud/network/klalb/ui/KLALBStateGUI3.java index 5562369..c96998b 100644 --- a/src/org/kne/cloud/network/klalb/ui/KLALBStateGUI3.java +++ b/src/org/kne/cloud/network/klalb/ui/KLALBStateGUI3.java @@ -16,11 +16,7 @@ import javax.swing.border.LineBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import org.jfree.chart.ChartPanel; -import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.dial.*; -import org.jfree.chart.title.TextTitle; -import org.jfree.chart.ui.RectangleEdge; import org.jfree.data.general.DefaultValueDataset; import org.kne.cloud.clock.HighAccuracyClock; import org.kne.cloud.klalb.uitool.*; @@ -30,7 +26,6 @@ import org.kne.cloud.network.ipv6.IPv6NetworkLink; import org.kne.cloud.network.klalb.*; import org.kne.cloud.network.klalb.ui.GraphPanel.GraphNode; import org.kne.cloud.network.monitor.LinkStatus; -import org.kne.cloud.network.monitor.MonitorData; import org.kne.cloud.network.srv6.SRv6Router; import org.kne.ui.XFrame; import org.kne.ui.YScrollPane; diff --git a/src/org/kne/cloud/network/klalb/ui/KperfGUI.java b/src/org/kne/cloud/network/klalb/ui/KperfGUI.java index 9bcfa3b..e1f6e06 100644 --- a/src/org/kne/cloud/network/klalb/ui/KperfGUI.java +++ b/src/org/kne/cloud/network/klalb/ui/KperfGUI.java @@ -6,15 +6,7 @@ import java.awt.Dimension; import javax.swing.border.LineBorder; -import org.jfree.chart.ChartPanel; -import org.jfree.chart.JFreeChart; -import org.jfree.chart.plot.dial.DialPlot; -import org.jfree.chart.plot.dial.DialPointer; import org.jfree.chart.plot.dial.DialTextAnnotation; -import org.jfree.chart.plot.dial.StandardDialFrame; -import org.jfree.chart.plot.dial.StandardDialRange; -import org.jfree.chart.plot.dial.StandardDialScale; -import org.jfree.chart.ui.RectangleEdge; import org.jfree.data.general.DefaultValueDataset; import org.kne.cloud.network.MultipurposeSocketAddress; import org.kne.cloud.network.klalb.CONST; @@ -25,12 +17,10 @@ import org.kne.cloud.network.perf.KperfReports; import org.kne.ui.XFrame; import javax.swing.JTabbedPane; import java.awt.BorderLayout; -import javax.swing.JMenuBar; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.JButton; -import javax.swing.JMenu; import java.awt.GridLayout; import java.awt.Image; @@ -44,7 +34,6 @@ import java.util.TimerTask; import java.awt.event.ActionEvent; import javax.swing.JLabel; import javax.imageio.ImageIO; -import javax.swing.BoxLayout; import java.awt.Font; import javax.swing.SwingConstants; import javax.swing.ImageIcon; diff --git a/src/org/kne/cloud/network/klalb/ui/LineMonitorGUI.java b/src/org/kne/cloud/network/klalb/ui/LineMonitorGUI.java index ec9b4d5..1cbfe79 100644 --- a/src/org/kne/cloud/network/klalb/ui/LineMonitorGUI.java +++ b/src/org/kne/cloud/network/klalb/ui/LineMonitorGUI.java @@ -1,32 +1,21 @@ package org.kne.cloud.network.klalb.ui; import java.awt.Color; -import java.awt.Component; import java.awt.Dimension; import java.awt.GridLayout; -import java.awt.Image; -import java.awt.Stroke; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.net.Inet6Address; import java.util.Date; import java.util.Timer; import java.util.TimerTask; import java.util.UUID; -import javax.imageio.ImageIO; import javax.swing.JPanel; import javax.swing.border.LineBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.jfree.chart.ChartFactory; -import org.jfree.chart.ChartPanel; -import org.jfree.chart.ChartRenderingInfo; import org.jfree.chart.JFreeChart; import org.jfree.data.time.Millisecond; -import org.jfree.data.time.RegularTimePeriod; -import org.jfree.data.time.TimePeriod; import org.jfree.data.time.TimeSeries; import org.jfree.data.time.TimeSeriesCollection; import org.kne.cloud.network.congestion.SendPacketSlidingWindow; @@ -35,7 +24,6 @@ import org.kne.cloud.network.ipv6.IPv6AddressGroup; import org.kne.cloud.network.ipv6.IPv6Packet; import org.kne.cloud.network.klalb.KLALBRemoteLink; import org.kne.cloud.network.monitor.LinkStatus; -import org.kne.cloud.network.monitor.MonitorData; import org.kne.cloud.network.monitor.TimestampMonitorValue; import org.kne.math.Long128; import org.kne.ui.XFrame; @@ -45,14 +33,8 @@ import java.awt.BorderLayout; import javax.swing.ImageIcon; import javax.swing.JLabel; -import javax.swing.JTextField; -import javax.swing.JButton; -import java.awt.event.ActionListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; -import java.awt.event.ActionEvent; -import java.awt.Font; -import javax.swing.SwingConstants; import javax.swing.JSlider; public class LineMonitorGUI extends XFrame { diff --git a/src/org/kne/cloud/network/klalb/ui/TPanel2.java b/src/org/kne/cloud/network/klalb/ui/TPanel2.java index 853cce1..eaac332 100644 --- a/src/org/kne/cloud/network/klalb/ui/TPanel2.java +++ b/src/org/kne/cloud/network/klalb/ui/TPanel2.java @@ -3,7 +3,6 @@ package org.kne.cloud.network.klalb.ui; import javax.swing.JPanel; import javax.swing.JLabel; import java.awt.BorderLayout; -import java.awt.Button; import java.awt.Color; import java.awt.Dimension; @@ -11,28 +10,22 @@ import javax.swing.SwingConstants; import javax.swing.border.LineBorder; import org.kne.cloud.network.MultipurposeSocketAddress; -import org.kne.cloud.network.ipv6.IPv6Address; import org.kne.cloud.network.ipv6.IPv6AddressGroup; import org.kne.cloud.network.klalb.CONST; import org.kne.cloud.network.klalb.KLALBController; import org.kne.cloud.network.klalb.KLALBRemoteLink; import org.kne.cloud.network.klalb.KLALBUtils; import org.kne.cloud.network.monitor.LinkStatus; -import org.kne.cloud.network.monitor.MonitorData; import java.awt.Font; import java.awt.Image; -import java.awt.MenuItem; import java.awt.Toolkit; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.awt.image.BufferedImage; import java.io.IOException; -import java.net.Inet6Address; -import java.net.SocketTimeoutException; import java.util.Objects; import javax.imageio.ImageIO; diff --git a/src/org/kne/cloud/network/klalb/ui/UIEnv.java b/src/org/kne/cloud/network/klalb/ui/UIEnv.java index db4d307..eabfc6b 100644 --- a/src/org/kne/cloud/network/klalb/ui/UIEnv.java +++ b/src/org/kne/cloud/network/klalb/ui/UIEnv.java @@ -1,26 +1,15 @@ package org.kne.cloud.network.klalb.ui; import java.awt.Color; -import java.awt.Cursor; import java.awt.Font; -import java.awt.FontFormatException; import java.awt.Image; -import java.awt.Point; import java.awt.Toolkit; -import java.awt.geom.AffineTransform; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; import java.util.PropertyResourceBundle; import java.util.ResourceBundle; import javax.swing.JButton; -import javax.swing.JColorChooser; import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.plaf.ColorChooserUI; import org.kne.ui.LinearGradientColor; public class UIEnv { diff --git a/src/org/kne/cloud/network/monitor/ArrayListTimestampMonitor.java b/src/org/kne/cloud/network/monitor/ArrayListTimestampMonitor.java index 5be964b..a3549e0 100644 --- a/src/org/kne/cloud/network/monitor/ArrayListTimestampMonitor.java +++ b/src/org/kne/cloud/network/monitor/ArrayListTimestampMonitor.java @@ -1,13 +1,10 @@ package org.kne.cloud.network.monitor; -import java.math.BigInteger; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/src/org/kne/cloud/network/monitor/HashMapTimestampMonitor.java b/src/org/kne/cloud/network/monitor/HashMapTimestampMonitor.java index 5b5db86..b786b03 100644 --- a/src/org/kne/cloud/network/monitor/HashMapTimestampMonitor.java +++ b/src/org/kne/cloud/network/monitor/HashMapTimestampMonitor.java @@ -1,14 +1,9 @@ package org.kne.cloud.network.monitor; -import java.math.BigInteger; -import java.util.List; -import java.util.Map; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.LongAdder; -import java.util.stream.Collectors; import org.kne.cloud.clock.HighAccuracyClock; import org.kne.cloud.network.klalb.KLALBUtils; diff --git a/src/org/kne/cloud/network/monitor/MonitorDataImpl.java b/src/org/kne/cloud/network/monitor/MonitorDataImpl.java index bb71434..2bfc368 100644 --- a/src/org/kne/cloud/network/monitor/MonitorDataImpl.java +++ b/src/org/kne/cloud/network/monitor/MonitorDataImpl.java @@ -1,7 +1,5 @@ package org.kne.cloud.network.monitor; -import java.util.Timer; -import java.util.TimerTask; import java.util.function.Consumer; diff --git a/src/org/kne/cloud/network/monitor/SpeedAndTrafficAndDelayMonitorDataImpl.java b/src/org/kne/cloud/network/monitor/SpeedAndTrafficAndDelayMonitorDataImpl.java index 2d3a617..19cfc4d 100644 --- a/src/org/kne/cloud/network/monitor/SpeedAndTrafficAndDelayMonitorDataImpl.java +++ b/src/org/kne/cloud/network/monitor/SpeedAndTrafficAndDelayMonitorDataImpl.java @@ -1,10 +1,8 @@ package org.kne.cloud.network.monitor; -import java.util.TimerTask; import java.util.UUID; import org.kne.cloud.clock.HighAccuracyClock; -import org.kne.cloud.network.ipv6.PacketID; import org.kne.cloud.network.klalb.KLALBUtils; public class SpeedAndTrafficAndDelayMonitorDataImpl extends SpeedAndTrafficMonitorDataImpl implements SpeedAndTrafficMonitorData,DelayMonitorData{ diff --git a/src/org/kne/cloud/network/monitor/SpeedAndTrafficMonitorDataImpl.java b/src/org/kne/cloud/network/monitor/SpeedAndTrafficMonitorDataImpl.java index d3d9760..0b5457f 100644 --- a/src/org/kne/cloud/network/monitor/SpeedAndTrafficMonitorDataImpl.java +++ b/src/org/kne/cloud/network/monitor/SpeedAndTrafficMonitorDataImpl.java @@ -1,12 +1,8 @@ package org.kne.cloud.network.monitor; -import java.util.TimerTask; import java.util.UUID; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.LongAdder; import org.kne.cloud.clock.HighAccuracyClock; -import org.kne.cloud.network.ipv6.PacketID; import org.kne.cloud.network.klalb.KLALBUtils; public class SpeedAndTrafficMonitorDataImpl extends MonitorDataImpl implements SpeedAndTrafficMonitorData { diff --git a/src/org/kne/cloud/network/monitor/TimestampMonitorValue.java b/src/org/kne/cloud/network/monitor/TimestampMonitorValue.java index 15cb144..c9d06c4 100644 --- a/src/org/kne/cloud/network/monitor/TimestampMonitorValue.java +++ b/src/org/kne/cloud/network/monitor/TimestampMonitorValue.java @@ -1,7 +1,5 @@ package org.kne.cloud.network.monitor; -import java.math.BigInteger; - import org.kne.math.Long128; public class TimestampMonitorValue implements Comparable { diff --git a/src/org/kne/cloud/network/ntp/NTPContext.java b/src/org/kne/cloud/network/ntp/NTPContext.java index bfb0809..4afac3d 100644 --- a/src/org/kne/cloud/network/ntp/NTPContext.java +++ b/src/org/kne/cloud/network/ntp/NTPContext.java @@ -3,8 +3,6 @@ package org.kne.cloud.network.ntp; import java.io.Closeable; import java.io.IOException; import java.math.BigDecimal; -import java.net.InetSocketAddress; -import java.security.Timestamp; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -16,13 +14,8 @@ import java.util.Map.Entry; import java.util.Set; import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.ReentrantLock; -import org.fusesource.jansi.io.AnsiOutputStream.ZeroWidthSupplier; import org.kne.cloud.clock.HighAccuracyClock; import org.kne.cloud.clock.NTPTimestamps; import org.kne.cloud.network.MultipurposeSocketAddress; diff --git a/src/org/kne/cloud/network/ntp/NTPv4Protocol.java b/src/org/kne/cloud/network/ntp/NTPv4Protocol.java index 2df1c10..a27d895 100644 --- a/src/org/kne/cloud/network/ntp/NTPv4Protocol.java +++ b/src/org/kne/cloud/network/ntp/NTPv4Protocol.java @@ -2,7 +2,6 @@ package org.kne.cloud.network.ntp; import java.io.Closeable; import java.io.IOException; -import java.math.BigInteger; import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetSocketAddress; @@ -14,10 +13,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/org/kne/cloud/network/perf/Kperf.java b/src/org/kne/cloud/network/perf/Kperf.java index d3e2a48..ae2f604 100644 --- a/src/org/kne/cloud/network/perf/Kperf.java +++ b/src/org/kne/cloud/network/perf/Kperf.java @@ -16,10 +16,8 @@ import org.kne.cloud.network.klalb.KLALBUtils; import org.kne.cloud.network.klalb.PINGPacket; import org.kne.cloud.network.klalb.PONGPacket; import org.kne.cloud.network.monitor.LinkStatus; -import org.kne.cloud.network.monitor.MonitorData; import org.kne.cloud.network.monitor.SpeedAndTrafficAndDelayMonitorDataImpl; import org.kne.concurrent.ThreadParker; -import org.kne.concurrent.ThreadYieldCheckpoint; public class Kperf implements Runnable{ diff --git a/src/org/kne/cloud/network/perf/NodeBenchmark.java b/src/org/kne/cloud/network/perf/NodeBenchmark.java index b3538fd..aaf3cab 100644 --- a/src/org/kne/cloud/network/perf/NodeBenchmark.java +++ b/src/org/kne/cloud/network/perf/NodeBenchmark.java @@ -4,9 +4,7 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.nio.channels.ServerSocketChannel; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Random; import org.kne.cloud.network.MultipurposeSocketAddress; diff --git a/src/org/kne/cloud/network/srv6/IPv6PacketConsumer.java b/src/org/kne/cloud/network/srv6/IPv6PacketConsumer.java index 3233cf9..86e815f 100644 --- a/src/org/kne/cloud/network/srv6/IPv6PacketConsumer.java +++ b/src/org/kne/cloud/network/srv6/IPv6PacketConsumer.java @@ -3,7 +3,6 @@ package org.kne.cloud.network.srv6; import java.io.IOException; import org.kne.cloud.network.ipv6.IPv6Packet; -import org.pcap4j.packet.IpV6Packet; public interface IPv6PacketConsumer { public void accept(IPv6Packet packx)throws IOException; diff --git a/src/org/kne/cloud/network/srv6/KLALBRoutingProtocol.java b/src/org/kne/cloud/network/srv6/KLALBRoutingProtocol.java index e22de51..db71a24 100644 --- a/src/org/kne/cloud/network/srv6/KLALBRoutingProtocol.java +++ b/src/org/kne/cloud/network/srv6/KLALBRoutingProtocol.java @@ -2,22 +2,15 @@ package org.kne.cloud.network.srv6; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.net.BindException; import java.net.DatagramPacket; -import java.net.DatagramSocket; import java.net.Inet6Address; -import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.SocketException; import java.nio.channels.Channels; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -30,9 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.locks.ReentrantLock; import java.util.function.BiConsumer; -import java.util.function.Consumer; -import org.kne.cloud.network.ByteBufferAllocator; import org.kne.cloud.network.ipv6.IPv6Address; import org.kne.cloud.network.ipv6.IPv6NetworkLink; import org.kne.cloud.network.ipv6.IPv6Packet.IPv6SegmentRoutingHeader; @@ -44,12 +35,8 @@ import org.kne.cloud.network.monitor.MonitorData; import org.kne.cloud.network.monitor.SpeedAndTrafficAndDelayMonitorDataImpl; import org.kne.cloud.network.monitor.SpeedAndTrafficMonitorData; import org.kne.cloud.network.monitor.SpeedAndTrafficMonitorDataImpl; -import org.kne.cloud.network.scanner.InetAddressRange; -import org.kne.cloud.network.te.BandwidthDistributer; import org.kne.membandboost.MembandBoost; -import com.google.gson.internal.Pair; - public class KLALBRoutingProtocol extends Thread{ private static final boolean debug = false; diff --git a/src/org/kne/cloud/network/srv6/KLALBRoutingProtocolAPIClient.java b/src/org/kne/cloud/network/srv6/KLALBRoutingProtocolAPIClient.java index 666bc71..4b0df24 100644 --- a/src/org/kne/cloud/network/srv6/KLALBRoutingProtocolAPIClient.java +++ b/src/org/kne/cloud/network/srv6/KLALBRoutingProtocolAPIClient.java @@ -11,8 +11,6 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import org.kne.cloud.network.MultipurposeSocketAddress; -import org.kne.cloud.network.ThreadTool; -import org.kne.cloud.network.congestion.DCTCPCongestionAlgorithm; import org.kne.cloud.network.congestion.NOCongestionAlgorithm; import org.kne.cloud.network.congestion.SendPacketSlidingWindow; import org.kne.opencl64.Releaser; diff --git a/src/org/kne/cloud/network/srv6/PacketReorder.java b/src/org/kne/cloud/network/srv6/PacketReorder.java index 3efd6c4..fa89055 100644 --- a/src/org/kne/cloud/network/srv6/PacketReorder.java +++ b/src/org/kne/cloud/network/srv6/PacketReorder.java @@ -5,11 +5,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Consumer; import org.kne.cloud.network.ipv6.IPv6Packet; -import org.pcap4j.packet.IpV6Packet; -import org.pcap4j.packet.TcpPacket; public class PacketReorder { public PacketReorder(long sequenceNumber) { diff --git a/src/org/kne/cloud/network/srv6/SRv6Router.java b/src/org/kne/cloud/network/srv6/SRv6Router.java index 52ba041..08daeec 100644 --- a/src/org/kne/cloud/network/srv6/SRv6Router.java +++ b/src/org/kne/cloud/network/srv6/SRv6Router.java @@ -11,37 +11,22 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; import java.util.Set; import java.util.Timer; import java.util.TimerTask; import java.util.UUID; -import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Supplier; -import javax.swing.plaf.synth.SynthOptionPaneUI; - -import org.jctools.counters.CountersFactory; import org.jctools.counters.FixedSizeStripedLongCounter; import org.kne.cloud.clock.HighAccuracyClock; -import org.kne.cloud.network.ThreadTool; -import org.kne.cloud.network.congestion.ArrayListMessageBatcher; import org.kne.cloud.network.congestion.MessageBatcher; import org.kne.cloud.network.ipv6.ControlledIPv6NetworkLink; -import org.kne.cloud.network.ipv6.FlowSession; -import org.kne.cloud.network.ipv6.ICMPv6Packet; import org.kne.cloud.network.ipv6.ICMPv6PostcardPacket; import org.kne.cloud.network.ipv6.ICMPv6TimeExceededPacket; import org.kne.cloud.network.ipv6.IPv6Address; @@ -51,25 +36,20 @@ import org.kne.cloud.network.ipv6.IPv6NetworkLink; import org.kne.cloud.network.ipv6.IPv6Packet; import org.kne.cloud.network.ipv6.IPv6Packet.IPv6HopByHopHeader; import org.kne.cloud.network.ipv6.IPv6Packet.IPv6SegmentRoutingHeader; -import org.kne.cloud.network.ipv6.IPv6TUNLoopbackNetworkLink; import org.kne.cloud.network.ipv6.IPv6AddressGroup; import org.kne.cloud.network.ipv6.KLALBOAMHopByHopTLV; import org.kne.cloud.network.ipv6.KLALBPassportHopByHopTLV; import org.kne.cloud.network.ipv6.LoopbackIPv6NetworkLink; import org.kne.cloud.network.ipv6.Neighbor; -import org.kne.cloud.network.ipv6.PacketID; -import org.kne.cloud.network.ipv6.PacketIDGenerator; import org.kne.cloud.network.ipv6.PadNHopByHopTLV; import org.kne.cloud.network.ipv6.PostcardEntry; import org.kne.cloud.network.ipv6.RouteItem; import org.kne.cloud.network.klalb.KLALBRemoteLink; import org.kne.cloud.network.klalb.KLALBUtils; -import org.kne.cloud.network.monitor.BandwidthSampler; import org.kne.concurrent.HighPerformanceExecutor2; import org.kne.concurrent.TimeoutConcurrentHashMap; import org.pcap4j.packet.IllegalRawDataException; -import com.github.f4b6a3.uuid.UuidCreator; import com.google.gson.internal.Pair; // SRv6路由器主类,实现IPv6段路由功能 diff --git a/src/org/kne/cloud/network/srv6/SlidingWindowInformation.java b/src/org/kne/cloud/network/srv6/SlidingWindowInformation.java index 2afb764..8c30d90 100644 --- a/src/org/kne/cloud/network/srv6/SlidingWindowInformation.java +++ b/src/org/kne/cloud/network/srv6/SlidingWindowInformation.java @@ -5,11 +5,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Consumer; import org.kne.cloud.network.ipv6.IPv6Packet; -import org.pcap4j.packet.IpV6Packet; -import org.pcap4j.packet.TcpPacket; public class SlidingWindowInformation { public SlidingWindowInformation(long sequenceNumber) { diff --git a/src/org/kne/cloud/network/srv6/TCPTransimitAgent.java b/src/org/kne/cloud/network/srv6/TCPTransimitAgent.java index 0807cfd..6323df9 100644 --- a/src/org/kne/cloud/network/srv6/TCPTransimitAgent.java +++ b/src/org/kne/cloud/network/srv6/TCPTransimitAgent.java @@ -1,20 +1,14 @@ package org.kne.cloud.network.srv6; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Consumer; import org.kne.cloud.network.ipv6.IPv6Packet; -import org.pcap4j.packet.IpV6Packet; -import org.pcap4j.packet.TcpPacket; public class TCPTransimitAgent { public TCPTransimitAgent() { diff --git a/src/org/kne/cloud/network/tcp/TCPPacket.java b/src/org/kne/cloud/network/tcp/TCPPacket.java index 54cff0f..f55cb55 100644 --- a/src/org/kne/cloud/network/tcp/TCPPacket.java +++ b/src/org/kne/cloud/network/tcp/TCPPacket.java @@ -10,7 +10,6 @@ import java.util.List; import org.kne.cloud.network.NetworkPacket; import org.kne.cloud.network.ipv6.IPv6Packet.IPv6DefaultPayload; -import org.kne.cloud.network.ipv6.IPv6Packet.IPv6Payload; public class TCPPacket extends IPv6DefaultPayload { public static final int TCP_PROTOCOL_NUMBER = 6; diff --git a/src/org/kne/cloud/network/tcp/UDPPacket.java b/src/org/kne/cloud/network/tcp/UDPPacket.java index 46b9712..3a1fb76 100644 --- a/src/org/kne/cloud/network/tcp/UDPPacket.java +++ b/src/org/kne/cloud/network/tcp/UDPPacket.java @@ -1,16 +1,12 @@ package org.kne.cloud.network.tcp; -import java.io.EOFException; import java.io.IOException; -import java.net.Inet6Address; -import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; import java.util.Arrays; import org.kne.cloud.network.NetworkPacket; -import org.kne.cloud.network.ipv6.IPv6Packet; import org.kne.cloud.network.ipv6.IPv6Packet.IPv6Payload; import org.kne.cloud.network.klalb.PortPacket; import org.kne.io.KNEChannels; diff --git a/src/org/kne/cloud/network/te/DWRRLoadingBalanceAlgorithm.java b/src/org/kne/cloud/network/te/DWRRLoadingBalanceAlgorithm.java index 4685a94..a457d2d 100644 --- a/src/org/kne/cloud/network/te/DWRRLoadingBalanceAlgorithm.java +++ b/src/org/kne/cloud/network/te/DWRRLoadingBalanceAlgorithm.java @@ -1,11 +1,7 @@ package org.kne.cloud.network.te; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.Random; - -import org.kne.cloud.network.klalb.KLALBRemoteLink; public class DWRRLoadingBalanceAlgorithm> { private Listentries;