From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 18 Nov 2010 10:13:54 +0000 (+0100)
Subject: Some improvements on the torrent tracker.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80337a92ea8dca7a9eab9f4a5d3c5a2dc813c448;p=ipfire.org.git

Some improvements on the torrent tracker.
---

diff --git a/www/webapp/handlers.py b/www/webapp/handlers.py
index 2f7fb204..47c75cb7 100644
--- a/www/webapp/handlers.py
+++ b/www/webapp/handlers.py
@@ -323,7 +323,7 @@ class TrackerAnnounceHandler(TrackerBaseHandler):
 
 		peer = {
 			"id" : self.get_hexencoded_argument("peer_id"),
-			"ip" : self.get_argument("ip", None),
+			"ip" : self.request.remote_ip,
 			"port" : self.get_argument("port", None),
 			"downloaded" : self.get_argument("downloaded", 0),
 			"uploaded" : self.get_argument("uploaded", 0),
@@ -335,12 +335,6 @@ class TrackerAnnounceHandler(TrackerBaseHandler):
 			self.send_tracker_error("Got unknown event")
 			return
 
-		if peer["ip"]:
-			if peer["ip"].startswith("10.") or \
-				peer["ip"].startswith("172.") or \
-				peer["ip"].startswith("192.168."):
-				peer["ip"] = self.request.remote_ip
-
 		if peer["port"]:
 			peer["port"] = int(peer["port"])
 
diff --git a/www/webapp/torrent.py b/www/webapp/torrent.py
index aa1edffc..8f6247f8 100644
--- a/www/webapp/torrent.py
+++ b/www/webapp/torrent.py
@@ -113,6 +113,9 @@ class Tracker(object):
 		args = [ "last_update = '%s'" % self.now ]
 
 		if ip:
+			if ip.startswith("172.28.1."):
+				ip = "178.63.73.246"
+
 			args.append("ip='%s'" % ip)
 
 		if port: