forked from KNEMC/KLALB
Compare commits
4
Commits
patch-2
...
cc803f47a7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc803f47a7 | ||
|
|
3bb95988fc | ||
|
|
e87e3bb953 | ||
|
|
41db17f1ec |
@@ -12,3 +12,5 @@ dashboard/.pnpm-store/
|
||||
dashboard/.env.local
|
||||
dashboard/.env.*.local
|
||||
|
||||
/klalb-config.json
|
||||
/klalbconfig-old.json
|
||||
|
||||
+1
-1
Submodule dashboard updated: f38d640ac4...ad94d2c274
Binary file not shown.
@@ -1,113 +0,0 @@
|
||||
[
|
||||
{
|
||||
"language": "ZH_CN",
|
||||
"nogui": false,
|
||||
"VirtualAddress": "2486:1:0:0:0:0:0:8889",
|
||||
"VirtualASN": 2142606939373348329,
|
||||
"DNS": [
|
||||
"2486:1:0:0:0:0:0:8888"
|
||||
],
|
||||
"TCPListen": "tcp://0.0.0.0:4565",
|
||||
"UDPListen": "udp://0.0.0.0:4572",
|
||||
"VirtualSocketName": "kltp",
|
||||
"externalEndpoints": [
|
||||
"tcp://kne03.yoyo250.fun:4565",
|
||||
"tcp://kne04.yoyo250.fun:4565",
|
||||
"tcp://07f4acdef99b.ofalias.net:4565",
|
||||
"tcp://kne01.yoyo250.fun:4565",
|
||||
"tcp://kne02.yoyo250.fun:4565"
|
||||
],
|
||||
"autoConnections": [
|
||||
"tcp://07f4acdef99b.ofalias.net:4565",
|
||||
"tcp://kne01.yoyo250.fun:4565",
|
||||
"tcp://kne02.yoyo250.fun:4565"
|
||||
],
|
||||
"ntpServers": [
|
||||
"ntp://ntp1.aliyun.com",
|
||||
"ntp://ntp2.aliyun.com",
|
||||
"ntp://ntp3.aliyun.com",
|
||||
"ntp://ntp4.aliyun.com",
|
||||
"ntp://ntp5.aliyun.com",
|
||||
"ntp://ntp6.aliyun.com",
|
||||
"ntp://ntp7.aliyun.com",
|
||||
"ntp://ntp1.tencent.com",
|
||||
"ntp://ntp2.tencent.com",
|
||||
"ntp://ntp4.tencent.com",
|
||||
"ntp://ntp5.tencent.com",
|
||||
"ntp://time.google.com",
|
||||
"ntp://time.apple.com",
|
||||
"ntp://pool.ntp.org",
|
||||
"ntp://ntp.ntsc.ac.cn",
|
||||
"ntp://us.ntp.org.cn"
|
||||
],
|
||||
"ExtraRoutes": [],
|
||||
"denyExternalEndpointQuery": false,
|
||||
"denyExternalEndpointBroadcast": false,
|
||||
"congestionAlgorithm": "BBR",
|
||||
"burstLimit": 2.0,
|
||||
"delayUpperBound": 1.2,
|
||||
"delayLowerBound": 1.1,
|
||||
"nagleDelayTime": 1000000,
|
||||
"linkNagleDelayTime": 0,
|
||||
"linkConnectionsCount": 1,
|
||||
"enableTUN": false,
|
||||
"TUNName": "KLALB_SRv6",
|
||||
"performanceStrategy": "multiscatter",
|
||||
"DeviceName": "Device Name",
|
||||
"DeviceDescription": "The Description of Device",
|
||||
"webUI": true,
|
||||
"webListen": "http://0.0.0.0:4665",
|
||||
"NetworkInterfaceExcepts": [],
|
||||
"Type": "KLALBController"
|
||||
},
|
||||
{
|
||||
"Listen": "kltp://[::0]:5201",
|
||||
"Bridge": {
|
||||
"DEFAULT": "SocketBridge"
|
||||
},
|
||||
"Connect": {
|
||||
"DEFAULT": "tcp://127.0.0.1:5201"
|
||||
},
|
||||
"Type": "SocketBridge"
|
||||
},
|
||||
{
|
||||
"Listen": "tcp://[::1]:5202",
|
||||
"Bridge": {
|
||||
"DEFAULT": "SocketBridge"
|
||||
},
|
||||
"Connect": {
|
||||
"DEFAULT": "kltp://[2486:5acd:e339:4837:a6d9:3aed:4de2:30fd]:5201"
|
||||
},
|
||||
"Type": "SocketBridge"
|
||||
},
|
||||
{
|
||||
"Listen": "tcp://127.0.0.1:35000",
|
||||
"Bridge": {
|
||||
"DEFAULT": "SocketBridge"
|
||||
},
|
||||
"Connect": {
|
||||
"DEFAULT": "kltp://[2486:1::8888]:23333"
|
||||
},
|
||||
"Type": "SocketBridge"
|
||||
},
|
||||
{
|
||||
"Listen": "kltp://[::0]:25565",
|
||||
"Bridge": {
|
||||
"DEFAULT": "SocketBridge"
|
||||
},
|
||||
"Connect": {
|
||||
"DEFAULT": "tcp://127.0.0.1:25566"
|
||||
},
|
||||
"Type": "SocketBridge"
|
||||
},
|
||||
{
|
||||
"Listen": "tcp://127.0.0.1:35565",
|
||||
"Bridge": {
|
||||
"DEFAULT": "SocketBridge"
|
||||
},
|
||||
"Connect": {
|
||||
"DEFAULT": "kltp://[2486:1::8888]:25565"
|
||||
},
|
||||
"Type": "SocketBridge"
|
||||
}
|
||||
]
|
||||
@@ -115,4 +115,5 @@ multiscatter=Multi-Core - Spread Load Evenly (Optimized for multi-socket NUMA ar
|
||||
webapisettings=Web API settings
|
||||
enablewebapi=Enable Web API
|
||||
weblistenaddr=Web API listen address
|
||||
invaildweblistenaddr=Invalid Web API listen address
|
||||
invaildweblistenaddr=Invalid Web API listen address
|
||||
enabletun=Enable TUN adapter
|
||||
|
||||
@@ -116,3 +116,4 @@ webapisettings=Web API 设置
|
||||
enablewebapi=启用 Web API
|
||||
weblistenaddr=Web API 监听地址:端口
|
||||
invaildweblistenaddr=无效的 Web API 监听地址:端口
|
||||
enabletun=启用TUN虚拟网卡
|
||||
@@ -75,6 +75,7 @@ public class KLALBStateGUI3 extends XFrame {
|
||||
private JTextField addressField; // 地址显示框
|
||||
private JTextField addressFieldSet; // 地址设置框
|
||||
private JTextField asnFieldSet; // ASN设置框
|
||||
private JCheckBox enableTUN; // 虚拟网卡启用禁用
|
||||
private JTextField tunDeviceName; // 虚拟网卡名称设置框
|
||||
private JTextField webListenSet; // Web API 监听地址设置框
|
||||
private NetworkGraphPanel graph; // 网络图面板
|
||||
@@ -822,6 +823,12 @@ public class KLALBStateGUI3 extends XFrame {
|
||||
asnFieldSet = asn.getTextField();
|
||||
settings.getView().add(asn);
|
||||
|
||||
//虚拟网卡
|
||||
CheckBoxSettingItem enableTUNs = new CheckBoxSettingItem(UIEnv.getRsb().getString("enabletun"),
|
||||
CONST.itemwidth, CONST.settingheight);
|
||||
enableTUN=enableTUNs.getCheckBox();
|
||||
settings.getView().add(enableTUNs);
|
||||
|
||||
TextSettingItem tunName = new TextSettingItem(UIEnv.getRsb().getString("tunname"),
|
||||
CONST.itemwidth, CONST.settingheight);
|
||||
tunDeviceName = tunName.getTextField();
|
||||
@@ -1151,6 +1158,8 @@ public class KLALBStateGUI3 extends XFrame {
|
||||
}
|
||||
}
|
||||
|
||||
kck.setEnableTUN( enableTUN.isSelected());
|
||||
|
||||
String tunNameText=tunDeviceName.getText().trim();
|
||||
if(tunNameText.equals("") || tunNameText.equalsIgnoreCase("null")) {
|
||||
kck.setTUNName(null);
|
||||
@@ -1571,9 +1580,14 @@ public class KLALBStateGUI3 extends XFrame {
|
||||
Long vasn = kck.getVirtualASN();
|
||||
asnFieldSet.setText(vasn != null ? vasn.toString() : "");
|
||||
|
||||
enableTUN.setSelected(kck.isEnableTUN());
|
||||
|
||||
|
||||
String tunname=kck.getTUNName();
|
||||
tunDeviceName.setText(tunname!=null?tunname:"");
|
||||
|
||||
|
||||
|
||||
// 加载Web API设置
|
||||
webApiEnabled.setSelected(kck.isWebUI());
|
||||
webListenSet.setText(kck.getWebListen() != null ? kck.getWebListen().toString()
|
||||
|
||||
@@ -164,7 +164,7 @@ public class NetworkGraphPanel extends GraphPanel {
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
private double nsPerPixel=1000L;
|
||||
private double nsPerPixel=5000L;
|
||||
private class InetGraphEdgeGroup extends GraphEdgeGroup{
|
||||
public InetGraphEdgeGroup(GraphNode nodeA, GraphNode nodeB) {
|
||||
super(nodeA, nodeB);
|
||||
|
||||
@@ -19,8 +19,10 @@ import org.kne.cloud.network.ipv6.IPv6NetworkLink;
|
||||
import org.kne.cloud.network.ipv6.RouteItem;
|
||||
import org.kne.cloud.network.klalb.*;
|
||||
import org.kne.cloud.network.monitor.LinkStatus;
|
||||
import org.kne.cloud.network.srv6.KLALBNodeInformation;
|
||||
import org.kne.cloud.network.srv6.KLALBRoutingProtocol;
|
||||
import org.kne.cloud.network.srv6.KLALBRoutingProtocol.LinkDirection;
|
||||
import org.kne.cloud.network.srv6.KLALBRoutingProtocolAPIClient;
|
||||
import org.kne.cloud.network.srv6.NeighborInfo;
|
||||
import org.kne.cloud.network.srv6.RouterInfo;
|
||||
import org.kne.cloud.network.srv6.SRv6Router;
|
||||
@@ -68,6 +70,7 @@ public class KLALBWebServer {
|
||||
server.createContext("/api/links/reconnect", this::handleReconnectAll);
|
||||
server.createContext("/api/routes", this::handleRoutes);
|
||||
server.createContext("/api/nodes", this::handleNodes);
|
||||
server.createContext("/api/node-info", this::handleNodeInfo);
|
||||
server.createContext("/api/interfaces", this::handleInterfaces);
|
||||
server.createContext("/api/config", this::handleConfig);
|
||||
|
||||
@@ -453,6 +456,119 @@ public class KLALBWebServer {
|
||||
sendJsonResponse(exchange, 200, routesArray);
|
||||
}
|
||||
|
||||
private KLALBRoutingProtocolAPIClient nodeInfoClient;
|
||||
|
||||
private synchronized KLALBRoutingProtocolAPIClient getNodeInfoClient(KLALBController kc) {
|
||||
if (nodeInfoClient == null) {
|
||||
nodeInfoClient = new KLALBRoutingProtocolAPIClient(kc.getIpv6Router().getKlalbRouteProtol());
|
||||
}
|
||||
return nodeInfoClient;
|
||||
}
|
||||
|
||||
private void handleNodeInfo(HttpExchange exchange) throws IOException {
|
||||
if (handleCorsPreflight(exchange)) return;
|
||||
if (!"GET".equalsIgnoreCase(exchange.getRequestMethod())) {
|
||||
sendError(exchange, 405, "Method not allowed");
|
||||
return;
|
||||
}
|
||||
|
||||
Map<String, String> params = parseQuery(exchange.getRequestURI().getRawQuery());
|
||||
String addressStr = params.get("address");
|
||||
if (addressStr == null || addressStr.trim().isEmpty()) {
|
||||
sendError(exchange, 400, "address parameter is required");
|
||||
return;
|
||||
}
|
||||
|
||||
KLALBController kc = proxySystem.getKlalbController();
|
||||
if (kc == null || kc.getIpv6Router() == null || kc.getIpv6Router().getKlalbRouteProtol() == null) {
|
||||
sendError(exchange, 503, "Controller not ready");
|
||||
return;
|
||||
}
|
||||
|
||||
IPv6Address target;
|
||||
try {
|
||||
target = new IPv6Address((Inet6Address) InetAddress.getByName(addressStr.trim()));
|
||||
} catch (Exception e) {
|
||||
sendError(exchange, 400, "Invalid IPv6 address: " + addressStr);
|
||||
return;
|
||||
}
|
||||
|
||||
SRv6Router router = kc.getIpv6Router();
|
||||
boolean isSelf = router.getLocator().getAddress().equals(target);
|
||||
|
||||
JsonObject resp = new JsonObject();
|
||||
resp.addProperty("address", target.toString());
|
||||
|
||||
if (isSelf) {
|
||||
// 本机:描述直接取本地控制器配置
|
||||
KLALBControllerConfigItem cfg = proxySystem.getControllerConfig();
|
||||
resp.addProperty("isSelf", true);
|
||||
String dname = router.getDeviceName() != null ? router.getDeviceName()
|
||||
: (cfg != null && cfg.getDeviceName() != null ? cfg.getDeviceName() : "");
|
||||
resp.addProperty("deviceName", dname);
|
||||
resp.addProperty("deviceDescription",
|
||||
cfg != null && cfg.getDeviceDescription() != null ? cfg.getDeviceDescription() : "");
|
||||
JsonArray lines = new JsonArray();
|
||||
for (MultiProtocolSocketAddress mpsa : kc.getExternalEndpoints()) {
|
||||
lines.add(new JsonPrimitive(mpsa.toString()));
|
||||
}
|
||||
resp.add("openLines", lines);
|
||||
sendJsonResponse(exchange, 200, resp);
|
||||
return;
|
||||
}
|
||||
|
||||
// 远端节点:经 SRv6 虚拟网络发送完整节点信息查询(异步回调,限时等待)
|
||||
resp.addProperty("isSelf", false);
|
||||
CompletableFuture<KLALBNodeInformation> future = new CompletableFuture<>();
|
||||
try {
|
||||
getNodeInfoClient(kc).requestNodeInfoFull(
|
||||
new InetSocketAddress(target.toInet6Address(), KLALBRoutingProtocol.DEFAULT_PORT),
|
||||
info -> future.complete(info));
|
||||
|
||||
KLALBNodeInformation info;
|
||||
try {
|
||||
info = future.get(3, TimeUnit.SECONDS);
|
||||
} catch (TimeoutException te) {
|
||||
info = null;
|
||||
}
|
||||
|
||||
String dname = info != null && info.getDeviceName() != null && !info.getDeviceName().isEmpty()
|
||||
? info.getDeviceName()
|
||||
: router.getKlalbRouteProtol().getDeviceName(target);
|
||||
resp.addProperty("deviceName", dname != null ? dname : "");
|
||||
resp.addProperty("deviceDescription",
|
||||
info != null && info.getDeviceDescription() != null ? info.getDeviceDescription() : "");
|
||||
resp.addProperty("reachable", info != null);
|
||||
JsonArray lines = new JsonArray();
|
||||
if (info != null && info.getOpenLines() != null) {
|
||||
for (MultiProtocolSocketAddress mpsa : info.getOpenLines()) {
|
||||
lines.add(new JsonPrimitive(mpsa.toString()));
|
||||
}
|
||||
}
|
||||
resp.add("openLines", lines);
|
||||
} catch (Exception e) {
|
||||
resp.addProperty("deviceName", "");
|
||||
resp.addProperty("deviceDescription", "");
|
||||
resp.addProperty("reachable", false);
|
||||
resp.add("openLines", new JsonArray());
|
||||
}
|
||||
sendJsonResponse(exchange, 200, resp);
|
||||
}
|
||||
|
||||
private Map<String, String> parseQuery(String rawQuery) {
|
||||
Map<String, String> params = new HashMap<>();
|
||||
if (rawQuery == null || rawQuery.isEmpty()) return params;
|
||||
for (String pair : rawQuery.split("&")) {
|
||||
int idx = pair.indexOf('=');
|
||||
if (idx <= 0) continue;
|
||||
try {
|
||||
params.put(URLDecoder.decode(pair.substring(0, idx), StandardCharsets.UTF_8),
|
||||
URLDecoder.decode(pair.substring(idx + 1), StandardCharsets.UTF_8));
|
||||
} catch (Exception ignored) {}
|
||||
}
|
||||
return params;
|
||||
}
|
||||
|
||||
private void handleNodes(HttpExchange exchange) throws IOException {
|
||||
if (handleCorsPreflight(exchange)) return;
|
||||
if (!"GET".equalsIgnoreCase(exchange.getRequestMethod())) {
|
||||
|
||||
Reference in New Issue
Block a user