godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11378 from Faless/ipv6_no_linklocal

Browse Source 
Do not allow link-local addresses to be used by editor debugger
This commit is contained in:
Rémi Verschelde 2017-09-19 23:37:21 +02:00 committed by GitHub
commit 865be2768b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_settings.cpp
View File

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