diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-05-07 18:56:33 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-05-07 18:56:33 +0900 |
| commit | 2d04a3d6d2e574da5d55692845830fb80428a19f (patch) | |
| tree | f3b050e95d1e72c4cb27c1d0f8dc6812ec50ddea /src/remote/activitypub/request.ts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.11.2 (diff) | |
| download | misskey-2d04a3d6d2e574da5d55692845830fb80428a19f.tar.gz misskey-2d04a3d6d2e574da5d55692845830fb80428a19f.tar.bz2 misskey-2d04a3d6d2e574da5d55692845830fb80428a19f.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/remote/activitypub/request.ts')
| -rw-r--r-- | src/remote/activitypub/request.ts | 15 |
1 files changed, 11 insertions, 4 deletions
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<string> { |