From 0c8fb376db133e95b1207ae49c65dc6cb4bda3e2 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Fri, 3 Jul 2015 10:11:55 -0400
Subject: [PATCH] some cleanup
---
NTCPSession.cpp | 18 +-----------------
NTCPSession.h | 2 --
SSUSession.cpp | 11 -----------
SSUSession.h | 2 --
TransportSession.h | 1 -
5 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/NTCPSession.cpp b/NTCPSession.cpp
index 4b622c73..dfd69be9 100644
--- a/NTCPSession.cpp
+++ b/NTCPSession.cpp
@@ -101,7 +101,7 @@ namespace transport
m_DHKeysPair = nullptr;
SendTimeSyncMessage ();
- PostI2NPMessage (ToSharedI2NPMessage(CreateDatabaseStoreMsg ())); // we tell immediately who we are
+ Send (ToSharedI2NPMessage(CreateDatabaseStoreMsg ())); // we tell immediately who we are
transports.PeerConnected (shared_from_this ());
}
@@ -673,22 +673,6 @@ namespace transport
Send (nullptr);
}
- void NTCPSession::SendI2NPMessage (std::shared_ptr<I2NPMessage> msg)
- {
- m_Server.GetService ().post (std::bind (&NTCPSession::PostI2NPMessage, shared_from_this (), msg));
- }
-
- void NTCPSession::PostI2NPMessage (std::shared_ptr<I2NPMessage> msg)
- {
- if (msg)
- {
- if (m_IsTerminated) return;
- if (m_IsSending)
- m_SendQueue.push_back (msg);
- else
- Send (msg);
- }
- }
void NTCPSession::SendI2NPMessages (const std::vector<std::shared_ptr<I2NPMessage> >& msgs)
{
diff --git a/NTCPSession.h b/NTCPSession.h
index 96644eea..2921e923 100644
--- a/NTCPSession.h
+++ b/NTCPSession.h
@@ -61,12 +61,10 @@ namespace transport
void ClientLogin ();
void ServerLogin ();
- void SendI2NPMessage (std::shared_ptr<I2NPMessage> msg);
void SendI2NPMessages (const std::vector<std::shared_ptr<I2NPMessage> >& msgs);
private:
- void PostI2NPMessage (std::shared_ptr<I2NPMessage> msg);
void PostI2NPMessages (std::vector<std::shared_ptr<I2NPMessage> > msgs);
void Connected ();
void SendTimeSyncMessage ();
diff --git a/SSUSession.cpp b/SSUSession.cpp
index c8c9fb2e..3900e7de 100644
--- a/SSUSession.cpp
+++ b/SSUSession.cpp
@@ -832,17 +832,6 @@ namespace transport
}
}
- void SSUSession::SendI2NPMessage (std::shared_ptr<I2NPMessage> msg)
- {
- GetService ().post (std::bind (&SSUSession::PostI2NPMessage, shared_from_this (), msg));
- }
-
- void SSUSession::PostI2NPMessage (std::shared_ptr<I2NPMessage> msg)
- {
- if (msg &&m_State == eSessionStateEstablished)
- m_Data.Send (msg);
- }
-
void SSUSession::SendI2NPMessages (const std::vector<std::shared_ptr<I2NPMessage> >& msgs)
{
GetService ().post (std::bind (&SSUSession::PostI2NPMessages, shared_from_this (), msgs));
diff --git a/SSUSession.h b/SSUSession.h
index fd1ba39e..6c222185 100644
--- a/SSUSession.h
+++ b/SSUSession.h
@@ -76,7 +76,6 @@ namespace transport
void Done ();
boost::asio::ip::udp::endpoint& GetRemoteEndpoint () { return m_RemoteEndpoint; };
bool IsV6 () const { return m_RemoteEndpoint.address ().is_v6 (); };
- void SendI2NPMessage (std::shared_ptr<I2NPMessage> msg);
void SendI2NPMessages (const std::vector<std::shared_ptr<I2NPMessage> >& msgs);
void SendPeerTest (); // Alice
@@ -95,7 +94,6 @@ namespace transport
boost::asio::io_service& GetService ();
void CreateAESandMacKey (const uint8_t * pubKey);
- void PostI2NPMessage (std::shared_ptr<I2NPMessage> msg);
void PostI2NPMessages (std::vector<std::shared_ptr<I2NPMessage> > msgs);
void ProcessMessage (uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& senderEndpoint); // call for established session
void ProcessSessionRequest (uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& senderEndpoint);
diff --git a/TransportSession.h b/TransportSession.h
index dcd9f66c..f8da2b4d 100644
--- a/TransportSession.h
+++ b/TransportSession.h
@@ -71,7 +71,6 @@ namespace transport
size_t GetNumSentBytes () const { return m_NumSentBytes; };
size_t GetNumReceivedBytes () const { return m_NumReceivedBytes; };
- virtual void SendI2NPMessage (std::shared_ptr<I2NPMessage> msg) = 0;
virtual void SendI2NPMessages (const std::vector<std::shared_ptr<I2NPMessage> >& msgs) = 0;
protected: