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

back to polarssl

Browse Source
This commit is contained in:
clowwindy
2014-11-12 02:24:50 +08:00
parent 519232211c
commit ed2722a993
4 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/Controller/Local.cs
+13 -13
View File
@@ -141,7 +141,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -173,7 +173,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
}
}
if (remote != null)
@@ -185,7 +185,7 @@ namespace Shadowsocks.Controller
}
catch (SocketException e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
}
}
((IDisposable)encryptor).Dispose();
@@ -205,7 +205,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -219,7 +219,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -248,7 +248,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -271,7 +271,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -295,7 +295,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -313,7 +313,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -341,7 +341,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -368,7 +368,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -383,7 +383,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
@@ -398,7 +398,7 @@ namespace Shadowsocks.Controller
}
catch (Exception e)
{
Console.WriteLine(e.Message);
Console.WriteLine(e);
this.Close();
}
}
shadowsocks-csharp/Program.cs
+3 -3
View File
@@ -36,16 +36,16 @@ namespace Shadowsocks
return;
}
string tempPath = Path.GetTempPath();
string dllPath = tempPath + "/libeay32.dll";
string dllPath = tempPath + "/polarssl.dll";
try
{
FileManager.UncompressFile(dllPath, Resources.libeay32_dll);
FileManager.UncompressFile(dllPath, Resources.polarssl_dll);
}
catch (IOException e)
{
Console.WriteLine(e.ToString());
}
//LoadLibrary(dllPath);
LoadLibrary(dllPath);
#if !DEBUG
Logging.OpenLogFile();
shadowsocks-csharp/Properties/Resources.Designer.cs
Generated
-10
View File
@@ -60,16 +60,6 @@ namespace Shadowsocks.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] libeay32_dll {
get {
object obj = ResourceManager.GetObject("libeay32_dll", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
shadowsocks-csharp/Properties/Resources.resx
-3
View File
@@ -118,9 +118,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="libeay32_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Data\libeay32.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="polarssl_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Data\polarssl.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>