add back support for ip filter files to client_test. add some logging when tracker IPs are filtered

examples/client_test.cpp

@@ -891,32 +891,22 @@ int main(int argc, char* argv[])
 			case 'H': start_dht = false; --i; break;
 			case 'x':
 				{
-					/*
+					FILE* filter = fopen(arg, "r");
-					std::ifstream in(arg);
+					if (filter)
-					ip_filter filter;
-					while (in.good())
 					{
-						char line[300];
+						ip_filter fil;
-						in.getline(line, 300);
+						unsigned int a,b,c,d,e,f,g,h, flags;
-						int len = in.gcount();
+						while (fscanf(filter, "%u.%u.%u.%u - %u.%u.%u.%u %u\n", &a, &b, &c, &d, &e, &f, &g, &h, &flags) == 9)
-						if (len <= 0) continue;
+						{
-						if (line[0] == '#') continue;
+							address_v4 start((a << 24) + (b << 16) + (c << 8) + d);
-						int a, b, c, d;
+							address_v4 last((e << 24) + (f << 16) + (g << 8) + h);
-						char dummy;
+							if (flags <= 127) flags = ip_filter::blocked;
-						std::stringstream ln(line);
+							else flags = 0;
-						ln >> a >> dummy >> b >> dummy >> c >> dummy >> d >> dummy;
+							fil.add_rule(start, last, flags);
-						address_v4 start((a << 24) + (b << 16) + (c << 8) + d);
+						}
-						ln >> a >> dummy >> b >> dummy >> c >> dummy >> d;
+						ses.set_ip_filter(fil);
-						address_v4 last((a << 24) + (b << 16) + (c << 8) + d);
+						fclose(filter);
-						int flags;
-						ln >> flags;
-						if (flags <= 127) flags = ip_filter::blocked;
-						else flags = 0;
-						if (ln.fail()) break;
-						filter.add_rule(start, last, flags);
 					}
-					ses.set_ip_filter(filter);
-					*/
 				}
 				break;
 			case 'c': ses.set_max_connections(atoi(arg)); break;

src/http_tracker_connection.cpp

@@ -246,6 +246,13 @@ namespace libtorrent
 				++i;
 		}
 
+#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
+		boost::shared_ptr<request_callback> cb = requester();
+		if (cb)
+		{
+			cb->debug_log("*** TRACKER_FILTER");
+		}
+#endif
 		if (endpoints.empty())
 			fail(error_code(errors::banned_by_ip_filter));
 	}

src/udp_tracker_connection.cpp

@@ -147,7 +147,12 @@ namespace libtorrent
 			i != m_endpoints.end();)
 		{
 			if (m_ses.m_ip_filter.access(i->address()) == ip_filter::blocked) 
+			{
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
+				if (cb) cb->debug_log("*** UDP_TRACKER [ IP blocked by filter: " + print_address(i->address()) + " ]");
+#endif
 				i = m_endpoints.erase(i);
+			}
 			else
 				++i;
 		}