Commit 97e38d76 authored by nanahira's avatar nanahira

fix ipv6

parent 1421725c
...@@ -17,14 +17,14 @@ class InventoryBuilder { ...@@ -17,14 +17,14 @@ class InventoryBuilder {
resolveCache: Map<string, string>; resolveCache: Map<string, string>;
resolver: dns.Resolver; resolver: dns.Resolver;
async resolveDomain(domain: string) { async resolveDomain(domain: string, ipv6: boolean) {
if (!domain || domain.match(/(\d{1,3}\.){3}\d{1,3}/)) { if (!domain || domain.match(/(\d{1,3}\.){3}\d{1,3}/)) {
return domain; return domain;
} }
if (this.resolveCache.has(domain)) { if (this.resolveCache.has(domain)) {
return this.resolveCache.get(domain); return this.resolveCache.get(domain);
} }
const rrtype = domain.includes("-v6") ? "AAAA" : "A"; const rrtype = (domain.includes("-v6") || ipv6) ? "AAAA" : "A";
let resolvedIP: string; let resolvedIP: string;
while (true) { while (true) {
try { try {
...@@ -202,7 +202,7 @@ class InventoryBuilder { ...@@ -202,7 +202,7 @@ class InventoryBuilder {
//const remoteGatewayMark = remoteGatewayName ? remoteGateway.mark : undefined; //const remoteGatewayMark = remoteGatewayName ? remoteGateway.mark : undefined;
//console.log(remoteGateway.name); //console.log(remoteGateway.name);
const remoteAddress = remoteGateway.address || null; const remoteAddress = remoteGateway.address || null;
const resolvedRemoteAddress = await this.resolveDomain(remoteAddress); const resolvedRemoteAddress = await this.resolveDomain(remoteAddress, !remoteGateway.ipv4 && remoteGateway.ipv6);
const remoteLocalAddress = remote.address; const remoteLocalAddress = remote.address;
const remoteNextMark = remote.nextMark; const remoteNextMark = remote.nextMark;
const remoteDestMark = remote.destMark; const remoteDestMark = remote.destMark;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment