From de5016a23f6ce10c536513544280aac89c344efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=9B=BD=E4=BC=9F?= <366193849@qq.com>
Date: Thu, 18 Nov 2021 16:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=AE=9AAddressFamily?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FastGithub.DomainResolve/DnsClient.cs | 2 +-
FastGithub.DomainResolve/IPAddressElapsed.cs | 2 +-
FastGithub.Http/HttpClientHandler.cs | 6 +++---
FastGithub.HttpServer/SshReverseProxyHandler.cs | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/FastGithub.DomainResolve/DnsClient.cs b/FastGithub.DomainResolve/DnsClient.cs
index 2d87973..9238237 100644
--- a/FastGithub.DomainResolve/DnsClient.cs
+++ b/FastGithub.DomainResolve/DnsClient.cs
@@ -274,7 +274,7 @@ namespace FastGithub.DomainResolve
{
try
{
- using var socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
+ using var socket = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
await socket.ConnectAsync(address, port, cancellationToken);
return address;
}
diff --git a/FastGithub.DomainResolve/IPAddressElapsed.cs b/FastGithub.DomainResolve/IPAddressElapsed.cs
index 7df313a..4d9cda8 100644
--- a/FastGithub.DomainResolve/IPAddressElapsed.cs
+++ b/FastGithub.DomainResolve/IPAddressElapsed.cs
@@ -50,7 +50,7 @@ namespace FastGithub.DomainResolve
{
using var timeoutTokenSource = new CancellationTokenSource(maxConnectTimeout);
using var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutTokenSource.Token);
- using var socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
+ using var socket = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
await socket.ConnectAsync(address, port, linkedTokenSource.Token);
return new IPAddressElapsed(address, stopWatch.Elapsed);
}
diff --git a/FastGithub.Http/HttpClientHandler.cs b/FastGithub.Http/HttpClientHandler.cs
index 79737f2..808ca5a 100644
--- a/FastGithub.Http/HttpClientHandler.cs
+++ b/FastGithub.Http/HttpClientHandler.cs
@@ -128,7 +128,7 @@ namespace FastGithub.Http
///
private async ValueTask ConnectAsync(SocketsHttpConnectionContext context, IPEndPoint ipEndPoint, CancellationToken cancellationToken)
{
- var socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
+ var socket = new Socket(ipEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
await socket.ConnectAsync(ipEndPoint, cancellationToken);
var stream = new NetworkStream(socket, ownsSocket: true);
@@ -181,11 +181,11 @@ namespace FastGithub.Http
}
else
{
- if(IPAddress.TryParse(this.domainConfig.IPAddress, out address))
+ if (IPAddress.TryParse(this.domainConfig.IPAddress, out address))
{
yield return new IPEndPoint(address, dnsEndPoint.Port);
}
-
+
await foreach (var item in this.domainResolver.ResolveAllAsync(dnsEndPoint, cancellationToken))
{
yield return new IPEndPoint(item, dnsEndPoint.Port);
diff --git a/FastGithub.HttpServer/SshReverseProxyHandler.cs b/FastGithub.HttpServer/SshReverseProxyHandler.cs
index 79a8738..386e030 100644
--- a/FastGithub.HttpServer/SshReverseProxyHandler.cs
+++ b/FastGithub.HttpServer/SshReverseProxyHandler.cs
@@ -32,7 +32,7 @@ namespace FastGithub.HttpServer
public override async Task OnConnectedAsync(ConnectionContext context)
{
var address = await this.domainResolver.ResolveAnyAsync(this.sshOverHttpsEndPoint);
- using var socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
+ using var socket = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
await socket.ConnectAsync(address, this.sshOverHttpsEndPoint.Port);
var targetStream = new NetworkStream(socket, ownsSocket: false);