PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-14 08:50:12 +00:00
Code Issues Releases Activity

send new tags in advance

Browse Source
This commit is contained in:
orignal 2014-10-16 20:12:46 -04:00
parent c8bca65b97
commit 3bd035cb16
2 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Garlic.cpp
View File

@ -16,30 +16,20 @@ namespace garlic
{ {
GarlicRoutingSession::GarlicRoutingSession (GarlicDestination * owner, GarlicRoutingSession::GarlicRoutingSession (GarlicDestination * owner,
const i2p::data::RoutingDestination * destination, int numTags): const i2p::data::RoutingDestination * destination, int numTags):
m_Owner (owner), m_Destination (destination), m_IsAcknowledged (false), m_Owner (owner), m_Destination (destination), m_NumTags (numTags),
m_NumTags (numTags), m_NextTag (-1), m_SessionTags (0), m_TagsCreationTime (0), m_TagsCreationTime (0), m_LeaseSetUpdated (numTags > 0)
m_LeaseSetUpdated (numTags > 0)
{ {
// create new session tags and session key // create new session tags and session key
m_Rnd.GenerateBlock (m_SessionKey, 32); m_Rnd.GenerateBlock (m_SessionKey, 32);
m_Encryption.SetKey (m_SessionKey); m_Encryption.SetKey (m_SessionKey);
if (m_NumTags > 0)
{
m_SessionTags = new SessionTag[m_NumTags];
GenerateSessionTags ();
}
else
m_SessionTags = nullptr;
} }
GarlicRoutingSession::GarlicRoutingSession (const uint8_t * sessionKey, const SessionTag& sessionTag): GarlicRoutingSession::GarlicRoutingSession (const uint8_t * sessionKey, const SessionTag& sessionTag):
m_Owner (nullptr), m_Destination (nullptr), m_IsAcknowledged (true), m_NumTags (1), m_Owner (nullptr), m_Destination (nullptr), m_NumTags (1), m_LeaseSetUpdated (false)
m_NextTag (0), m_LeaseSetUpdated (false)
{ {
memcpy (m_SessionKey, sessionKey, 32); memcpy (m_SessionKey, sessionKey, 32);
m_Encryption.SetKey (m_SessionKey); m_Encryption.SetKey (m_SessionKey);
m_SessionTags = new SessionTag[1]; // 1 tag m_SessionTags.push_back (sessionTag);
m_SessionTags[0] = sessionTag;
m_TagsCreationTime = i2p::util::GetSecondsSinceEpoch (); m_TagsCreationTime = i2p::util::GetSecondsSinceEpoch ();
} }
@ -47,19 +37,16 @@ namespace garlic
{ {
for (auto it: m_UnconfirmedTagsMsgs) for (auto it: m_UnconfirmedTagsMsgs)
delete it.second; delete it.second;
m_UnconfirmedTagsMsgs.clear (); m_UnconfirmedTagsMsgs.clear ();
delete[] m_SessionTags;
} }
void GarlicRoutingSession::GenerateSessionTags () GarlicRoutingSession::UnconfirmedTags * GarlicRoutingSession::GenerateSessionTags ()
{ {
if (m_SessionTags) auto tags = new UnconfirmedTags (m_NumTags);
{ for (int i = 0; i < m_NumTags; i++)
for (int i = 0; i < m_NumTags; i++) m_Rnd.GenerateBlock (tags->sessionTags[i], 32);
m_Rnd.GenerateBlock (m_SessionTags[i], 32); tags->tagsCreationTime = i2p::util::GetSecondsSinceEpoch ();
m_TagsCreationTime = i2p::util::GetSecondsSinceEpoch (); return tags;
m_IsAcknowledged = false;
}
} }
void GarlicRoutingSession::TagsConfirmed (uint32_t msgID) void GarlicRoutingSession::TagsConfirmed (uint32_t msgID)
@ -67,8 +54,13 @@ namespace garlic
auto it = m_UnconfirmedTagsMsgs.find (msgID); auto it = m_UnconfirmedTagsMsgs.find (msgID);
if (it != m_UnconfirmedTagsMsgs.end ()) if (it != m_UnconfirmedTagsMsgs.end ())
{ {
UnconfirmedTags * tags = it->second;
for (int i = 0; i < tags->numTags; i++)
m_SessionTags.push_back (tags->sessionTags[i]);
m_TagsCreationTime = i2p::util::GetSecondsSinceEpoch ();
m_UnconfirmedTagsMsgs.erase (it);
delete tags;
} }
m_IsAcknowledged = true;
} }
I2NPMessage * GarlicRoutingSession::WrapSingleMessage (I2NPMessage * msg) I2NPMessage * GarlicRoutingSession::WrapSingleMessage (I2NPMessage * msg)
@ -80,22 +72,17 @@ namespace garlic
// take care about tags // take care about tags
if (m_NumTags > 0) if (m_NumTags > 0)
{ {
if (i2p::util::GetSecondsSinceEpoch () >= m_TagsCreationTime + TAGS_EXPIRATION_TIMEOUT) if (m_TagsCreationTime && i2p::util::GetSecondsSinceEpoch () >= m_TagsCreationTime + TAGS_EXPIRATION_TIMEOUT)
{ {
// old tags expired create new set // old tags expired create new set
LogPrint ("Garlic tags expired"); LogPrint ("Garlic tags expired");
GenerateSessionTags (); m_SessionTags.clear ();
m_NextTag = -1;
} }
else if (!m_IsAcknowledged) // new set of tags was not acknowledged
{
LogPrint ("Previous garlic tags was not acknowledged. Use ElGamal");
m_NextTag = -1; // have to use ElGamal
}
} }
// create message // create message
if (m_NextTag < 0 || !m_NumTags) // new session if (!m_NumTags || !m_SessionTags.size ()) // new session
{ {
LogPrint ("No garlic tags available. Use ElGamal");
if (!m_Destination) if (!m_Destination)
{ {
LogPrint ("Can't use ElGamal for unknown destination"); LogPrint ("Can't use ElGamal for unknown destination");
@ -115,23 +102,17 @@ namespace garlic
else // existing session else // existing session
{ {
// session tag // session tag
memcpy (buf, m_SessionTags[m_NextTag], 32); SessionTag tag = m_SessionTags.front ();
m_SessionTags.pop_front (); // use same tag only once
memcpy (buf, tag, 32);
uint8_t iv[32]; // IV is first 16 bytes uint8_t iv[32]; // IV is first 16 bytes
CryptoPP::SHA256().CalculateDigest(iv, m_SessionTags[m_NextTag], 32); CryptoPP::SHA256().CalculateDigest(iv, tag, 32);
m_Encryption.SetIV (iv); m_Encryption.SetIV (iv);
buf += 32; buf += 32;
len += 32; len += 32;
// re-create session tags if necessary
if (m_NextTag >= m_NumTags - 1) // we have used last tag
{
GenerateSessionTags ();
m_NextTag = -1;
}
} }
// AES block // AES block
len += CreateAESBlock (buf, msg); len += CreateAESBlock (buf, msg);
m_NextTag++;
*(uint32_t *)(m->GetPayload ()) = htobe32 (len); *(uint32_t *)(m->GetPayload ()) = htobe32 (len);
m->len += len + 4; m->len += len + 4;
FillI2NPMessageHeader (m, eI2NPGarlic); FillI2NPMessageHeader (m, eI2NPGarlic);
@ -143,13 +124,15 @@ namespace garlic
size_t GarlicRoutingSession::CreateAESBlock (uint8_t * buf, const I2NPMessage * msg) size_t GarlicRoutingSession::CreateAESBlock (uint8_t * buf, const I2NPMessage * msg)
{ {
size_t blockSize = 0; size_t blockSize = 0;
*(uint16_t *)buf = m_NextTag < 0 ? htobe16 (m_NumTags) : 0; // tag count bool createNewTags = m_Owner && ((int)m_SessionTags.size () <= m_NumTags/4);
UnconfirmedTags * newTags = createNewTags ? GenerateSessionTags () : nullptr;
*(uint16_t *)buf = newTags ? htobe16 (newTags->numTags) : 0; // tag count
blockSize += 2; blockSize += 2;
if (m_NextTag < 0) // session tags recreated if (newTags) // session tags recreated
{ {
for (int i = 0; i < m_NumTags; i++) for (int i = 0; i < newTags->numTags; i++)
{ {
memcpy (buf + blockSize, m_SessionTags[i], 32); // tags memcpy (buf + blockSize, newTags->sessionTags[i], 32); // tags
blockSize += 32; blockSize += 32;
} }
} }
@ -159,7 +142,7 @@ namespace garlic
blockSize += 32; blockSize += 32;
buf[blockSize] = 0; // flag buf[blockSize] = 0; // flag
blockSize++; blockSize++;
size_t len = CreateGarlicPayload (buf + blockSize, msg); size_t len = CreateGarlicPayload (buf + blockSize, msg, newTags);
*payloadSize = htobe32 (len); *payloadSize = htobe32 (len);
CryptoPP::SHA256().CalculateDigest(payloadHash, buf + blockSize, len); CryptoPP::SHA256().CalculateDigest(payloadHash, buf + blockSize, len);
blockSize += len; blockSize += len;
@ -170,7 +153,7 @@ namespace garlic
return blockSize; return blockSize;
} }
size_t GarlicRoutingSession::CreateGarlicPayload (uint8_t * payload, const I2NPMessage * msg) size_t GarlicRoutingSession::CreateGarlicPayload (uint8_t * payload, const I2NPMessage * msg, UnconfirmedTags * newTags)
{ {
uint64_t ts = i2p::util::GetMillisecondsSinceEpoch () + 5000; // 5 sec uint64_t ts = i2p::util::GetMillisecondsSinceEpoch () + 5000; // 5 sec
uint32_t msgID = m_Rnd.GenerateWord32 (); uint32_t msgID = m_Rnd.GenerateWord32 ();
@ -181,13 +164,14 @@ namespace garlic
if (m_Owner) if (m_Owner)
{ {
if (m_NumTags > 0 && m_NextTag < 0) // new session if (newTags) // new session
{ {
// clove is DeliveryStatus // clove is DeliveryStatus
size += CreateDeliveryStatusClove (payload + size, msgID); size += CreateDeliveryStatusClove (payload + size, msgID);
if (size > 0) // successive? if (size > 0) // successive?
{ {
(*numCloves)++; (*numCloves)++;
m_UnconfirmedTagsMsgs[msgID] = newTags;
m_Owner->DeliveryStatusSent (this, msgID); m_Owner->DeliveryStatusSent (this, msgID);
} }
else else

10
Garlic.h
View File

@ -58,7 +58,6 @@ namespace garlic
GarlicRoutingSession (const uint8_t * sessionKey, const SessionTag& sessionTag); // one time encryption GarlicRoutingSession (const uint8_t * sessionKey, const SessionTag& sessionTag); // one time encryption
~GarlicRoutingSession (); ~GarlicRoutingSession ();
I2NPMessage * WrapSingleMessage (I2NPMessage * msg); I2NPMessage * WrapSingleMessage (I2NPMessage * msg);
int GetNextTag () const { return m_NextTag; };
void TagsConfirmed (uint32_t msgID); void TagsConfirmed (uint32_t msgID);
void SetLeaseSetUpdated () { m_LeaseSetUpdated = true; }; void SetLeaseSetUpdated () { m_LeaseSetUpdated = true; };
@ -66,20 +65,19 @@ namespace garlic
private: private:
size_t CreateAESBlock (uint8_t * buf, const I2NPMessage * msg); size_t CreateAESBlock (uint8_t * buf, const I2NPMessage * msg);
size_t CreateGarlicPayload (uint8_t * payload, const I2NPMessage * msg); size_t CreateGarlicPayload (uint8_t * payload, const I2NPMessage * msg, UnconfirmedTags * newTags);
size_t CreateGarlicClove (uint8_t * buf, const I2NPMessage * msg, bool isDestination); size_t CreateGarlicClove (uint8_t * buf, const I2NPMessage * msg, bool isDestination);
size_t CreateDeliveryStatusClove (uint8_t * buf, uint32_t msgID); size_t CreateDeliveryStatusClove (uint8_t * buf, uint32_t msgID);
void GenerateSessionTags (); UnconfirmedTags * GenerateSessionTags ();
private: private:
GarlicDestination * m_Owner; GarlicDestination * m_Owner;
const i2p::data::RoutingDestination * m_Destination; const i2p::data::RoutingDestination * m_Destination;
uint8_t m_SessionKey[32]; uint8_t m_SessionKey[32];
bool m_IsAcknowledged; std::list<SessionTag> m_SessionTags;
int m_NumTags, m_NextTag; int m_NumTags;
SessionTag * m_SessionTags; // m_NumTags*32 bytes
uint32_t m_TagsCreationTime; // seconds since epoch uint32_t m_TagsCreationTime; // seconds since epoch
std::map<uint32_t, UnconfirmedTags *> m_UnconfirmedTagsMsgs; std::map<uint32_t, UnconfirmedTags *> m_UnconfirmedTagsMsgs;
bool m_LeaseSetUpdated; bool m_LeaseSetUpdated;