mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-01-22 13:27:17 +01:00
send SessionCreated message
This commit is contained in:
parent
aa1f58d81a
commit
732b17a368
38
SSU.cpp
38
SSU.cpp
|
@ -63,7 +63,8 @@ namespace ssu
|
|||
{
|
||||
m_State = eSessionStateRequestReceived;
|
||||
LogPrint ("Session request received");
|
||||
SendSessionCreated (senderEndpoint);
|
||||
m_RemoteEndpoint = senderEndpoint;
|
||||
SendSessionCreated (buf + sizeof (SSUHeader));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -102,7 +103,7 @@ namespace ssu
|
|||
m_Server->Send (buf, 304, m_RemoteEndpoint);
|
||||
}
|
||||
|
||||
void SSUSession::SendSessionCreated (const boost::asio::ip::udp::endpoint& senderEndpoint)
|
||||
void SSUSession::SendSessionCreated (const uint8_t * x)
|
||||
{
|
||||
auto address = m_RemoteRouter ? m_RemoteRouter->GetSSUAddress () : nullptr;
|
||||
if (!address)
|
||||
|
@ -110,11 +111,40 @@ namespace ssu
|
|||
LogPrint ("Missing remote SSU address");
|
||||
return;
|
||||
}
|
||||
uint8_t signedData[532]; // x,y, remote IP, remote port, our IP, our port, relayTag, signed on time
|
||||
memcpy (signedData, x, 256); // x
|
||||
|
||||
uint8_t buf[368 + 18];
|
||||
uint8_t buf[368 + 18];
|
||||
uint8_t * payload = buf + sizeof (SSUHeader);
|
||||
memcpy (payload, i2p::context.GetRouterIdentity ().publicKey, 256);
|
||||
memcpy (signedData + 256, payload, 256); // y
|
||||
payload += 256;
|
||||
*payload = 4; // we assume ipv4
|
||||
payload++;
|
||||
*(uint32_t *)(payload) = m_RemoteEndpoint.address ().to_v4 ().to_ulong (); // network bytes order already
|
||||
payload += 4;
|
||||
*(uint16_t *)(payload) = htobe16 (m_RemoteEndpoint.port ());
|
||||
payload += 2;
|
||||
memcpy (signedData + 512, payload - 6, 6); // remote endpoint IP and port
|
||||
*(uint32_t *)(signedData + 518) = m_Server->GetEndpoint ().address ().to_v4 ().to_ulong (); // our IP
|
||||
*(uint16_t *)(signedData + 522) = htobe16 (m_Server->GetEndpoint ().port ()); // our port
|
||||
*(uint32_t *)(payload) = 0; // relay tag, always 0 for now
|
||||
payload += 4;
|
||||
*(uint32_t *)(payload) = htobe32 (i2p::util::GetSecondsSinceEpoch ()); // signed on time
|
||||
payload += 4;
|
||||
memcpy (signedData + 524, payload - 8, 8); // relayTag and signed on time
|
||||
i2p::context.Sign (signedData, 532, payload); // DSA signature
|
||||
// TODO: fill padding with random data
|
||||
|
||||
uint8_t iv[16];
|
||||
CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator ();
|
||||
rnd.GenerateBlock (iv, 16); // random iv
|
||||
// encrypt signature and 8 bytes padding with newly created session key
|
||||
m_Encryption.SetKeyWithIV (m_SessionKey, 32, iv);
|
||||
m_Encryption.ProcessData (payload, payload, 48);
|
||||
|
||||
// encrypt message with intro key
|
||||
FillHeaderAndEncrypt (PAYLOAD_TYPE_SESSION_CREATED, buf, 368, address->key, iv, address->key);
|
||||
m_State = eSessionStateRequestSent;
|
||||
m_Server->Send (buf, 368, m_RemoteEndpoint);
|
||||
}
|
||||
|
@ -209,7 +239,7 @@ namespace ssu
|
|||
}
|
||||
|
||||
SSUServer::SSUServer (boost::asio::io_service& service, int port):
|
||||
m_Socket (service, boost::asio::ip::udp::endpoint (boost::asio::ip::udp::v4 (), port))
|
||||
m_Endpoint (boost::asio::ip::udp::v4 (), port), m_Socket (service, m_Endpoint)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
6
SSU.h
6
SSU.h
|
@ -68,7 +68,7 @@ namespace ssu
|
|||
void ProcessSessionRequest (uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& senderEndpoint);
|
||||
void SendSessionRequest ();
|
||||
void ProcessSessionCreated (uint8_t * buf, size_t len);
|
||||
void SendSessionCreated (const boost::asio::ip::udp::endpoint& senderEndpoint);
|
||||
void SendSessionCreated (const uint8_t * x);
|
||||
|
||||
bool ProcessIntroKeyEncryptedMessage (uint8_t expectedPayloadType, uint8_t * buf, size_t len);
|
||||
void FillHeaderAndEncrypt (uint8_t payloadType, uint8_t * buf, size_t len, uint8_t * aesKey, uint8_t * iv, uint8_t * macKey);
|
||||
|
@ -95,7 +95,8 @@ namespace ssu
|
|||
void Start ();
|
||||
void Stop ();
|
||||
SSUSession * GetSession (i2p::data::RouterInfo * router);
|
||||
|
||||
|
||||
const boost::asio::ip::udp::endpoint& GetEndpoint () const { return m_Endpoint; };
|
||||
void Send (uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& to);
|
||||
|
||||
private:
|
||||
|
@ -105,6 +106,7 @@ namespace ssu
|
|||
|
||||
private:
|
||||
|
||||
boost::asio::ip::udp::endpoint m_Endpoint;
|
||||
boost::asio::ip::udp::socket m_Socket;
|
||||
boost::asio::ip::udp::endpoint m_SenderEndpoint;
|
||||
uint8_t m_ReceiveBuffer[2*SSU_MTU];
|
||||
|
|
Loading…
Reference in a new issue