Skip to content

SimpleTcpClient: add AddressFamily to TcpClient #227

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SimpleTcpClient: add AddressFamily to TcpClient #227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions src/SuperSimpleTcp/SimpleTcpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ public string ServerIpPort
private SimpleTcpStatistics _statistics = new SimpleTcpStatistics();

private string _serverIp = null;
private AddressFamily _addressFamily = AddressFamily.InterNetwork;
private int _serverPort = 0;
private readonly IPAddress _ipAddress = null;
private TcpClient _client = null;
Expand Down Expand Up @@ -185,6 +186,11 @@ public SimpleTcpClient(string ipPort)
{
_ipAddress = Dns.GetHostEntry(_serverIp).AddressList[0];
_serverIp = _ipAddress.ToString();
_addressFamily = _ipAddress.AddressFamily;
}
else
{
_addressFamily = _ipAddress.AddressFamily;
}
}

Expand Down Expand Up @@ -225,6 +231,11 @@ public SimpleTcpClient(string serverIpOrHostname, int port)
{
_ipAddress = Dns.GetHostEntry(serverIpOrHostname).AddressList[0];
_serverIp = _ipAddress.ToString();
_addressFamily = _ipAddress.AddressFamily;
}
else
{
_addressFamily = _ipAddress.AddressFamily;
}
}

Expand Down Expand Up @@ -363,6 +374,7 @@ public SimpleTcpClient(IPEndPoint serverIpEndPoint)
_ipAddress = serverIpEndPoint.Address;
_serverIp = serverIpEndPoint.Address.ToString();
_serverPort = serverIpEndPoint.Port;
_addressFamily = serverIpEndPoint.AddressFamily;
}
}

Expand Down Expand Up @@ -572,7 +584,7 @@ public void ConnectWithRetries(int? timeoutMs = null)
Logger?.Invoke(msg);

_client.Dispose();
_client = _settings.LocalEndpoint == null ? new TcpClient() : new TcpClient(_settings.LocalEndpoint);
_client = _settings.LocalEndpoint == null ? new TcpClient(_addressFamily) : new TcpClient(_settings.LocalEndpoint);
_client.NoDelay = _settings.NoDelay;
_client.ConnectAsync(_serverIp, _serverPort).Wait(1000, connectToken);

Expand Down Expand Up @@ -847,7 +859,7 @@ private void InitializeClient(bool ssl, string pfxCertFilename, string pfxPasswo
_pfxCertFilename = pfxCertFilename;
_pfxPassword = pfxPassword;

_client = _settings.LocalEndpoint == null ? new TcpClient() : new TcpClient(_settings.LocalEndpoint);
_client = _settings.LocalEndpoint == null ? new TcpClient(_addressFamily) : new TcpClient(_settings.LocalEndpoint);
_client.NoDelay = _settings.NoDelay;

_sslStream = null;
Expand Down