Browse Source

correct parsing of caught RouterInfo at IBGW and OBEP

pull/1919/head
orignal 2 years ago
parent
commit
ead6a6dca3
  1. 5
      libi2pd/NetDb.cpp
  2. 2
      libi2pd/Tunnel.cpp
  3. 2
      libi2pd/TunnelEndpoint.cpp

5
libi2pd/NetDb.cpp

@ -791,9 +791,11 @@ namespace data
LogPrint (eLogError, "NetDb: Database store msg with reply token is too short ", len, ". Dropped"); LogPrint (eLogError, "NetDb: Database store msg with reply token is too short ", len, ". Dropped");
return; return;
} }
auto deliveryStatus = CreateDeliveryStatusMsg (replyToken);
uint32_t tunnelID = bufbe32toh (buf + offset); uint32_t tunnelID = bufbe32toh (buf + offset);
offset += 4; offset += 4;
if (replyToken != 0xFFFFFFFFU) // if not caught on OBEP or IBGW
{
auto deliveryStatus = CreateDeliveryStatusMsg (replyToken);
if (!tunnelID) // send response directly if (!tunnelID) // send response directly
transports.SendMessage (buf + offset, deliveryStatus); transports.SendMessage (buf + offset, deliveryStatus);
else else
@ -805,6 +807,7 @@ namespace data
else else
LogPrint (eLogWarning, "NetDb: No outbound tunnels for DatabaseStore reply found"); LogPrint (eLogWarning, "NetDb: No outbound tunnels for DatabaseStore reply found");
} }
}
offset += 32; offset += 32;
} }
// we must send reply back before this check // we must send reply back before this check

2
libi2pd/Tunnel.cpp

@ -593,7 +593,7 @@ namespace tunnel
{ {
// transit DatabaseStore might contain new/updated RI // transit DatabaseStore might contain new/updated RI
auto m = CopyI2NPMessage (msg); auto m = CopyI2NPMessage (msg);
memset (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET, 0, 4); // no reply memset (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET, 0xFF, 4); // fake replyToken meaning no reply
i2p::data::netdb.PostI2NPMsg (m); i2p::data::netdb.PostI2NPMsg (m);
} }
tunnel->SendTunnelDataMsg (msg); tunnel->SendTunnelDataMsg (msg);

2
libi2pd/TunnelEndpoint.cpp

@ -331,7 +331,7 @@ namespace tunnel
else if (IsRouterInfoMsg (msg.data)) else if (IsRouterInfoMsg (msg.data))
{ {
auto m = CopyI2NPMessage (msg.data); auto m = CopyI2NPMessage (msg.data);
memset (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET, 0, 4); // no reply memset (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET, 0xFF, 4); // fake replyToken meaning no reply
i2p::data::netdb.PostI2NPMsg (m); i2p::data::netdb.PostI2NPMsg (m);
} }
} }

Loading…
Cancel
Save