Skip to content

Test-Connection: Fallback to hop IP Address on -Traceroute without -ResolveDestination #11335

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

Merged
daxian-dbw merged 15 commits into from
Dec 19, 2019
Merged

Test-Connection: Fallback to hop IP Address on -Traceroute without -ResolveDestination #11335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3af7126
:bug: Fallback to DisplayAddress if no Destination
vexx32 Dec 13, 2019
36544ac
:bug: Ensure destination field is filled in trace
vexx32 Dec 13, 2019
4399a9c
:bug: Refactor to use InitProcessPing
vexx32 Dec 13, 2019
0304d01
:fire: Remove unnecessary ToString() calls
vexx32 Dec 13, 2019
143b785
:recycle: Refactor traceroute and tracestatus
vexx32 Dec 15, 2019
55e9f71
:recycle: Add if/else for per-hop InitProcessPing
vexx32 Dec 16, 2019
72e9e8f
:recycle: Fix null issue in syntax
vexx32 Dec 17, 2019
43fab34
Merge remote-tracking branch 'upstream/master' into TestConnection/Fi…
vexx32 Dec 17, 2019
8f305bb
:white_check_mark: Verify Destination works
vexx32 Dec 17, 2019
c14da69
:white_check_mark: Fix test
vexx32 Dec 17, 2019
b1db89a
:recycle: Rename InitProcessPing()
vexx32 Dec 17, 2019
6fa2247
:recycle: CanResolve..()->TryResolve..()
vexx32 Dec 18, 2019
a351cb4
:bug: Catch hostname resolve errors during trace
vexx32 Dec 18, 2019
4fc9fb6
:bug: Define routerName in proper context
vexx32 Dec 18, 2019
8e58e9b
:bug: Fix non-nullable oops
vexx32 Dec 18, 2019
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
56 changes: 29 additions & 27 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ protected override void StopProcessing()

private void ProcessConnectionByTCPPort(string targetNameOrAddress)
{
if (!InitProcessPing(targetNameOrAddress, out _, out IPAddress? targetAddress))
if (!TryResolveNameOrAddress(targetNameOrAddress, out _, out IPAddress? targetAddress))
{
return;
}
Expand Down Expand Up @@ -336,7 +336,7 @@ private void ProcessTraceroute(string targetNameOrAddress)
{
byte[] buffer = GetSendBuffer(BufferSize);

if (!InitProcessPing(targetNameOrAddress, out string resolvedTargetName, out IPAddress? targetAddress))
if (!TryResolveNameOrAddress(targetNameOrAddress, out string resolvedTargetName, out IPAddress? targetAddress))
{
return;
}
Expand All @@ -351,8 +351,6 @@ private void ProcessTraceroute(string targetNameOrAddress)
IPAddress hopAddress;
do
{
// Clear the stored router name for every hop
string routerName = string.Empty;
pingOptions.Ttl = currentHop;

#if !UNIX
Expand Down Expand Up @@ -383,25 +381,25 @@ private void ProcessTraceroute(string targetNameOrAddress)
#endif
var hopAddressString = discoveryReply.Address.ToString();

string routerName = hopAddressString;
try
{
if (!TryResolveNameOrAddress(hopAddressString, out routerName, out _))
{
routerName = hopAddressString;
}
}
catch
{
// Swallow hostname resolve exceptions and continue with traceroute
}

// In traceroutes we don't use 'Count' parameter.
// If we change 'DefaultTraceRoutePingCount' we should change 'ConsoleTraceRouteReply' resource string.
for (uint i = 1; i <= DefaultTraceRoutePingCount; i++)
{
try
{
#if !UNIX
if (ResolveDestination.IsPresent && routerName == string.Empty)
{
try
{
InitProcessPing(hopAddressString, out routerName, out _);
}
catch
{
// Swallow host resolve exceptions and just use the IP address.
}
}
#endif
reply = SendCancellablePing(hopAddress, timeout, buffer, pingOptions, timer);

if (!Quiet.IsPresent)
Expand Down Expand Up @@ -475,7 +473,7 @@ private void ProcessTraceroute(string targetNameOrAddress)
private void ProcessMTUSize(string targetNameOrAddress)
{
PingReply? reply, replyResult = null;
if (!InitProcessPing(targetNameOrAddress, out string resolvedTargetName, out IPAddress? targetAddress))
if (!TryResolveNameOrAddress(targetNameOrAddress, out string resolvedTargetName, out IPAddress? targetAddress))
{
return;
}
Expand Down Expand Up @@ -578,7 +576,7 @@ private void ProcessMTUSize(string targetNameOrAddress)

private void ProcessPing(string targetNameOrAddress)
{
if (!InitProcessPing(targetNameOrAddress, out string resolvedTargetName, out IPAddress? targetAddress))
if (!TryResolveNameOrAddress(targetNameOrAddress, out string resolvedTargetName, out IPAddress? targetAddress))
{
return;
}
Expand Down Expand Up @@ -643,7 +641,7 @@ private void ProcessPing(string targetNameOrAddress)

#endregion PingTest

private bool InitProcessPing(
private bool TryResolveNameOrAddress(
string targetNameOrAddress,
out string resolvedTargetName,
[NotNullWhen(true)]
Expand Down Expand Up @@ -1007,6 +1005,16 @@ internal TraceStatus(
Source = source;
Target = destination;
TargetAddress = destinationAddress;

if (_status.Address == IPAddress.Any
|| _status.Address == IPAddress.IPv6Any)
{
Hostname = null;
}
else
{
Hostname = _status.Destination;
}
}

private readonly PingStatus _status;
Expand All @@ -1020,13 +1028,7 @@ internal TraceStatus(
/// Gets the hostname of the current hop point.
/// </summary>
/// <value></value>
public string? Hostname
{
get => _status.Destination != IPAddress.Any.ToString()
&& _status.Destination != IPAddress.IPv6Any.ToString()
? _status.Destination
: null;
}
public string? Hostname { get; }

/// <summary>
/// Gets the sequence number of the ping in the sequence of pings to the hop point.
Expand Down
6 changes: 6 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,12 @@ Describe "Test-Connection" -tags "CI" {
It 'returns false without error if MaxHops is exceeded during -Traceroute -Quiet' {
Test-Connection 8.8.8.8 -Traceroute -MaxHops 2 -Quiet | Should -BeFalse
}

It 'has a non-null value for Destination for reachable hosts' {
$results = Test-Connection 127.0.0.1 -Traceroute

$results.Hostname | Should -Not -BeNullOrEmpty
}
}
}

Expand Down