PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
Code Issues Releases Activity

process follow-on packets with zero send stream id

Browse Source
This commit is contained in:
orignal 2015-01-02 10:04:57 -05:00
parent f1ae5817eb
commit 79e1096eca
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Streaming.cpp
View File

@ -162,10 +162,7 @@ namespace stream
optionData += m_RemoteIdentity.FromBuffer (optionData, packet->GetOptionSize ()); optionData += m_RemoteIdentity.FromBuffer (optionData, packet->GetOptionSize ());
LogPrint (eLogInfo, "From identity ", m_RemoteIdentity.GetIdentHash ().ToBase64 ()); LogPrint (eLogInfo, "From identity ", m_RemoteIdentity.GetIdentHash ().ToBase64 ());
if (!m_RemoteLeaseSet) if (!m_RemoteLeaseSet)
{
LogPrint (eLogDebug, "Incoming stream from ", m_RemoteIdentity.GetIdentHash ().ToBase64 ()); LogPrint (eLogDebug, "Incoming stream from ", m_RemoteIdentity.GetIdentHash ().ToBase64 ());
m_LocalDestination.StreamAccepted (shared_from_this ());
}
} }
if (flags & PACKET_FLAG_MAX_PACKET_SIZE_INCLUDED) if (flags & PACKET_FLAG_MAX_PACKET_SIZE_INCLUDED)
@ -645,17 +642,6 @@ namespace stream
m_Streams.clear (); m_Streams.clear ();
} }
} }
void StreamingDestination::StreamAccepted (std::shared_ptr<Stream> stream)
{
if (m_Acceptor != nullptr)
m_Acceptor (stream);
else
{
LogPrint ("Acceptor for incoming stream is not set");
DeleteStream (stream);
}
}
void StreamingDestination::HandleNextPacket (Packet * packet) void StreamingDestination::HandleNextPacket (Packet * packet)
{ {
@ -667,14 +653,38 @@ namespace stream
it->second->HandleNextPacket (packet); it->second->HandleNextPacket (packet);
else else
{ {
LogPrint ("Unknown stream ", sendStreamID); LogPrint ("Unknown stream sendStreamID=", sendStreamID);
delete packet; delete packet;
} }
} }
else // new incoming stream else
{ {
auto incomingStream = CreateNewIncomingStream (); if (packet->IsSYN () && !packet->GetSeqn ()) // new incoming stream
incomingStream->HandleNextPacket (packet); {
auto incomingStream = CreateNewIncomingStream ();
incomingStream->HandleNextPacket (packet);
if (m_Acceptor != nullptr)
m_Acceptor (incomingStream);
else
{
LogPrint ("Acceptor for incoming stream is not set");
DeleteStream (incomingStream);
}
}
else // follow on packet without SYN
{
uint32_t receiveStreamID = packet->GetReceiveStreamID ();
for (auto it: m_Streams)
if (it.second->GetSendStreamID () == receiveStreamID)
{
// found
it.second->HandleNextPacket (packet);
return;
}
// TODO: should queue it up
LogPrint ("Unknown stream receiveStreamID=", receiveStreamID);
delete packet;
}
} }
} }

1
Streaming.h
View File

@ -170,7 +170,6 @@ namespace stream
void SetAcceptor (const Acceptor& acceptor) { m_Acceptor = acceptor; }; void SetAcceptor (const Acceptor& acceptor) { m_Acceptor = acceptor; };
void ResetAcceptor () { m_Acceptor = nullptr; }; void ResetAcceptor () { m_Acceptor = nullptr; };
bool IsAcceptorSet () const { return m_Acceptor != nullptr; }; bool IsAcceptorSet () const { return m_Acceptor != nullptr; };
void StreamAccepted (std::shared_ptr<Stream> stream);
i2p::client::ClientDestination& GetOwner () { return m_Owner; }; i2p::client::ClientDestination& GetOwner () { return m_Owner; };
void HandleDataMessagePayload (const uint8_t * buf, size_t len); void HandleDataMessagePayload (const uint8_t * buf, size_t len);