Update: active the painkiller mode

bitdust · Jun 22, 2016 · 4a48bdf · 4a48bdf
1 parent 94d0a7f
commit 4a48bdf
Show file tree

Hide file tree

Showing 11 changed files with 390 additions and 380 deletions.
diff --git a/Nxsharp/Form1.Designer.cs b/Nxsharp/Form1.Designer.cs
diff --git a/Nxsharp/Form1.resx b/Nxsharp/Form1.resx
diff --git a/Nxsharp/Form2.Designer.cs b/Nxsharp/Form2.Designer.cs
diff --git a/Nxsharp/Form2.cs b/Nxsharp/Form2.cs
@@ -18,7 +18,15 @@ public Form2()
             InitializeComponent();
             if (Cfg.mode == 1)
             {
-                checkBox1.Checked = true;
+                modeButton2.Checked = true;
+            }
+            else if(Cfg.mode == 2)
+            {
+                modeButton3.Checked = true;
+            }
+            else if (Cfg.mode == 0)
+            {
+                modeButton1.Checked = true;
             }
         }
         private void button1_Click(object sender, EventArgs e)
@@ -33,10 +41,6 @@ private void button1_Click(object sender, EventArgs e)
                 this.Close();
             }
         }
-        private void checkBox1_CheckedChanged(object sender, EventArgs e)
-        {
-            Cfg.mode = 1;
-        }
 
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
@@ -48,5 +52,38 @@ private void button3_Click(object sender, EventArgs e)
             Form3 f3 = new Form3();
             f3.ShowDialog();      
         }
+
+        private void modeButton1_CheckedChanged(object sender, EventArgs e)
+        {
+            if(modeButton1.Checked)
+            {
+                Cfg.mode = 0;
+                Cfg.Commit();
+            }
+        }
+
+        private void modeButton2_CheckedChanged(object sender, EventArgs e)
+        {
+            if (modeButton2.Checked)
+            {
+                Cfg.mode = 1;
+                Cfg.Commit();
+            }
+
+        }
+
+        private void modeButton3_CheckedChanged(object sender, EventArgs e)
+        {
+            if (modeButton3.Checked)
+            {
+                Cfg.mode = 2;
+                Cfg.Commit();
+            }
+        }
+
+        private void Form2_Load(object sender, EventArgs e)
+        {
+
+        }
     }
 }
diff --git a/Nxsharp/Form2.resx b/Nxsharp/Form2.resx
@@ -123,7 +123,7 @@
 
 常见问题：
 0. 出现错误“stop connection 0x08”
-进入“本地连接&gt;属性&gt;身份验证”选项卡，检查是否启用了802.1x验证。请务必保持其关闭状态！
+进入“本地连接&amp;gt;属性&amp;gt;身份验证”选项卡，检查是否启用了802.1x验证。请务必保持其关闭状态！
 检查是否安装有360wifi。如果有请将其卸载或者换用猎豹wifi及wifi共享精灵等。这是一个位置问题，似乎360wifi的驱动机制会干扰认证进行，希望有人能向360wifi官方反映情况。
 1.无法运行？
 请确认已安装 .net framework 3.5
@@ -144,57 +144,4 @@
 本工具在njit8021xclient项目基础上开发，遵循GPLv3协议开源，代码托管于github:
 https://github.com/bitdust/nxsharp</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAMAEBAQAAAAAAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA
-        AAAgAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAACAgACAAAAAgACAAICA
-        AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAREREREAAREREREQAQMBABEREQswCw
-        AzARERELM/A7DxEREDC/v7AwEREQO/AA+zAQAQADAPAPAA9wBws38LMB8Id/AwDwCwEHD3/w+HEQEQj/
-        AA//ARERcHAPAHABEREQ/w8PgBEREReA9wDwEREREXEPAQERERERERcREREREf+PAAD8iQAA+AAAAPwA
-        AAD4AAAA+AAAAJAAAAAAAQAAAAEAAAAbAAAAHwAAAB8AAIA/AACAPwAA0X8AAPv/AAAoAAAAEAAAACAA
-        AAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICA
-        gADA3MAA8MqmAKo/KgD/PyoAAF8qAFVfKgCqXyoA/18qAAB/KgBVfyoAqn8qAP9/KgAAnyoAVZ8qAKqf
-        KgD/nyoAAL8qAFW/KgCqvyoA/78qAADfKgBV3yoAqt8qAP/fKgAA/yoAVf8qAKr/KgD//yoAAABVAFUA
-        VQCqAFUA/wBVAAAfVQBVH1UAqh9VAP8fVQAAP1UAVT9VAKo/VQD/P1UAAF9VAFVfVQCqX1UA/19VAAB/
-        VQBVf1UAqn9VAP9/VQAAn1UAVZ9VAKqfVQD/n1UAAL9VAFW/VQCqv1UA/79VAADfVQBV31UAqt9VAP/f
-        VQAA/1UAVf9VAKr/VQD//1UAAAB/AFUAfwCqAH8A/wB/AAAffwBVH38Aqh9/AP8ffwAAP38AVT9/AKo/
-        fwD/P38AAF9/AFVffwCqX38A/19/AAB/fwBVf38Aqn9/AP9/fwAAn38AVZ9/AKqffwD/n38AAL9/AFW/
-        fwCqv38A/79/AADffwBV338Aqt9/AP/ffwAA/38AVf9/AKr/fwD//38AAACqAFUAqgCqAKoA/wCqAAAf
-        qgBVH6oAqh+qAP8fqgAAP6oAVT+qAKo/qgD/P6oAAF+qAFVfqgCqX6oA/1+qAAB/qgBVf6oAqn+qAP9/
-        qgAAn6oAVZ+qAKqfqgD/n6oAAL+qAFW/qgCqv6oA/7+qAADfqgBV36oAqt+qAP/fqgAA/6oAVf+qAKr/
-        qgD//6oAAADUAFUA1ACqANQA/wDUAAAf1ABVH9QAqh/UAP8f1AAAP9QAVT/UAKo/1AD/P9QAAF/UAFVf
-        1ACqX9QA/1/UAAB/1ABVf9QAqn/UAP9/1AAAn9QAVZ/UAKqf1AD/n9QAAL/UAFW/1ACqv9QA/7/UAADf
-        1ABV39QAqt/UAP/f1AAA/9QAVf/UAKr/1AD//9QAVQD/AKoA/wAAH/8AVR//AKof/wD/H/8AAD//AFU/
-        /wCqP/8A/z//AABf/wBVX/8Aql//AP9f/wAAf/8AVX//AKp//wD/f/8AAJ//AFWf/wCqn/8A/5//AAC/
-        /wBVv/8Aqr//AP+//wAA3/8AVd//AKrf/wD/3/8AVf//AKr//wD/zMwA/8z/AP//MwD//2YA//+ZAP//
-        zAAAfwAAVX8AAKp/AAD/fwAAAJ8AAFWfAACqnwAA/58AAAC/AABVvwAAqr8AAP+/AAAA3wAAVd8AAKrf
-        AAD/3wAAVf8AAKr/AAAAACoAVQAqAKoAKgD/ACoAAB8qAFUfKgCqHyoA/x8qAAA/KgBVPyoA8Pv/AKSg
-        oACAgIAAAAD/AAD/AAAA//8A/wAAAAAAAAD//wAA////AP39/f39/f39/f39/f39/f39/TIy/YIy/f39
-        /f39/f39/f0uVvUu9f39/f39/f39/TIuNjIyWzJW9f39/f39/f1bWloyglsyMjL9/f39/f39/Vpb9f0I
-        VzL9/f39/f39/V6Dg1oxMjIy8TIy/V4y/f0JfwmDW1pWWjYyMi0u9f39/f2DglpbMjItVzIyWzJW9f39
-        g4P9WlpbWloygloyMjL9/f39/f39/VpfLf0IMzL9/f39/f39/VqDg1YxMloy8f39/f39/f2rX4eDW1sy
-        Wlr9/f39/f39/f2Cg1pbVv39/f39/f39/f39gwn9Wlr9/f39/f39/f39/f39/f39/f3//wAAyf8AAMH/
-        AAAAfwAAAH8AAIj/AAAAEwAAAAMAAMAAAADIAAAA/xEAAP4AAAD+AAAA/4MAAP+TAAD//wAAKAAAABAA
-        AAAgAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIdGROCNS0rtAAAAAKRT
-        SpqVUlP/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACKRkXysWJm/3A8
-        PP+VUlP/cDw8/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJhXVf9+QkL5wG5q/7th
-        Xv+4V07q2nBv/8RjY/+NRUDIbTU2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADch4b/wHV3/9yH
-        hv+ITU7yg0hLf7lubdDEY2P/sVZX/7FWV/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8amrENOH
-        hv/gj43/cDw8+XA8PDyaV1xezW5u/7FWV/+/RTkQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN2Q
-        jv/lpKb/8Kio/6prbv9wPDzch05O5cJsbf+xVlf/bTU2/4dGROCNS0rtAAAAAKRTSpqVUlP/AAAAAAAA
-        AADmqanD2Y2O8/Wxseftqaj/3YmG/9Z9d//CbG3/wHJy/71yc/+KRkXysWJm/3A8PP+VUlP/cDw8/wAA
-        AAAAAAAAAAAAAAAAAADioKPr25+e/9CCfv/Ofnr/uW9w/5hXVf9+QkL5wG5q/7thXv+4V07q2nBv/8Rj
-        Y/+NRUDIbTU2/wAAAAAAAAAA3Zyb/9qNirzomJgQzn56/71yc//ch4b/wHV3/9yHhv+ITU7yg0hLf7lu
-        bdDEY2P/sVZX/7FWV/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8amrENOHhv/gj43/cDw8+XA8
-        PDyaV1xezW5u/7FWV/+/RTkQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN2Qjv/lpKb/8Kio/6pr
-        bv9wPDzch05O5cJsbf+xVlf/bTU2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADmqanD2Y2O8/Wx
-        seftqaj/3YmG/9Z9d//CbG3/wHJy/71yc/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AADioKPr25+e/9CCfv/Ofnr/uW9w/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA3Zyb/9qNirzomJgQzn56/71yc/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///39yf/9/cH//f0Af/39AH8yMgB/
-        Mv0AE/39AAP9/cAALlbAAPX9/gD9/f4A/f3+ADYy/4MyVv+D/f3///39
-</value>
-  </data>
 </root>
diff --git a/Nxsharp/Properties/AssemblyInfo.cs b/Nxsharp/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.0.0")]
+[assembly: AssemblyVersion("3.4.0.0")]
+[assembly: AssemblyFileVersion("3.4.0.0")]
diff --git a/Nxsharp/app.config b/Nxsharp/app.config
@@ -10,7 +10,7 @@
     <add key="device" value="device"/>
     <add key="store" value="true"/>
     <add key="auto" value="false"/>
-    <add key="mode" value="1"/>
+    <add key="mode" value="2"/>
     <add key="versionHEX" value="43481156372e31302d30333133"/>
     <add key="H3C_key" value="Oly5D62FaE94W7"/>
     <add key="ClientSettingsProvider.ServiceUri" value=""/>

diff --git a/Nxsharp/iNode ClientGR.ico b/Nxsharp/iNode ClientGR.ico
diff --git a/Nxsharp/nxsharp.csproj b/Nxsharp/nxsharp.csproj
@@ -64,7 +64,7 @@
     <StartupObject />
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>iNode ClientR.ico</ApplicationIcon>
+    <ApplicationIcon>iNode ClientGR.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -146,6 +146,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="iNode ClientGR.ico" />
     <Content Include="iNode ClientR.ico" />
     <Content Include="Resources\services.ico" />
   </ItemGroup>

diff --git a/src/auth.c b/src/auth.c
diff --git a/src/main.c b/src/main.c
@@ -24,7 +24,7 @@ static 	char sPassword[100];
 static 	char sDeviceName[100];
 static 	char sVersion[17];
 static 	char sH3C_key[64];
-static int mode = 0; // 0:normal 1:auto-reconect ugly code 使用全局变量传递工作模式
+static int mode = 0; // 模式1即断线自动重连；模式0无自动重连；模式2 pankiller不发送心跳包，自动重连。 使用全局变量传递工作模式
 
 static HANDLE authThread = NULL;
 extern int stop_flag = 1;
@@ -43,14 +43,7 @@ DWORD WINAPI auth_thread_func(PVOID pParam)
 void StartAuthThread(const char *UserName, const char *Password, const char *DeviceName, const char *Version, const char *H3C_key, int mode_config)
 {
 	stop_flag = 0;
-	if (mode_config == 1)
-	{
-		mode = 1;//painkiller mode 即断线自动重连
-	}
-	else
-	{
-		mode = 0;//normal mode
-	}
+	mode = mode_config;// 模式1即断线自动重连；模式0无自动重连；模式2 pankiller不发送心跳包，自动重连。
 	strcpy(sUserName, UserName);
 	strcpy(sPassword, Password);
 	strcpy(sDeviceName, DeviceName);