From 96f675abed4e73d57c38cd11fc7cc6950cf6743b Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue, 7 May 2019 17:49:25 +0900 Subject: Fix: IPv4 onlyホストからDualstackホストにAP deliverできない (#4872) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/remote/activitypub/request.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/remote') diff --git a/src/remote/activitypub/request.ts b/src/remote/activitypub/request.ts index da2113faea..3b69dd9ae4 100644 --- a/src/remote/activitypub/request.ts +++ b/src/remote/activitypub/request.ts @@ -101,11 +101,18 @@ export default async (user: ILocalUser, url: string, object: any) => { * Resolve host (with cached, asynchrony) */ async function resolveAddr(domain: string) { + const af = config.outgoingAddressFamily || 'ipv4'; + const useV4 = af == 'ipv4' || af == 'dual'; + const useV6 = af == 'ipv6' || af == 'dual'; + + const promises = []; + + if (!useV4 && !useV6) throw 'No usable address family available'; + if (useV4) promises.push(resolveAddrInner(domain, { family: 4 })); + if (useV6) promises.push(resolveAddrInner(domain, { family: 6 })); + // v4/v6で先に取得できた方を採用する - return await promiseAny([ - resolveAddrInner(domain, { family: 4 }), - resolveAddrInner(domain, { family: 6 }) - ]); + return await promiseAny(promises); } function resolveAddrInner(domain: string, options: IRunOptions = {}): Promise { -- cgit v1.2.3-freya