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

fix: don't use Powershell for killing smartdnsblock processes #2258

Merged
merged 2 commits into from
Nov 16, 2024
Merged

fix: don't use Powershell for killing smartdnsblock processes #2258

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93cc038
Use native Process.Kill() because powershell might not always be avai…
ezhevita Oct 23, 2024
911661b
Merge branch 'master' into use-native-process-kill
jyyi1 Nov 16, 2024
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
27 changes: 18 additions & 9 deletions client/electron/windows/OutlineService/OutlineService/OutlineService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ public void ResetRouting(string proxyIp, int gatewayInterfaceIndex)

try
{
// This is only necessary when disconecting without network connectivity.
// This is only necessary when disconecting without network connectivity.
StartRoutingIpv4();
}
catch (Exception) {}
Expand Down Expand Up @@ -531,7 +531,7 @@ public void ResetRouting(string proxyIp, int gatewayInterfaceIndex)
{
StopSmartDnsBlock();
eventLog.WriteEntry($"stopped smartdnsblock");
}
}
catch (Exception e)
{
eventLog.WriteEntry($"failed to stop smartdnsblock: {e.Message}",
Expand Down Expand Up @@ -606,15 +606,24 @@ private void StartSmartDnsBlock()
}
}

private void StopSmartDnsBlock()
private static void StopSmartDnsBlock()
{
try
var errors = new List<string>(0);
foreach (var process in Process.GetProcessesByName("smartdnsblock"))
{
RunCommand("powershell", "stop-process -name smartdnsblock");
try
{
process.Kill();
}
catch (Exception e)
{
errors.Add(e.Message);
}
}
catch (Exception e)

if (errors.Count > 0)
{
throw new Exception($"could not stop smartdnsblock: {e.Message}");
throw new Exception($"could not stop smartdnsblock: {string.Join("; ", errors)}");
}
}

Expand Down Expand Up @@ -693,7 +702,7 @@ private void StopRoutingIpv4()
{
RunCommand(CMD_NETSH, $"interface ipv4 set route {subnet} interface={NetworkInterface.LoopbackInterfaceIndex} metric=0 store=active");
}
}
}
}

private void StartRoutingIpv6()
Expand Down Expand Up @@ -938,7 +947,7 @@ private void NetworkAddressChanged(object sender, EventArgs evt)
// Only send on actual change, to prevent duplicate notifications (mostly
// harmless but can make debugging harder).
eventLog.WriteEntry($"network changed but gateway and interface stayed the same");
return;
return;
}
else if (gatewayIp == null)
{
Expand Down
Loading