Some improvements on the torrent tracker.

[people/shoehn/ipfire.org.git] / www / webapp / handlers.py

diff --git a/www/webapp/handlers.py b/www/webapp/handlers.py
index 2f7fb204b06e3caf51edeb0124678854092d36e7..47c75cb74f36ff25fde88360abbf0ed668249b80 100644 (file)
--- 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"])