微调

azzvx · Aug 17, 2014 · 57d2e0a · 57d2e0a
1 parent e861fe9
commit 57d2e0a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 32 deletions.
diff --git a/GoGo Tester/Config.cs b/GoGo Tester/Config.cs
@@ -6,6 +6,6 @@ static class Config
         public static int PingTimeout = 660;
         public static int SocketTimeout = 1650;
         public static int MaxThreads = 5;
-        public static int TestCount = 2;
+        public static int TestCount = 3;
     }
 }
diff --git a/GoGo Tester/Form1.Designer.cs b/GoGo Tester/Form1.Designer.cs
diff --git a/GoGo Tester/Form1.cs b/GoGo Tester/Form1.cs
@@ -9,7 +9,6 @@
 using System.Net;
 using System.Net.Security;
 using System.Net.Sockets;
-using System.Security.Authentication;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -254,30 +253,6 @@ private void SetRndProgress(int testCount, int waitCount, int failedCount)
             }
         }
 
-        private string GenMixedUrl(string head, IPAddress addr)
-        {
-            var sbd = new StringBuilder(head + "://");
-
-            if (addr.AddressFamily == AddressFamily.InterNetwork)
-            {
-                sbd.Append(addr + "/");
-
-                for (int i = 10; i < 50; i++)
-                {
-                    sbd.Append("?");
-                    sbd.Append(Convert.ToBase64String(Encoding.ASCII.GetBytes(random.Next().ToString())));
-                    sbd.Append("=");
-                    sbd.Append(Convert.ToBase64String(Encoding.ASCII.GetBytes(random.Next().ToString())));
-                }
-            }
-            else
-            {
-                sbd.Append("[" + addr + "]");
-            }
-
-            return sbd.ToString();
-        }
-
         private TestInfomation TestProcess(TestInfomation info)
         {
             do
@@ -292,8 +267,12 @@ private TestInfomation TestProcess(TestInfomation info)
                 if (TestPortViaSocket(socket, info) && TestHttpViaSocket(socket, info))
                 {
                     info.PassCount++;
+
                     if (info.PassCount < Config.TestCount)
+                    {
+                        info.PortOk = info.HttpOk = false;
                         Thread.Sleep(Config.PingTimeout / 2);
+                    }
 
                     socket.Close();
                 }
@@ -425,13 +404,29 @@ private string GetRequestUrl(string protocol, string host, int port)
             var ubd = new StringBuilder();
             ubd.Append(string.Format("{0}://{1}/", protocol, host));
 
-            ubd.Append(string.Format("?{0}={1}", random.Next(), random.Next()));
+            ubd.Append(string.Format("?{0}={1}", GetParam(), GetParam()));
             for (int i = 10; i < 30; i++)
-                ubd.Append(string.Format("&{0}={1}", random.Next(), random.Next()));
+                ubd.Append(string.Format("&{0}={1}", GetParam(), GetParam()));
 
             return ubd.ToString();
         }
 
+
+        private string GetParam()
+        {
+            switch (random.Next(0, 3))
+            {
+                case 0:
+                    return random.Next().ToString();
+                case 1:
+                    return random.Next().ToString("X8");
+                case 2:
+                    return random.Next().ToString("X");
+                default:
+                    return "00000000";
+            }
+        }
+
         private string GetRequestHeaders(string method, string url, string host, int port, bool close = true, params string[] headers)
         {
             //http headers
@@ -1140,9 +1135,7 @@ private void LoadRndTestCache()
         private void mClearRndCache_Click(object sender, EventArgs e)
         {
             if (IsTesting())
-            {
                 return;
-            }
 
             CacheSet.Clear();
             if (File.Exists("gogo_cache"))