Merge remote-tracking branch 'upstream/master'

CHANGES

@@ -1,3 +1,12 @@
+2.5.6 2015-08-19
+- Add portable mode
+- Support server reorder
+
+2.5.5 2015-08-17
+- Fix crash when enabling Availability Statistics and some servers can not be resolved
+- Allow multiple instances
+- Other fixes
+
 2.5.4 2015-08-16
 - Hide Privoxy icon
 

shadowsocks-csharp/Controller/Logging.cs

@@ -1,4 +1,5 @@
-using System;
+using Shadowsocks.Util;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Sockets;
@@ -14,7 +15,7 @@ namespace Shadowsocks.Controller
         {
             try
             {
-                string temppath = Path.GetTempPath();
+                string temppath = Utils.GetTempPath();
                 LogFile = Path.Combine(temppath, "shadowsocks.log");
                 FileStream fs = new FileStream(LogFile, FileMode.Append);
                 StreamWriterWithTimestamp sw = new StreamWriterWithTimestamp(fs);

shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs

@@ -6,7 +6,8 @@ using System.Net.NetworkInformation;
 using System.Threading;
 using Shadowsocks.Model;
 using System.Reflection;
-
+using Shadowsocks.Util;
+
 namespace Shadowsocks.Controller
 {
     class AvailabilityStatistics
@@ -25,7 +26,7 @@ namespace Shadowsocks.Controller
         //static constructor to initialize every public static fields before refereced
         static AvailabilityStatistics()
         {
-            string temppath = Path.GetTempPath();
+            string temppath = Utils.GetTempPath();
             AvailabilityStatisticsFile = Path.Combine(temppath, StatisticsFilesName);
         }
 

shadowsocks-csharp/Controller/Service/PolipoRunner.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Net.NetworkInformation;
 using System.Net;
 using System.Runtime.InteropServices;
+using Shadowsocks.Util;
 
 namespace Shadowsocks.Controller
 {
@@ -20,7 +21,7 @@ namespace Shadowsocks.Controller
 
         static PolipoRunner()
         {
-            temppath = Path.GetTempPath();
+            temppath = Utils.GetTempPath();
             try
             {
                 FileManager.UncompressFile(temppath + "/ss_privoxy.exe", Resources.privoxy_exe);

shadowsocks-csharp/Encryption/PolarSSL.cs

@@ -1,5 +1,6 @@
 using Shadowsocks.Controller;
 using Shadowsocks.Properties;
+using Shadowsocks.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -18,7 +19,7 @@ namespace Shadowsocks.Encryption
 
         static PolarSSL()
         {
-            string tempPath = Path.GetTempPath();
+            string tempPath = Utils.GetTempPath();
             string dllPath = tempPath + "/libsscrypto.dll";
             try
             {

shadowsocks-csharp/Encryption/Sodium.cs

@@ -1,5 +1,6 @@
 using Shadowsocks.Controller;
 using Shadowsocks.Properties;
+using Shadowsocks.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,7 +15,7 @@ namespace Shadowsocks.Encryption
 
         static Sodium()
         {
-            string tempPath = Path.GetTempPath();
+            string tempPath = Utils.GetTempPath();
             string dllPath = tempPath + "/libsscrypto.dll";
             try
             {

shadowsocks-csharp/Util/Util.cs

@@ -5,11 +5,30 @@ using System.IO;
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Windows.Forms;
 
 namespace Shadowsocks.Util
 {
     public class Utils
     {
+        // return path to store temporary files
+        public static string GetTempPath()
+        {
+            if (File.Exists(Application.StartupPath + "\\shadowsocks_portable_mode.txt"))
+            {
+                try
+                {
+                    Directory.CreateDirectory(Application.StartupPath + "\\temp");
+                } catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                }
+                // don't use "/", it will fail when we call explorer /select xxx/temp\xxx.log
+                return Application.StartupPath + "\\temp";
+            }
+            return Path.GetTempPath();
+        }
+
         public static void ReleaseMemory(bool removePages)
         {
             // release any unused pages

shadowsocks-csharp/View/ConfigForm.cs

@@ -276,6 +276,10 @@ namespace Shadowsocks.View
 
         private void MoveUpButton_Click(object sender, EventArgs e)
         {
+            if (!SaveOldSelectedServer())
+            {
+                return;
+            }
             if (ServersListBox.SelectedIndex > 0)
             {
                 MoveConfigItem(-1);  // -1 means move backward
@@ -284,6 +288,10 @@ namespace Shadowsocks.View
 
         private void MoveDownButton_Click(object sender, EventArgs e)
         {
+            if (!SaveOldSelectedServer())
+            {
+                return;
+            }
             if (ServersListBox.SelectedIndex < ServersListBox.Items.Count - 1)
             {
                 MoveConfigItem(+1);  // +1 means move forward

shadowsocks-csharp/View/LogForm.cs

@@ -106,7 +106,8 @@ namespace Shadowsocks.View
 
         private void OpenLocationMenuItem_Click(object sender, EventArgs e)
         {
-            string argument = @"/select, " + filename;
+            string argument = "/select, \"" + filename + "\"";
+            Console.WriteLine(argument);
             System.Diagnostics.Process.Start("explorer.exe", argument);
         }