Browse Source

Merge pull request #11968 from Faless/ipv6_no_linklocal_2.1

[2.1] Do not allow link-local addresses to be used by editor debugger
Andreas Haas 8 years ago
parent
commit
2235f6266a
1 changed files with 4 additions and 3 deletions
  1. 4 3
      editor/editor_settings.cpp

+ 4 - 3
editor/editor_settings.cpp

@@ -410,7 +410,7 @@ void EditorSettings::setup_network() {
 
 	List<IP_Address> local_ip;
 	IP::get_singleton()->get_local_addresses(&local_ip);
-	String lip;
+	String lip = "127.0.0.1";
 	String hint;
 	String current = has("network/debug_host") ? get("network/debug_host") : "";
 	int port = has("network/debug_port") ? (int)get("network/debug_port") : 6096;
@@ -419,8 +419,9 @@ void EditorSettings::setup_network() {
 
 		String ip = E->get();
 
-		if (lip == "")
-			lip = ip;
+		// link-local IPv6 addresses don't work, skipping them
+		if (ip.begins_with("fe80:0:0:0:")) // fe80::/64
+			continue;
 		if (ip == current)
 			lip = current; //so it saves
 		if (hint != "")