Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modified client connection to circumvent DNS resolution #32

Merged
merged 2 commits into from
Jan 28, 2023
Merged

Modified client connection to circumvent DNS resolution #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03f49eb
Modified client connection to circumvent DNS resolution when a straig…
OlHall Jan 24, 2023
3014b33
Rectified failed code check
OlHall Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/Services/SocketClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,25 @@ private void Connect() {
Log4.Debug($"SocketClient: Connect - {_host}:{_port}");
Debug.Assert(_tcpClient != null);
try {
// GetHostEntry returns a list. We need to pick the IPv4 entry.
// TODO: Support ipv6
var ipv4Addresses = Array.FindAll(Dns.GetHostEntry(_host).AddressList, a => a.AddressFamily == AddressFamily.InterNetwork);
Log4.Debug($"SocketClient: {ipv4Addresses.Length} IP v4 addresses found");

if (ipv4Addresses.Length == 0) {
throw new IOException($"{_host}:{_port} didn't resolve to a valid address");
// See if we've just been handed a straight IPv4 address, if so don't bother with DNS
IPAddress hostIp;
if (!IPAddress.TryParse(_host, out hostIp)) {
// GetHostEntry returns a list. We need to pick the IPv4 entry.
// TODO: Support ipv6
var ipv4Addresses = Array.FindAll(Dns.GetHostEntry(_host).AddressList, a => a.AddressFamily == AddressFamily.InterNetwork);
Log4.Debug($"SocketClient: {ipv4Addresses.Length} IP v4 addresses found");

if (ipv4Addresses.Length == 0) {
throw new IOException($"{_host}:{_port} didn't resolve to a valid address");
}
hostIp = ipv4Addresses[0];
}

Log4.Debug($"SocketClient: new IPEndPoint({ipv4Addresses[0]}, {_port})");
endPoint = new IPEndPoint(ipv4Addresses[0], _port);
Log4.Debug($"SocketClient: new IPEndPoint({hostIp}, {_port})");
endPoint = new IPEndPoint(hostIp, _port);

// TELEMETRY: Do not pass _host to SetStatus to avoid collecting PII
SetStatus(ServiceStatus.Started, $"{ipv4Addresses[0]}:{_port}");
SetStatus(ServiceStatus.Started, $"{hostIp}:{_port}");

if (_tcpClient == null) {
Log4.Debug($"SocketClient: Can't Connect - _tcpClient is null");
Expand Down