Skip to content

Commit ad16de0

Browse files
committed
update packages and version
1 parent 80f291c commit ad16de0

File tree

5 files changed

+59
-52
lines changed

5 files changed

+59
-52
lines changed

DnsTube.Core/Models/Application.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public class Application
44
{
5-
public static string RELEASE_TAG { get; set; } = "v2.5.0";
5+
public static string RELEASE_TAG { get; set; } = "v2.6.0-beta";
66

77
public static string Ipv4RegexSubstring = @"\b(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\b";
88
public static string Ipv6RegexSubstring = @"\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*";

DnsTube.Service/ClientApp/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<article class="content border">
1717
<nav>
1818
<ul>
19-
<li><strong class="title">DnsTube v2.5</strong></li>
19+
<li><strong class="title">DnsTube v2.6-beta</strong></li>
2020
</ul>
2121
<ul>
2222
<li><a role="button" href="/index.html"

DnsTube.Service/ClientApp/package-lock.json

+40-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DnsTube.Service/ClientApp/settings.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<article class="content border">
1717
<nav>
1818
<ul>
19-
<li><strong class="title">DnsTube v2.5</strong></li>
19+
<li><strong class="title">DnsTube v2.6-beta</strong></li>
2020
</ul>
2121
<ul>
2222
<li><a href="/index.html"

DnsTube.Service/Program.cs

+16-13
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,11 @@ static async Task ConfigureHttpClientsAsync(WebApplicationBuilder builder, ISett
100100
foreach (var config in clientConfigurations)
101101
{
102102
var httpClientBuilder = builder.Services.AddHttpClient(config.Key, config.Value);
103-
if (config.Key == HttpClientName.IpAddressV6.ToString()){
103+
if (config.Key == HttpClientName.IpAddressV6.ToString())
104+
{
104105
ConfigureIPv6Handler(httpClientBuilder, selectedAdapterName!, needsCustomHandler);
105-
}else if (needsCustomHandler)
106+
}
107+
else if (needsCustomHandler)
106108
{
107109
ConfigureIPv4Handler(httpClientBuilder, selectedAdapterName!);
108110
}
@@ -139,22 +141,23 @@ static void ConfigureIPv6Handler(IHttpClientBuilder httpClientBuilder, string se
139141
var entry = await Dns.GetHostEntryAsync(context.DnsEndPoint.Host, AddressFamily.InterNetworkV6, cancellationToken);
140142
var socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
141143
socket.NoDelay = true;
142-
if (needsCustomHandler){
144+
if (needsCustomHandler)
145+
{
143146
var ipAddress = GetNetworkAdapterIPAddress(selectedAdapterName, AddressFamily.InterNetworkV6);
144147
var localEndPoint = new IPEndPoint(IPAddress.Parse(ipAddress), 0);
145148
socket.Bind(localEndPoint);
146149
}
147150

148-
try
149-
{
150-
await socket.ConnectAsync(entry.AddressList, context.DnsEndPoint.Port, cancellationToken);
151-
return new NetworkStream(socket, ownsSocket: true);
152-
}
153-
catch
154-
{
155-
socket.Dispose();
156-
throw;
157-
}
151+
try
152+
{
153+
await socket.ConnectAsync(entry.AddressList, context.DnsEndPoint.Port, cancellationToken);
154+
return new NetworkStream(socket, ownsSocket: true);
155+
}
156+
catch
157+
{
158+
socket.Dispose();
159+
throw;
160+
}
158161
};
159162

160163
return handler;

0 commit comments

Comments
 (0)