From 847fcdf5f32b9a2f8e705ad1ea5908906d5b6c27 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Fri, 9 Aug 2019 08:16:20 -0400
Subject: [PATCH 1/2] move convotag missmatch check to the right place

---
 llarp/service/protocol.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/llarp/service/protocol.cpp b/llarp/service/protocol.cpp
index 31dab271e..cd95018a6 100644
--- a/llarp/service/protocol.cpp
+++ b/llarp/service/protocol.cpp
@@ -307,15 +307,6 @@ namespace llarp
           return;
         }
 
-        if(self->frame.T != self->msg->tag)
-        {
-          LogError("convotag missmatch: ", self->frame.T,
-                   " != ", self->msg->tag);
-          self->msg.reset();
-          delete self;
-          return;
-        }
-
         if(self->handler->HasConvoTag(self->msg->tag))
         {
           LogError("dropping duplicate convo tag T=", self->msg->tag);
@@ -414,6 +405,11 @@ namespace llarp
         LogError("failed to decrypt message");
         return false;
       }
+      if(T != msg->tag && !msg->tag.IsZero())
+      {
+        LogError("convotag missmatch: ", T , " != ", msg->tag);
+        return false;
+      }
       msg->handler            = handler;
       const PathID_t fromPath = F;
       logic->queue_func(

From fdbb2e8dc813862cf04634d0f5f890b782440ac4 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Fri, 9 Aug 2019 08:17:01 -0400
Subject: [PATCH 2/2] make format

---
 llarp/service/protocol.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llarp/service/protocol.cpp b/llarp/service/protocol.cpp
index cd95018a6..5c821d9a2 100644
--- a/llarp/service/protocol.cpp
+++ b/llarp/service/protocol.cpp
@@ -407,7 +407,7 @@ namespace llarp
       }
       if(T != msg->tag && !msg->tag.IsZero())
       {
-        LogError("convotag missmatch: ", T , " != ", msg->tag);
+        LogError("convotag missmatch: ", T, " != ", msg->tag);
         return false;
       }
       msg->handler            = handler;