diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-19 23:37:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 23:37:21 +0200 |
| commit | 865be2768b9b90aa01faff3dc17cad05ff8c7798 (patch) | |
| tree | 3348b1d932013b51984845190bcc81e31ee21166 /editor | |
| parent | b03a6e55e0a2dfdf57139459b6854fb72d5841f3 (diff) | |
| parent | 72b4a09a1402cb3807f1c3454ed5274dff67d0ae (diff) | |
Merge pull request #11378 from Faless/ipv6_no_linklocal
Do not allow link-local addresses to be used by editor debugger
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_settings.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index d4ee6b2d17..11b9f99645 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -460,7 +460,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/remote_host") ? get("network/debug/remote_host") : ""; 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(); - 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 != "") |