From 356d7fe2ffe5684a27fbdaed0cd7e010a99507bb Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Wed, 29 Apr 2020 11:23:42 +0100
Subject: [PATCH] always include the uuid in the tracker response

---
 .../core/tracker/TrackerResponder.groovy      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/src/main/groovy/com/muwire/core/tracker/TrackerResponder.groovy b/core/src/main/groovy/com/muwire/core/tracker/TrackerResponder.groovy
index 24b4780a..c33c2e70 100644
--- a/core/src/main/groovy/com/muwire/core/tracker/TrackerResponder.groovy
+++ b/core/src/main/groovy/com/muwire/core/tracker/TrackerResponder.groovy
@@ -129,21 +129,7 @@ class TrackerResponder {
                 def response = [:]
                 response.type = "TrackerPong"
                 response.me = me.toBase64()
-                
-                if (!muSettings.allowTracking) {
-                    response.code = 403
-                    respond(sender, response)
-                    return
-                }
-                
-                if (json.version != 1) {
-                    log.warning("unknown version $json.version")
-                    response.code = 400
-                    response.message = "I only support version 1"
-                    respond(sender,response)
-                    return
-                }
-                
+
                 if (json.infoHash == null) {
                     log.warning("infoHash missing")
                     return
@@ -163,6 +149,20 @@ class TrackerResponder {
                     uuids.put(uuid, System.currentTimeMillis())
                 }
                 response.uuid = json.uuid
+                                
+                if (!muSettings.allowTracking) {
+                    response.code = 403
+                    respond(sender, response)
+                    return
+                }
+                
+                if (json.version != 1) {
+                    log.warning("unknown version $json.version")
+                    response.code = 400
+                    response.message = "I only support version 1"
+                    respond(sender,response)
+                    return
+                }
                 
                 byte[] infoHashBytes = Base64.decode(json.infoHash)
                 InfoHash infoHash = new InfoHash(infoHashBytes)