From 903c824c2cc3b4ac283611fc852e79c62e540f33 Mon Sep 17 00:00:00 2001 From: orbiter Date: Mon, 27 Dec 2010 23:11:56 +0000 Subject: [PATCH] - allow only scanned resourced with granted status - increased time-out when scanning an ip range git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7398 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/CrawlStartScanner_p.java | 2 +- source/net/yacy/cora/protocol/Scanner.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htroot/CrawlStartScanner_p.java b/htroot/CrawlStartScanner_p.java index b74832fa4..0f60bb592 100644 --- a/htroot/CrawlStartScanner_p.java +++ b/htroot/CrawlStartScanner_p.java @@ -104,7 +104,7 @@ public class CrawlStartScanner_p { if (p >= 0) host = host.substring(0, p); ia.add(Domains.dnsResolve(host)); } - Scanner scanner = new Scanner(ia, 100, sb.isIntranetMode() ? 500 : 2000); + Scanner scanner = new Scanner(ia, 100, sb.isIntranetMode() ? 1000 : 5000); if (post.get("scanftp", "").equals("on")) scanner.addFTP(false); if (post.get("scanhttp", "").equals("on")) scanner.addHTTP(false); if (post.get("scanhttps", "").equals("on")) scanner.addHTTPS(false); diff --git a/source/net/yacy/cora/protocol/Scanner.java b/source/net/yacy/cora/protocol/Scanner.java index f8ad23d7b..a34cb17a7 100644 --- a/source/net/yacy/cora/protocol/Scanner.java +++ b/source/net/yacy/cora/protocol/Scanner.java @@ -149,7 +149,9 @@ public class Scanner extends Thread { if (a == null) return true; InetAddress n = normalize(a); if (!scancacheScanrange.contains(n)) return true; - return scancache.containsKey(new Service(url.getProtocol(), a)); + Access access = scancache.get(new Service(url.getProtocol(), a)); + if (access == null) return false; + return access == Access.granted; } private static InetAddress normalize(InetAddress a) {