恢复Edns

This commit is contained in:
陈国伟 2021-09-27 17:46:06 +08:00
parent a307079a76
commit f72f6dea78
2 changed files with 44 additions and 1 deletions

View File

@ -40,7 +40,9 @@ namespace FastGithub.DomainResolve
var tomlPath = Path.Combine(PATH, $"{NAME}.toml"); var tomlPath = Path.Combine(PATH, $"{NAME}.toml");
var port = GetAvailablePort(IPAddress.Loopback.AddressFamily); var port = GetAvailablePort(IPAddress.Loopback.AddressFamily);
var localEndPoint = new IPEndPoint(IPAddress.Loopback, port); var localEndPoint = new IPEndPoint(IPAddress.Loopback, port);
await TomlUtil.SetListensAsync(tomlPath, localEndPoint, cancellationToken); await TomlUtil.SetListensAsync(tomlPath, localEndPoint, cancellationToken);
await TomlUtil.SetEdnsClientSubnetAsync(tomlPath, cancellationToken);
foreach (var process in Process.GetProcessesByName(NAME)) foreach (var process in Process.GetProcessesByName(NAME))
{ {

View File

@ -1,6 +1,9 @@
using System.IO; using System;
using System.IO;
using System.Net; using System.Net;
using System.Net.Http;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Tommy; using Tommy;
@ -27,6 +30,44 @@ namespace FastGithub.DomainResolve
return SetAsync(tomlPath, "listen_addresses", value, cancellationToken); return SetAsync(tomlPath, "listen_addresses", value, cancellationToken);
} }
/// <summary>
/// 设置ecs
/// </summary>
/// <param name="tomlPath"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public static async Task<bool> SetEdnsClientSubnetAsync(string tomlPath, CancellationToken cancellationToken = default)
{
try
{
var address = await GetPublicIPAddressAsync(cancellationToken);
if (address != null)
{
var value = new TomlArray { $"{address}/32" };
await SetAsync(tomlPath, "edns_client_subnet", value, cancellationToken);
}
return true;
}
catch (Exception)
{
return false;
}
}
/// <summary>
/// 获取公网ip
/// </summary>
/// <param name="cancellationToken"></param>
/// <returns></returns>
private static async Task<IPAddress?> GetPublicIPAddressAsync(CancellationToken cancellationToken)
{
using var httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(3d) };
var response = await httpClient.GetStringAsync("https://pv.sohu.com/cityjson?ie=utf-8", cancellationToken);
var match = Regex.Match(response, @"\d+\.\d+\.\d+\.\d+");
IPAddress.TryParse(match.Value, out var address);
return address;
}
/// <summary> /// <summary>
/// 设置指定键的值 /// 设置指定键的值
/// </summary> /// </summary>