@@ -141,7 +141,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -173,7 +173,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
} | } | ||||
} | } | ||||
if (remote != null) | if (remote != null) | ||||
@@ -185,7 +185,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (SocketException e) | catch (SocketException e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
} | } | ||||
} | } | ||||
((IDisposable)encryptor).Dispose(); | ((IDisposable)encryptor).Dispose(); | ||||
@@ -205,7 +205,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -219,7 +219,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -248,7 +248,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -271,7 +271,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -295,7 +295,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -313,7 +313,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -341,7 +341,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -368,7 +368,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -383,7 +383,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -398,7 +398,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
catch (Exception e) | catch (Exception e) | ||||
{ | { | ||||
Console.WriteLine(e.Message); | |||||
Console.WriteLine(e); | |||||
this.Close(); | this.Close(); | ||||
} | } | ||||
} | } | ||||
@@ -36,16 +36,16 @@ namespace Shadowsocks | |||||
return; | return; | ||||
} | } | ||||
string tempPath = Path.GetTempPath(); | string tempPath = Path.GetTempPath(); | ||||
string dllPath = tempPath + "/libeay32.dll"; | |||||
string dllPath = tempPath + "/polarssl.dll"; | |||||
try | try | ||||
{ | { | ||||
FileManager.UncompressFile(dllPath, Resources.libeay32_dll); | |||||
FileManager.UncompressFile(dllPath, Resources.polarssl_dll); | |||||
} | } | ||||
catch (IOException e) | catch (IOException e) | ||||
{ | { | ||||
Console.WriteLine(e.ToString()); | Console.WriteLine(e.ToString()); | ||||
} | } | ||||
//LoadLibrary(dllPath); | |||||
LoadLibrary(dllPath); | |||||
#if !DEBUG | #if !DEBUG | ||||
Logging.OpenLogFile(); | Logging.OpenLogFile(); | ||||
@@ -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> | /// <summary> | ||||
/// Looks up a localized resource of type System.Byte[]. | /// Looks up a localized resource of type System.Byte[]. | ||||
/// </summary> | /// </summary> | ||||
@@ -118,9 +118,6 @@ | |||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||||
</resheader> | </resheader> | ||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> | <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"> | <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> | <value>..\Data\polarssl.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||||
</data> | </data> | ||||