tracker: Fix sending the peer id.

diff --git a/webapp/backend/tracker.py b/webapp/backend/tracker.py
index d0ceb32140acf1e906b6a11e18c0d5f30d6367be..b76875f10cdd91df9432dfc18978c9a123ada46b 100644 (file)
--- a/webapp/backend/tracker.py
+++ b/webapp/backend/tracker.py
@@ -6,16 +6,12 @@ import random
 
 from misc import Object
 
-def decode_hex(s):
-       ret = []
-       for c in s:
-               for i in range(256):
-                       if not c == chr(i):
-                               continue
+def encode_hex(s):
+       return s.encode("hex")
 
-                       ret.append("%02x" % i)
+def decode_hex(s):
+       return s.decode("hex")
 
-       return "".join(ret)
 
 class Tracker(Object):
        @property
@@ -75,10 +71,10 @@ class Tracker(Object):
 
                        if not no_peer_id:
                                if peer6:
-                                       peer6["peer id"] = row.id
+                                       peer6["peer id"] = decode_hex(row.id)
 
                                if peer4:
-                                       peer4["peer id"] = row.id
+                                       peer4["peer id"] = decode_hex(row.id)
 
                        if peer6:
                                peers.append(peer6)

diff --git a/webapp/handlers_tracker.py b/webapp/handlers_tracker.py
index 27fe7fd762182c9514aff567c06e5fac36551dcb..bbcc64f20531f9492e1fbb038b9ccba6d5494346 100644 (file)
--- a/webapp/handlers_tracker.py
+++ b/webapp/handlers_tracker.py
@@ -3,7 +3,7 @@
 import re
 import tornado.web
 
-from backend.tracker import bencode, bdecode, decode_hex
+from backend.tracker import bencode, bdecode, encode_hex, decode_hex
 from handlers_base import *
 
 
@@ -51,7 +51,7 @@ class TrackerBaseHandler(BaseHandler):
 
                arguments_new = []
                for argument in arguments:
-                       arguments_new.append(decode_hex(argument))
+                       arguments_new.append(encode_hex(argument))
 
                arguments = arguments_new