|
|
@ -307,15 +307,6 @@ namespace llarp
|
|
|
|
return;
|
|
|
|
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))
|
|
|
|
if(self->handler->HasConvoTag(self->msg->tag))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
LogError("dropping duplicate convo tag T=", self->msg->tag);
|
|
|
|
LogError("dropping duplicate convo tag T=", self->msg->tag);
|
|
|
@ -414,6 +405,11 @@ namespace llarp
|
|
|
|
LogError("failed to decrypt message");
|
|
|
|
LogError("failed to decrypt message");
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(T != msg->tag && !msg->tag.IsZero())
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
LogError("convotag missmatch: ", T , " != ", msg->tag);
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
msg->handler = handler;
|
|
|
|
msg->handler = handler;
|
|
|
|
const PathID_t fromPath = F;
|
|
|
|
const PathID_t fromPath = F;
|
|
|
|
logic->queue_func(
|
|
|
|
logic->queue_func(
|
|
|
|