fix up sid ci pipeline

pull/1972/head
Jeff 2 years ago
parent 58052f5b17
commit 2d1645bfe1

@ -57,8 +57,7 @@ namespace llarp
llarp_dht_context* ctx, std::vector<std::unique_ptr<IMessage>>& replies) const
{
const auto now = ctx->impl->Now();
const llarp::dht::Key_t addr(introset.derivedSigningKey);
const auto keyStr = addr.ToHex();
const llarp::dht::Key_t addr{introset.derivedSigningKey.data()};
auto router = ctx->impl->GetRouter();
router->NotifyRouterEvent<tooling::PubIntroReceivedEvent>(
@ -134,7 +133,7 @@ namespace llarp
return true;
}
llarp::LogInfo("Relaying PublishIntroMessage for ", keyStr, ", txid=", txID);
llarp::LogInfo("Relaying PublishIntroMessage for ", addr, ", txid=", txID);
propagateIfNotUs(relayOrder);
}
@ -156,7 +155,7 @@ namespace llarp
{
LogInfo(
"Received PubIntro for ",
keyStr,
addr,
", txid=",
txID,
" and we are candidate ",
@ -169,7 +168,7 @@ namespace llarp
LogWarn(
"!!! Received PubIntro with relayed==false but we aren't"
" candidate, intro derived key: ",
keyStr,
addr,
", txid=",
txID,
", message from: ",

@ -209,7 +209,11 @@ namespace llarp
bool
SockAddr::operator<(const SockAddr& other) const
{
return (m_addr.sin6_addr.s6_addr < other.m_addr.sin6_addr.s6_addr);
return memcmp(
m_addr.sin6_addr.s6_addr,
other.m_addr.sin6_addr.s6_addr,
sizeof(m_addr.sin6_addr.s6_addr))
< 0;
}
bool

Loading…
Cancel
Save