diff --git a/.classpath b/.classpath index 60354f2..ed3f8eb 100644 --- a/.classpath +++ b/.classpath @@ -1,33 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 28ee0a9..746bc9d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/KLALB.iml b/KLALB.iml index 717bc29..493b3cc 100644 --- a/KLALB.iml +++ b/KLALB.iml @@ -249,5 +249,6 @@ + \ No newline at end of file diff --git a/client.cfg b/client.cfg deleted file mode 100644 index f61a830..0000000 --- a/client.cfg +++ /dev/null @@ -1,20 +0,0 @@ -//加速线路 -{KLALBRemote}->43.248.189.107:35000 -{KLALBRemote}->cn-bj-bgp-3.openfrp.top:65529 -{KLALBRemote}->180.76.147.250:65529 -{KLALBRemote}->cn-ah-dx-1.natfrp.cloud:65529 -{KLALBRemote}->cn-nn-dx-1.natfrp.cloud:65529 -{KLALBRemote}->cn-wh-dx-1.natfrp.cloud:65529 -{KLALBRemote}->cn-zz-bgp-10.natfrp.cloud:23330 -{KLALBRemote}->cn-zz-bgp-7.natfrp.cloud:33336 -{KLALBRemote}->43.143.109.64:49965 -{KLALBRemote}->frp.104300.xyz:49965 -{KLALBRemote}->us.afrps.cn:49966 -{KLALBRemote}->hk.afrps.cn:49966 -{KLALBRemote}->la.afrps.cn:49966 -{KLALBRemote}->frp.freefrp.net:49965 -{KLALBRemote}->frp1.freefrp.net:49965 -{KLALBRemote}->frp2.freefrp.net:49965 -{KLALBRemote}->frp4.freefrp.net:49965 - -0.0.0.0:25565->{KLALBVirtual}[171d:a999:e697:4b23:ae52:9f29:4532:e1ee]:25565 \ No newline at end of file diff --git a/fastcopy.dll b/fastcopy.dll deleted file mode 100644 index 7e08bef..0000000 Binary files a/fastcopy.dll and /dev/null differ diff --git a/klalbconfig-old.json b/klalbconfig-old.json deleted file mode 100644 index 99629f9..0000000 --- a/klalbconfig-old.json +++ /dev/null @@ -1,79 +0,0 @@ -[ - {"Type":"KLALBController" , - "TCPListen" : "0.0.0.0:4565", - "UDPListen" : "{UDP}0.0.0.0:4572", - "VirtualSocketName" : "KLALB_Stream", - "LineTable":["43.248.189.107:65529", -"cn-bj-bgp-3.openfrp.top:65529", -"180.76.147.250:65529", -"cn-ah-dx-1.natfrp.cloud:65529", -"cn-nn-dx-1.natfrp.cloud:65529", -"cn-wh-dx-1.natfrp.cloud:65529", -"cn-zz-bgp-10.natfrp.cloud:23330", -"cn-zz-bgp-7.natfrp.cloud:33336", -"43.143.109.64:49965", -"frp.104300.xyz:49965", -"us.afrps.cn:49966", -"hk.afrps.cn:49966", -"la.afrps.cn:49966", -"frp.freefrp.net:49965", -"frp1.freefrp.net:49965", -"frp2.freefrp.net:49965", -"frp4.freefrp.net:49965", -"cn-he-plc-2.openfrp.top:4572", -"{UDP}cn-he-plc-2.openfrp.top:4572", -"frp-mom.top:22226", -"frp-man.top:36555", -"us-sjc-bgp-2.openfrp.top:36555", -"us-sjc-bgp-1.openfrp.top:36555", -"[240e:340:d856:b700:6d02:6a6a:f9fc:865b]:4572"] - }, - {"Type":"SocketBridge" , - "Listen" : "0.0.0.0:4572", -"Bridge":{ - "KLALB" : "SocketBridge", - "RDP":"SocketBridge", - "HTTP":"SocketBridge", - "HTTPS":"SocketBridge", - "DEFAULT":"MinecraftSocketBridge23332" - } , - "Connect" : { - "KLALB" : "127.0.0.1:4565", - "RDP":"127.0.0.1:3389", - "HTTP":"127.0.0.1:5212", - "HTTPS":"192.168.1.235:443", - "DEFAULT":"127.0.0.1:36555" - } - }, - {"Type":"SocketBridge" , - "Listen" : "{KLALB_Stream}[::0]:23332", -"Bridge":"MinecraftSocketBridge23332", - "Connect" : "127.0.0.1:36555" - }, - { "Type":"SocketBridge" , - "Listen" : "{KLALB_Stream}[::0]:23333", -"Bridge":"SocketBridge", - "Connect" : "127.0.0.1:5212" - }, - - - - - - {"Type":"SocketBridge" , - "Listen" : "0.0.0.0:25561", -"Bridge":{ - "KLALB" : "SocketBridge", - "DEFAULT":"MinecraftSocketBridge23330" - } , - "Connect" : { - "KLALB" : "127.0.0.1:4565", - "DEFAULT":"127.0.0.1:25562" - } - }, - {"Type":"SocketBridge" , - "Listen" : "{KLALB_Stream}[::0]:23330", -"Bridge":"MinecraftSocketBridge23330", - "Connect" : "127.0.0.1:25562" - } -] \ No newline at end of file diff --git a/lib/JFreeChart1.5.2.jar b/lib/JFreeChart1.5.2.jar deleted file mode 100644 index 1cb0ee2..0000000 Binary files a/lib/JFreeChart1.5.2.jar and /dev/null differ diff --git a/lib/KNEOptimize.jar b/lib/KNEOptimize.jar index a31c251..e4e0065 100644 Binary files a/lib/KNEOptimize.jar and b/lib/KNEOptimize.jar differ diff --git a/lines.cfg b/lines.cfg deleted file mode 100644 index 64f20cf..0000000 --- a/lines.cfg +++ /dev/null @@ -1,29 +0,0 @@ -0.0.0.0:35000(RDP)->192.168.1.233:3389 -0.0.0.0:35000(HTTPS)->192.168.1.233:8444 -0.0.0.0:35000(HTTP)->192.168.1.233:5212 -0.0.0.0:35000(SSH)->192.168.1.236:22 -0.0.0.0:35000(KLALB)->{KLALBRemote} -0.0.0.0:35000->127.0.0.1:35001 //Winds服(普通线路) - -{KLALBVirtual}[::0]:25565->127.0.0.1:35001 //Winds服(加速线路) - -//加速线路 -{KLALBRemote}->43.248.189.107:35000 -{KLALBRemote}->cn-bj-bgp-3.openfrp.top:65529 -{KLALBRemote}->180.76.147.250:65529 -{KLALBRemote}->cn-ah-dx-1.natfrp.cloud:65529 -{KLALBRemote}->cn-nn-dx-1.natfrp.cloud:65529 -{KLALBRemote}->cn-wh-dx-1.natfrp.cloud:65529 -{KLALBRemote}->cn-zz-bgp-10.natfrp.cloud:23330 -{KLALBRemote}->cn-zz-bgp-7.natfrp.cloud:33336 -{KLALBRemote}->43.143.109.64:49965 -{KLALBRemote}->frp.104300.xyz:49965 -{KLALBRemote}->us.afrps.cn:49966 -{KLALBRemote}->hk.afrps.cn:49966 -{KLALBRemote}->la.afrps.cn:49966 -{KLALBRemote}->frp.freefrp.net:49965 -{KLALBRemote}->frp1.freefrp.net:49965 -{KLALBRemote}->frp2.freefrp.net:49965 -{KLALBRemote}->frp4.freefrp.net:49965 - -0.0.0.0:25565->{KLALBVirtual}[171d:a999:e697:4b23:ae52:9f29:4532:e1ee]:25565 \ No newline at end of file diff --git a/linetable - 副本.txt b/linetable - 副本.txt deleted file mode 100644 index b1682b2..0000000 --- a/linetable - 副本.txt +++ /dev/null @@ -1,18 +0,0 @@ -43.248.189.107:65529 -cn-bj-bgp-3.openfrp.top:65529 -180.76.147.250:65529 -cn-ah-dx-1.natfrp.cloud:65529 -cn-nn-dx-1.natfrp.cloud:65529 -cn-wh-dx-1.natfrp.cloud:65529 -cn-zz-bgp-10.natfrp.cloud:23330 -cn-zz-bgp-7.natfrp.cloud:33336 -43.143.109.64:49965 -frp.104300.xyz:49965 -us.afrps.cn:49966 -hk.afrps.cn:49966 -la.afrps.cn:49966 -frp.freefrp.net:49965 -frp1.freefrp.net:49965 -frp2.freefrp.net:49965 -frp4.freefrp.net:49965 -cn-he-plc-2.openfrp.top:4569 \ No newline at end of file diff --git a/linetable.txt b/linetable.txt deleted file mode 100644 index e69de29..0000000 diff --git a/server.cfg b/server.cfg deleted file mode 100644 index bbaf70b..0000000 --- a/server.cfg +++ /dev/null @@ -1,8 +0,0 @@ -0.0.0.0:35000(RDP)->192.168.1.233:3389 -0.0.0.0:35000(HTTPS)->192.168.1.233:8444 -0.0.0.0:35000(HTTP)->192.168.1.233:5212 -0.0.0.0:35000(SSH)->192.168.1.236:22 -0.0.0.0:35000(KLALB)->{KLALBRemote} -0.0.0.0:35000->127.0.0.1:35001 //Winds服(普通线路) - -{KLALBVirtual}[::0]:25565->127.0.0.1:35001 //Winds服(加速线路) \ No newline at end of file diff --git a/src/org/kne/cloud/network/klalb/CONST.java b/src/org/kne/cloud/network/klalb/CONST.java index fbddc50..b85229d 100644 --- a/src/org/kne/cloud/network/klalb/CONST.java +++ b/src/org/kne/cloud/network/klalb/CONST.java @@ -12,7 +12,7 @@ public class CONST { public static final String KLALB_S_RV6 = "KLALB_SRv6"; - + public static final String KLTP_VIRTUAL_SOCKET_NAME="kltp"; public static final int itemwidth = 1000; public static final int linepanelheight = 41; diff --git a/src/org/kne/cloud/network/klalb/KLALBController.java b/src/org/kne/cloud/network/klalb/KLALBController.java index dd6a8e1..0b7110d 100644 --- a/src/org/kne/cloud/network/klalb/KLALBController.java +++ b/src/org/kne/cloud/network/klalb/KLALBController.java @@ -684,7 +684,7 @@ public class KLALBController { // System.out.println(context); try { NTPv4Protocol nvc = new NTPv4Protocol(context, - new MultiProtocolSocketAddress(iproxyname + "_Datagram","0.0.0.0",123)); + new MultiProtocolSocketAddress(iproxyname + "datagram","0.0.0.0",123)); srv6Router.addSRv6RouterListener(new SRv6RouterListener() { @Override @@ -695,7 +695,7 @@ public class KLALBController { for (Neighbor neighbor : nb) { if (neighbor.getLocator() != null) sp.add(new NTPPeer( - new MultiProtocolSocketAddress(iproxyname + "_Datagram", + new MultiProtocolSocketAddress(iproxyname + "datagram", neighbor.getLocator().getAddress().toString(), 123), NTPv4Packet.NTP_SYMMETRIC_ACTIVE)); @@ -975,8 +975,8 @@ public class KLALBController { public void registerToProxyTypeAs(String proxyname) { - MultiProtocolSocketAddress.getSocketTypeRegister().put(proxyname + "_Stream", streamSocketType); - MultiProtocolSocketAddress.getSocketTypeRegister().put(proxyname + "_Datagram", datagramSocketType); + MultiProtocolSocketAddress.getSocketTypeRegister().put(proxyname + "stream", streamSocketType); + MultiProtocolSocketAddress.getSocketTypeRegister().put(proxyname + "datagram", datagramSocketType); // ProxyProfileEntry.getRegister().put(proxyname, this); } diff --git a/src/org/kne/cloud/network/klalb/KLALBControllerConfigItem.java b/src/org/kne/cloud/network/klalb/KLALBControllerConfigItem.java index 9b7966a..0063120 100644 --- a/src/org/kne/cloud/network/klalb/KLALBControllerConfigItem.java +++ b/src/org/kne/cloud/network/klalb/KLALBControllerConfigItem.java @@ -15,7 +15,7 @@ public class KLALBControllerConfigItem extends KLALBConfigItem { private List DNS; private MultiProtocolSocketAddress TCPListen=new MultiProtocolSocketAddress("0.0.0.0",4565); private MultiProtocolSocketAddress UDPListen=new MultiProtocolSocketAddress("udp","0.0.0.0",4565); - private String VirtualSocketName; + private String VirtualSocketName=CONST.KLTP_VIRTUAL_SOCKET_NAME; private ListLineTable=new ArrayList<>(); private ListConnectLineTable=new ArrayList<>(); private ListntpServerTable=new ArrayList<>(); diff --git a/src/org/kne/cloud/network/klalb/KLALBMain.java b/src/org/kne/cloud/network/klalb/KLALBMain.java index a3e9f66..31b6d39 100644 --- a/src/org/kne/cloud/network/klalb/KLALBMain.java +++ b/src/org/kne/cloud/network/klalb/KLALBMain.java @@ -22,8 +22,7 @@ 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.TimeDebugger; -import org.kne.membandboost.MembandBenchmark; -import org.kne.membandboost.ObjectPoolBandwidthTest; +import org.kne.membandboost.benchmark.*;; public class KLALBMain { public static KLALBStateGUI3 ksg; @@ -200,10 +199,6 @@ public class KLALBMain { case "membandbenchmark": MembandBenchmark.main(args); break; - case "memqueuebenchmark": - - ObjectPoolBandwidthTest.main(args); - break; //case "$$SYSTEM:": //System.out.println(); //break; diff --git a/src/org/kne/cloud/network/klalb/KLALBProxySystem.java b/src/org/kne/cloud/network/klalb/KLALBProxySystem.java index d1200ef..39a8407 100644 --- a/src/org/kne/cloud/network/klalb/KLALBProxySystem.java +++ b/src/org/kne/cloud/network/klalb/KLALBProxySystem.java @@ -131,9 +131,11 @@ public class KLALBProxySystem { String vsne=kcci.getVirtualSocketName(); - //if(vsne!=null) { + if(vsne!=null) { MultiProtocolSocketAddress.getSocketTypeRegister().put(vsne, klalbController.getStreamSocketType()); - //} + }else{ + MultiProtocolSocketAddress.getSocketTypeRegister().put(CONST.KLTP_VIRTUAL_SOCKET_NAME, klalbController.getStreamSocketType()); + } MultiProtocolSocketAddress tcple=kcci.getTCPListen(); if(tcple!=null) { diff --git a/src/org/kne/cloud/network/srv6/KLALBRoutingProtocol.java b/src/org/kne/cloud/network/srv6/KLALBRoutingProtocol.java index db71a24..be499ef 100644 --- a/src/org/kne/cloud/network/srv6/KLALBRoutingProtocol.java +++ b/src/org/kne/cloud/network/srv6/KLALBRoutingProtocol.java @@ -207,7 +207,7 @@ public class KLALBRoutingProtocol extends Thread{ while(true) { try { - byte[]ca=MembandBoost.allocateUninitializedArray(65535); + byte[]ca=MembandBoost.allocateUninitializedByteArray(65535); DatagramPacket dgp=new DatagramPacket(ca, ca.length); ds.receive(dgp); //System.out.println(Arrays.toString( Arrays.copyOf( dgp.getData(),dgp.getLength()))); diff --git a/~$ALB协议规范V2.1.docx b/~$ALB协议规范V2.1.docx deleted file mode 100644 index fcd42e3..0000000 Binary files a/~$ALB协议规范V2.1.docx and /dev/null differ