2.24.6

AirVPN · Jan 9, 2025 · 621fdcd · 621fdcd
1 parent df34423
commit 621fdcd
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/resources/iso-3166.json b/resources/iso-3166.json
@@ -1509,7 +1509,7 @@
 		"longitude": 38
 	},
 	{
-		"name": "Taiwan, Province of China",
+		"name": "Taiwan, Republic of China",
 		"alpha-2": "TW",
 		"country-code": "158",
 		"latitude": 23.5,

diff --git a/resources/providers/AirVPN.json b/resources/providers/AirVPN.json
@@ -23,6 +23,9 @@
       },
       {
         "address":"http://[2a03:b0c0:0:1010::9b:c001]"
+      },
+      {
+        "address":"http://bootme.org"
       }
     ]
   }

diff --git a/src/App.CLI.MacOS.Elevated.Service/src/main.cpp b/src/App.CLI.MacOS.Elevated.Service/src/main.cpp
@@ -36,7 +36,7 @@ using json = nlohmann::json;
 
 std::string serviceName = "eddie-elevated";
 std::string serviceDesc = "Eddie Elevation";
-std::string serviceLauncherPath = "/usr/local/bin/eddie-vpn-service-launcher";
+std::string serviceLauncherPath = "/Library/PrivilegedHelperTools/website.eddie.Helper";
 std::string launchdPath = "/Library/LaunchDaemons/org.airvpn.eddie.ui.elevated.plist";
 
 const std::string FsPathSeparator = "/";
@@ -156,7 +156,7 @@ bool FsFileIsRootOnly(std::string path)
 
 std::string SystemWideDataPath()
 {
-	return "/usr/local/bin/eddie-vpn.dat";
+	return "/Library/PrivilegedHelperTools/website.eddie.Helper.dat";
 }
 
 std::string SystemWideDataGet(const std::string& key, const std::string& def)

diff --git a/src/App.CLI.MacOS.Elevated/src/impl.cpp b/src/App.CLI.MacOS.Elevated/src/impl.cpp
@@ -38,7 +38,7 @@
 
 std::string serviceName = "eddie-elevated";
 std::string serviceDesc = "Eddie VPN Elevation";
-std::string serviceLauncherPath = "/usr/local/bin/eddie-vpn-service-launcher";
+std::string serviceLauncherPath = "/Library/PrivilegedHelperTools/website.eddie.Helper";
 std::string launchdPath = "/Library/LaunchDaemons/org.airvpn.eddie.ui.elevated.plist";
 
 int Impl::Main()
@@ -757,7 +757,7 @@ std::vector<std::string> Impl::GetNetworkInterfacesNames()
 
 std::string Impl::SystemWideDataPath()
 {
-	return "/usr/local/bin/eddie-vpn.dat";
+	return "/Library/PrivilegedHelperTools/website.eddie.Helper.dat";
 }
 
 std::string Impl::CheckIfClientPathIsAllowed(const std::string& path)

diff --git a/src/App.CLI.Windows.Elevated/src/impl.cpp b/src/App.CLI.Windows.Elevated/src/impl.cpp
@@ -1193,5 +1193,5 @@ void Impl::CleanupCompatibility()
 				// TODO
 			}
 		}
-	}
+	}	
 }
diff --git a/src/Lib.Core/Constants.cs b/src/Lib.Core/Constants.cs
@@ -29,8 +29,8 @@ public static class Constants
 		public static byte[] NotSecretPayload = Encoding.UTF8.GetBytes("4af85e84255b077ad890dba297e811b7d016add1");
 		public static string PasswordIfEmpty = "e6552ddf3ac5c8755a82870d91273a63eab0da1e";
 		public static string Thanks = "Clodo, PJ, reiandrea, ProMIND, Berserker, OpenSourcerer, zhang888, LZ1, giganerd, Uncle Hunto, go558a83nk, sheivoko, NaDre, pfSense_fan, x0wllaar, cmaves";
-		public static int VersionInt = 295;
-		public static string VersionDesc = "2.24.5"; // Used by deploy system also to generate filenames
+		public static int VersionInt = 296;
+		public static string VersionDesc = "2.24.6"; // Used by deploy system also to generate filenames
 		public static bool VersionBeta = false;
 		public static string Domain = "eddie.website";
 		public static string WebSite = "https://eddie.website";

diff --git a/src/Lib.Core/Providers/Service.cs b/src/Lib.Core/Providers/Service.cs
@@ -870,9 +870,12 @@ public List<string> GetBootstrapUrls()
 					IpAddress ip = new IpAddress(sUrl);
 					if (ip.IsV4)
 						sUrl = "http://" + ip.ToString();
-					else
+					else if(ip.IsV6)
 						sUrl = "http://[" + ip.ToString() + "]";
 
+					if ((!sUrl.StartsWithInv("http://")) && (!sUrl.StartsWithInv("https://")))
+						sUrl = "http://" + sUrl;
+
 					string host = Utils.HostFromUrl(sUrl);
 					if (host != "")
 						urls.Add(sUrl);
@@ -888,7 +891,7 @@ public List<string> GetBootstrapUrls()
 					urls.Add(nodeUrl.Attributes["address"].Value);
 				}
 			}
-
+			
 			return urls;
 		}
 

diff --git a/src/Lib.Platform.MacOS/Platform.cs b/src/Lib.Platform.MacOS/Platform.cs
@@ -944,17 +944,13 @@ public override Json GetRealtimeNetworkStats()
 						Int64 snd = jNativeIf["snd"].ValueInt64;
 						Json jInterface = new Json();
 						jInterface["id"].Value = interfaces[i].Id;
-						jInterface["pazzoid"].Value = jNativeIf["idn"].ValueString;												
 						jInterface["rcv"].Value = rcv;
 						jInterface["snd"].Value = snd;
 						result.Append(jInterface);
 					}
 				}
 			}
 
-			System.IO.File.WriteAllText("/tmp/pazzo2.json", result.ToJsonPretty());
-			// pazzo
-
 			return result;
 			*/
 		}

diff --git a/src/Lib.Platform.Windows/Platform.cs b/src/Lib.Platform.Windows/Platform.cs
@@ -1724,7 +1724,7 @@ public override void OpenVpnEnsureInterface(string driver, string ifaceName)
 					string interfaceDescription = jNetworkInterface["description"].ValueString;
 					string interfaceType = jNetworkInterface["type"].ValueString;
 					string interfaceStatus = jNetworkInterface["status"].ValueString;
-
+										
 					if (jNetworkInterface.HasKey("device_id") == false)
 						continue;
 					if (interfaceType != "Virtual")
@@ -1734,6 +1734,9 @@ public override void OpenVpnEnsureInterface(string driver, string ifaceName)
 					if ((ifaceName != "") && (interfaceName != ifaceName))
 						continue;
 
+					if (interfaceDescription.Contains("ExpressVPN")) // 2.24.6: Unresolved compatibility, detected ok but OpenVPN fail on "open_tun".
+						continue;
+
 					string interfaceDeviceID = jNetworkInterface["device_id"].ValueString;
 
 					if ((driver == "ovpn-dco") && (interfaceDeviceID.ToLowerInvariant() == "ovpn-dco"))
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,9 @@ @@
           },
           {
             "address":"http://[2a03:b0c0:0:1010::9b:c001]"
+          },
+          {
+            "address":"http://bootme.org"
           }
         ]
       }
@@ Expand Down @@