取消桌面模式下以服务安装dnscrypt-proxy

This commit is contained in:
陈国伟 2021-11-04 14:26:37 +08:00
parent 320dfe846c
commit e0928acaca

View File

@ -80,7 +80,7 @@ namespace FastGithub.DomainResolve
process.WaitForExit(); process.WaitForExit();
} }
if (OperatingSystem.IsWindows()) if (OperatingSystem.IsWindows() && Process.GetCurrentProcess().SessionId == 0)
{ {
StartDnscryptProxy("-service uninstall")?.WaitForExit(); StartDnscryptProxy("-service uninstall")?.WaitForExit();
StartDnscryptProxy("-service install")?.WaitForExit(); StartDnscryptProxy("-service install")?.WaitForExit();
@ -96,7 +96,7 @@ namespace FastGithub.DomainResolve
{ {
this.LocalEndPoint = localEndPoint; this.LocalEndPoint = localEndPoint;
this.process.EnableRaisingEvents = true; this.process.EnableRaisingEvents = true;
this.process.Exited += Process_Exited; this.process.Exited += (s, e) => this.LocalEndPoint = null;
} }
} }
@ -107,7 +107,7 @@ namespace FastGithub.DomainResolve
{ {
try try
{ {
if (OperatingSystem.IsWindows()) if (OperatingSystem.IsWindows() && Process.GetCurrentProcess().SessionId == 0)
{ {
StartDnscryptProxy("-service stop")?.WaitForExit(); StartDnscryptProxy("-service stop")?.WaitForExit();
StartDnscryptProxy("-service uninstall")?.WaitForExit(); StartDnscryptProxy("-service uninstall")?.WaitForExit();
@ -158,16 +158,6 @@ namespace FastGithub.DomainResolve
throw new FastGithubException("当前无可用的端口"); throw new FastGithubException("当前无可用的端口");
} }
/// <summary>
/// 进程退出时
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Process_Exited(object? sender, EventArgs e)
{
this.LocalEndPoint = null;
}
/// <summary> /// <summary>
/// 启动DnscryptProxy进程 /// 启动DnscryptProxy进程
/// </summary> /// </summary>