intro handover

llarp/handlers/tun.cpp

@@ -200,6 +200,7 @@ namespace llarp
     TunEndpoint::HandleDataMessage(const PathID_t &src,
                                    service::ProtocolMessage *msg)
     {
+      PutIntroFor(msg->tag, msg->introReply);
       EnsureReplyPath(msg->sender);
       service::Address addr;
       msg->sender.CalculateAddress(addr.data());

llarp/service/endpoint.cpp

@@ -963,8 +963,9 @@ namespace llarp
         {
           if(remoteIntro.expiresAt < intro.expiresAt && intro.router == orig)
           {
-            shifted     = orig != intro.router;
             remoteIntro = intro;
+            shifted     = true;
+            break;
           }
         }
       }