diff options
| author | Daniel Wilhelm <shieldwed@outlook.com> | 2020-03-20 22:34:51 +0000 |
|---|---|---|
| committer | Daniel Wilhelm <shieldwed@outlook.com> | 2020-03-20 22:34:51 +0000 |
| commit | 543ddcd795ba2fa44676b59135a745f51f28a8da (patch) | |
| tree | 5c378aa54f4bb65c081cf9a92530d8af1f1f53dd /Bugs.txt | |
| parent | Merge branch '10.20' into 'master' (diff) | |
| parent | add upstream 10.21 (diff) | |
| download | FreeFileSync-543ddcd795ba2fa44676b59135a745f51f28a8da.tar.gz FreeFileSync-543ddcd795ba2fa44676b59135a745f51f28a8da.tar.bz2 FreeFileSync-543ddcd795ba2fa44676b59135a745f51f28a8da.zip | |
Merge branch '10.21' into 'master'10.21
add upstream 10.21
See merge request opensource-tracking/FreeFileSync!18
Diffstat (limited to 'Bugs.txt')
| -rwxr-xr-x | Bugs.txt | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -5,27 +5,25 @@ the ones mentioned below. The remaining issues that are yet to be fixed are list ----------------- -| libcurl 7.6.7 | +| libcurl 7.6.9 | ----------------- __________________________________________________________________________________________________________ /lib/ftp.c https://github.com/curl/curl/issues/1455 -Add: - static bool is_routable_ip_v4(unsigned int ip[4]) - { - if (ip[0] == 127 || //127.0.0.0/8 (localhost) - ip[0] == 10 || //10.0.0.0/8 (private) - (ip[0] == 192 && ip[1] == 168) || //192.168.0.0/16 (private) - (ip[0] == 169 && ip[1] == 254) || //169.254.0.0/16 (link-local) - (ip[0] == 172 && ip[1] / 16 == 1)) //172.16.0.0/12 (private) - return false; - return true; - } ++ static bool is_routable_ip_v4(unsigned int ip[4]) ++ { ++ if (ip[0] == 127 || //127.0.0.0/8 (localhost) ++ ip[0] == 10 || //10.0.0.0/8 (private) ++ (ip[0] == 192 && ip[1] == 168) || //192.168.0.0/16 (private) ++ (ip[0] == 169 && ip[1] == 254) || //169.254.0.0/16 (link-local) ++ (ip[0] == 172 && ip[1] / 16 == 1)) //172.16.0.0/12 (private) ++ return false; ++ return true; ++ } - if (data->set.ftp_skip_ip) - + bool skipIp = data->set.ftp_skip_ip; + if (!skipIp && !is_routable_ip_v4(ip)) + { |