Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kill existed ss_polipo

Browse Source
This commit is contained in:
clowwindy
2014-11-04 02:11:59 +08:00
parent 451d68b817
commit 35c9e78757
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/Form1.cs
+3 -2
View File
@@ -61,14 +61,15 @@ namespace shadowsocks_csharp
polipoRunner.Stop();
}
}
local = new Local(config);
local.Start();
if (polipoRunner == null)
{
polipoRunner = new PolipoRunner();
}
polipoRunner.Start(config);
local = new Local(config);
local.Start();
}
private void Config_Click(object sender, EventArgs e)
shadowsocks-csharp/PolipoRunner.cs
+8 -2
View File
@@ -32,15 +32,21 @@ namespace shadowsocks_csharp
{
if (process == null)
{
Process[] existingPolipo = Process.GetProcessesByName("ss_polipo");
foreach (Process p in existingPolipo)
{
p.Kill();
p.WaitForExit();
}
string temppath = Path.GetTempPath();
string polipoConfig = Resources.polipo_config;
polipoConfig = polipoConfig.Replace("__SOCKS_PORT__", config.local_port.ToString());
ByteArrayToFile(temppath + "/polipo.conf", System.Text.Encoding.UTF8.GetBytes(polipoConfig));
ByteArrayToFile(temppath + "/polipo.exe", Resources.polipo);
ByteArrayToFile(temppath + "/ss_polipo.exe", Resources.polipo);
process = new Process();
// Configure the process using the StartInfo properties.
process.StartInfo.FileName = temppath + "/polipo.exe";
process.StartInfo.FileName = temppath + "/ss_polipo.exe";
process.StartInfo.Arguments = "-c \"" + temppath + "/polipo.conf\"";
process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
process.StartInfo.UseShellExecute = false;