This commit is contained in:
Pavel Melkozerov 2017-01-27 15:22:20 +00:00 committed by GitHub
commit 8a85ae88c3
16 changed files with 65 additions and 61 deletions

View file

@ -614,7 +614,8 @@ namespace client
}
}
void AddressBook::HandleLookupResponse (const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len)
void AddressBook::HandleLookupResponse (const i2p::data::IdentityEx& from, uint16_t /*fromPort*/,
uint16_t /*toPort*/, const uint8_t * buf, size_t len)
{
if (len < 44)
{

42
BOB.cpp
View file

@ -284,7 +284,7 @@ namespace client
std::placeholders::_1, std::placeholders::_2));
}
void BOBCommandSession::HandleSent (const boost::system::error_code& ecode, std::size_t bytes_transferred)
void BOBCommandSession::HandleSent (const boost::system::error_code& ecode, std::size_t /*bytes_transferred*/)
{
if (ecode)
{
@ -338,20 +338,20 @@ namespace client
Send (len);
}
void BOBCommandSession::ZapCommandHandler (const char * operand, size_t len)
void BOBCommandSession::ZapCommandHandler (const char * /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: zap");
Terminate ();
}
void BOBCommandSession::QuitCommandHandler (const char * operand, size_t len)
void BOBCommandSession::QuitCommandHandler (const char * /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: quit");
m_IsOpen = false;
SendReplyOK ("Bye!");
}
void BOBCommandSession::StartCommandHandler (const char * operand, size_t len)
void BOBCommandSession::StartCommandHandler (const char * /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: start ", m_Nickname);
if (m_IsActive)
@ -373,7 +373,7 @@ namespace client
m_IsActive = true;
}
void BOBCommandSession::StopCommandHandler (const char * operand, size_t len)
void BOBCommandSession::StopCommandHandler (const char * /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: stop ", m_Nickname);
if (!m_IsActive)
@ -392,7 +392,7 @@ namespace client
m_IsActive = false;
}
void BOBCommandSession::SetNickCommandHandler (const char * operand, size_t len)
void BOBCommandSession::SetNickCommandHandler (const char * operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: setnick ", operand);
m_Nickname = operand;
@ -401,7 +401,7 @@ namespace client
SendReplyOK (msg.c_str ());
}
void BOBCommandSession::GetNickCommandHandler (const char * operand, size_t len)
void BOBCommandSession::GetNickCommandHandler (const char * operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: getnick ", operand);
m_CurrentDestination = m_Owner.FindDestination (operand);
@ -420,21 +420,21 @@ namespace client
SendReplyError ("no nickname has been set");
}
void BOBCommandSession::NewkeysCommandHandler (const char * operand, size_t len)
void BOBCommandSession::NewkeysCommandHandler (const char* /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: newkeys");
m_Keys = i2p::data::PrivateKeys::CreateRandomKeys ();
SendReplyOK (m_Keys.GetPublic ()->ToBase64 ().c_str ());
}
void BOBCommandSession::SetkeysCommandHandler (const char * operand, size_t len)
void BOBCommandSession::SetkeysCommandHandler (const char* operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: setkeys ", operand);
m_Keys.FromBase64 (operand);
SendReplyOK (m_Keys.GetPublic ()->ToBase64 ().c_str ());
}
void BOBCommandSession::GetkeysCommandHandler (const char * operand, size_t len)
void BOBCommandSession::GetkeysCommandHandler (const char* /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: getkeys");
if (m_Keys.GetPublic ()) // keys are set ?
@ -443,20 +443,20 @@ namespace client
SendReplyError ("keys are not set");
}
void BOBCommandSession::GetdestCommandHandler (const char * operand, size_t len)
void BOBCommandSession::GetdestCommandHandler (const char* /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: getdest");
SendReplyOK (m_Keys.GetPublic ()->ToBase64 ().c_str ());
}
void BOBCommandSession::OuthostCommandHandler (const char * operand, size_t len)
void BOBCommandSession::OuthostCommandHandler (const char* operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: outhost ", operand);
m_Address = operand;
SendReplyOK ("outhost set");
}
void BOBCommandSession::OutportCommandHandler (const char * operand, size_t len)
void BOBCommandSession::OutportCommandHandler (const char* operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: outport ", operand);
m_OutPort = std::stoi(operand);
@ -466,14 +466,14 @@ namespace client
SendReplyError ("port out of range");
}
void BOBCommandSession::InhostCommandHandler (const char * operand, size_t len)
void BOBCommandSession::InhostCommandHandler (const char* operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: inhost ", operand);
m_Address = operand;
SendReplyOK ("inhost set");
}
void BOBCommandSession::InportCommandHandler (const char * operand, size_t len)
void BOBCommandSession::InportCommandHandler (const char* operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: inport ", operand);
m_InPort = std::stoi(operand);
@ -483,7 +483,7 @@ namespace client
SendReplyError ("port out of range");
}
void BOBCommandSession::QuietCommandHandler (const char * operand, size_t len)
void BOBCommandSession::QuietCommandHandler (const char* /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: quiet");
if (m_Nickname.length () > 0)
@ -500,7 +500,7 @@ namespace client
SendReplyError ("no nickname has been set");
}
void BOBCommandSession::LookupCommandHandler (const char * operand, size_t len)
void BOBCommandSession::LookupCommandHandler (const char* operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: lookup ", operand);
i2p::data::IdentHash ident;
@ -528,7 +528,7 @@ namespace client
}
}
void BOBCommandSession::ClearCommandHandler (const char * operand, size_t len)
void BOBCommandSession::ClearCommandHandler (const char* /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: clear");
m_Owner.DeleteDestination (m_Nickname);
@ -536,7 +536,7 @@ namespace client
SendReplyOK ("cleared");
}
void BOBCommandSession::ListCommandHandler (const char * operand, size_t len)
void BOBCommandSession::ListCommandHandler (const char* /*operand*/, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: list");
const auto& destinations = m_Owner.GetDestinations ();
@ -545,7 +545,7 @@ namespace client
SendReplyOK ("Listing done");
}
void BOBCommandSession::OptionCommandHandler (const char * operand, size_t len)
void BOBCommandSession::OptionCommandHandler (const char* operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: option ", operand);
const char * value = strchr (operand, '=');
@ -564,7 +564,7 @@ namespace client
SendReplyError ("malformed");
}
void BOBCommandSession::StatusCommandHandler (const char * operand, size_t len)
void BOBCommandSession::StatusCommandHandler (const char* operand, size_t /*len*/)
{
LogPrint (eLogDebug, "BOB: status ", operand);
if (m_Nickname == operand)

View file

@ -262,7 +262,7 @@ namespace client
m_Service.post (std::bind (&LeaseSetDestination::HandleDeliveryStatusMessage, shared_from_this (), msg));
}
void LeaseSetDestination::HandleI2NPMessage (const uint8_t * buf, size_t len, std::shared_ptr<i2p::tunnel::InboundTunnel> from)
void LeaseSetDestination::HandleI2NPMessage (const uint8_t * buf, size_t /*len*/, std::shared_ptr<i2p::tunnel::InboundTunnel> from)
{
uint8_t typeID = buf[I2NP_HEADER_TYPEID_OFFSET];
switch (typeID)
@ -351,7 +351,7 @@ namespace client
}
}
void LeaseSetDestination::HandleDatabaseSearchReplyMessage (const uint8_t * buf, size_t len)
void LeaseSetDestination::HandleDatabaseSearchReplyMessage (const uint8_t * buf, size_t /*len*/)
{
i2p::data::IdentHash key (buf);
int num = buf[32]; // num
@ -750,7 +750,7 @@ namespace client
}
#endif
void ClientDestination::HandleDataMessage (const uint8_t * buf, size_t len)
void ClientDestination::HandleDataMessage (const uint8_t * buf, size_t /*len*/)
{
uint32_t length = bufbe32toh (buf);
buf += 4;

View file

@ -110,7 +110,7 @@ namespace data
}
bool Families::VerifyFamily (const std::string& family, const IdentHash& ident,
const char * signature, const char * key)
const char * signature, const char * /*key*/)
{
uint8_t buf[50], signatureBuf[64];
size_t len = family.length (), signatureLen = strlen (signature);

View file

@ -193,7 +193,7 @@ namespace client
std::bind (&I2CPSession::HandleReceivedHeader, shared_from_this (), std::placeholders::_1, std::placeholders::_2));
}
void I2CPSession::HandleReceivedHeader (const boost::system::error_code& ecode, std::size_t bytes_transferred)
void I2CPSession::HandleReceivedHeader (const boost::system::error_code& ecode, std::size_t /*bytes_transferred*/)
{
if (ecode)
Terminate ();
@ -220,7 +220,7 @@ namespace client
std::bind (&I2CPSession::HandleReceivedPayload, shared_from_this (), std::placeholders::_1, std::placeholders::_2));
}
void I2CPSession::HandleReceivedPayload (const boost::system::error_code& ecode, std::size_t bytes_transferred)
void I2CPSession::HandleReceivedPayload (const boost::system::error_code& ecode, std::size_t /*bytes_transferred*/)
{
if (ecode)
Terminate ();
@ -277,7 +277,8 @@ namespace client
LogPrint (eLogError, "I2CP: Can't write to the socket");
}
void I2CPSession::HandleI2CPMessageSent (const boost::system::error_code& ecode, std::size_t bytes_transferred, const uint8_t * buf)
void I2CPSession::HandleI2CPMessageSent (const boost::system::error_code& ecode,
std::size_t /*bytes_transferred*/, const uint8_t* buf)
{
delete[] buf;
if (ecode && ecode != boost::asio::error::operation_aborted)
@ -393,7 +394,7 @@ namespace client
}
}
void I2CPSession::DestroySessionMessageHandler (const uint8_t * buf, size_t len)
void I2CPSession::DestroySessionMessageHandler (const uint8_t* /*buf*/, size_t /*len*/)
{
SendSessionStatusMessage (0); // destroy
LogPrint (eLogDebug, "I2CP: session ", m_SessionID, " destroyed");
@ -404,7 +405,7 @@ namespace client
}
}
void I2CPSession::ReconfigureSessionMessageHandler (const uint8_t * buf, size_t len)
void I2CPSession::ReconfigureSessionMessageHandler (const uint8_t* /*buf*/, size_t /*len*/)
{
// TODO: implement actual reconfiguration
SendSessionStatusMessage (2); // updated
@ -566,7 +567,7 @@ namespace client
}
}
void I2CPSession::DestLookupMessageHandler (const uint8_t * buf, size_t len)
void I2CPSession::DestLookupMessageHandler (const uint8_t * buf, size_t /*len*/)
{
if (m_Destination)
{
@ -603,7 +604,7 @@ namespace client
SendI2CPMessage (I2CP_DEST_REPLY_MESSAGE, buf, 32);
}
void I2CPSession::GetBandwidthLimitsMessageHandler (const uint8_t * buf, size_t len)
void I2CPSession::GetBandwidthLimitsMessageHandler (const uint8_t* /*buf*/, size_t /*len*/)
{
uint8_t limits[64];
memset (limits, 0, 64);

View file

@ -302,8 +302,8 @@ namespace client
std::placeholders::_1, std::placeholders::_2, socket, buf));
}
void I2PControlService::HandleResponseSent (const boost::system::error_code& ecode, std::size_t bytes_transferred,
std::shared_ptr<ssl_socket> socket, std::shared_ptr<I2PControlBuffer> buf)
void I2PControlService::HandleResponseSent (const boost::system::error_code& ecode, std::size_t /*bytes_transferred*/,
std::shared_ptr<ssl_socket> /*socket*/, std::shared_ptr<I2PControlBuffer> /*buf*/)
{
if (ecode) {
LogPrint (eLogError, "I2PControl: write error: ", ecode.message ());
@ -460,7 +460,7 @@ namespace client
InsertParam (results, "Shutdown", "");
m_ShutdownTimer.expires_from_now (boost::posix_time::seconds(1)); // 1 second to make sure response has been sent
m_ShutdownTimer.async_wait (
[](const boost::system::error_code& ecode)
[](const boost::system::error_code&)
{
Daemon.running = 0;
});
@ -474,7 +474,7 @@ namespace client
InsertParam (results, "ShutdownGraceful", "");
m_ShutdownTimer.expires_from_now (boost::posix_time::seconds(timeout + 1)); // + 1 second
m_ShutdownTimer.async_wait (
[](const boost::system::error_code& ecode)
[](const boost::system::error_code&)
{
Daemon.running = 0;
});

View file

@ -462,7 +462,7 @@ namespace client
}
void I2PServerTunnel::HandleResolve (const boost::system::error_code& ecode, boost::asio::ip::tcp::resolver::iterator it,
std::shared_ptr<boost::asio::ip::tcp::resolver> resolver)
std::shared_ptr<boost::asio::ip::tcp::resolver> /*resolver*/)
{
if (!ecode)
{
@ -779,7 +779,8 @@ namespace client
LogPrint(eLogInfo, "UDP Tunnel: resolved ", m_RemoteDest, " to ", m_RemoteIdent->ToBase32());
}
void I2PUDPClientTunnel::HandleRecvFromI2P(const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len)
void I2PUDPClientTunnel::HandleRecvFromI2P(const i2p::data::IdentityEx& from, uint16_t /*fromPort*/,
uint16_t /*toPort*/, const uint8_t * buf, size_t len)
{
if(m_RemoteIdent && from.GetIdentHash() == *m_RemoteIdent)
{

View file

@ -173,7 +173,7 @@ namespace data
const std::vector<std::shared_ptr<const Lease> > LeaseSet::GetNonExpiredLeases (bool withThreshold) const
{
return GetNonExpiredLeasesExcluding( [] (const Lease & l) -> bool { return false; }, withThreshold);
return GetNonExpiredLeasesExcluding( [] (const Lease &) -> bool { return false; }, withThreshold);
}
const std::vector<std::shared_ptr<const Lease> > LeaseSet::GetNonExpiredLeasesExcluding (LeaseInspectFunc exclude, bool withThreshold) const

View file

@ -443,7 +443,7 @@ namespace i2p
return i2p::tunnel::tunnels.GetExploratoryPool ();
}
void RouterContext::HandleI2NPMessage (const uint8_t * buf, size_t len, std::shared_ptr<i2p::tunnel::InboundTunnel> from)
void RouterContext::HandleI2NPMessage (const uint8_t * buf, size_t /*len*/, std::shared_ptr<i2p::tunnel::InboundTunnel> from)
{
i2p::HandleI2NPMessage (CreateI2NPMessage (buf, GetI2NPMessageLength (buf), from));
}

15
SAM.cpp
View file

@ -135,7 +135,7 @@ namespace client
}
}
void SAMSocket::HandleHandshakeReplySent (const boost::system::error_code& ecode, std::size_t bytes_transferred)
void SAMSocket::HandleHandshakeReplySent (const boost::system::error_code& ecode, std::size_t /*bytes_transferred*/)
{
if (ecode)
{
@ -166,7 +166,7 @@ namespace client
}
}
void SAMSocket::HandleMessageReplySent (const boost::system::error_code& ecode, std::size_t bytes_transferred, bool close)
void SAMSocket::HandleMessageReplySent (const boost::system::error_code& ecode, std::size_t /*bytes_transferred*/, bool close)
{
if (ecode)
{
@ -262,7 +262,7 @@ namespace client
}
}
void SAMSocket::ProcessSessionCreate (char * buf, size_t len)
void SAMSocket::ProcessSessionCreate (char * buf, size_t /*len*/)
{
LogPrint (eLogDebug, "SAM: session create: ", buf);
std::map<std::string, std::string> params;
@ -333,7 +333,7 @@ namespace client
SendMessageReply (m_Buffer, l2, false);
}
void SAMSocket::ProcessStreamConnect (char * buf, size_t len)
void SAMSocket::ProcessStreamConnect (char * buf, size_t /*len*/)
{
LogPrint (eLogDebug, "SAM: stream connect: ", buf);
std::map<std::string, std::string> params;
@ -389,7 +389,7 @@ namespace client
}
}
void SAMSocket::ProcessStreamAccept (char * buf, size_t len)
void SAMSocket::ProcessStreamAccept (char * buf, size_t /*len*/)
{
LogPrint (eLogDebug, "SAM: stream accept: ", buf);
std::map<std::string, std::string> params;
@ -456,7 +456,7 @@ namespace client
SendMessageReply (m_Buffer, len, false);
}
void SAMSocket::ProcessNamingLookup (char * buf, size_t len)
void SAMSocket::ProcessNamingLookup (char * buf, size_t /*len*/)
{
LogPrint (eLogDebug, "SAM: naming lookup: ", buf);
std::map<std::string, std::string> params;
@ -688,7 +688,8 @@ namespace client
LogPrint (eLogWarning, "SAM: I2P acceptor has been reset");
}
void SAMSocket::HandleI2PDatagramReceive (const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len)
void SAMSocket::HandleI2PDatagramReceive (const i2p::data::IdentityEx& from, uint16_t /*fromPort*/,
uint16_t /*toPort*/, const uint8_t* buf, size_t len)
{
LogPrint (eLogDebug, "SAM: datagram received ", len);
auto base64 = from.ToBase64 ();

View file

@ -697,7 +697,7 @@ namespace proxy
}
void SOCKSHandler::HandleUpstreamData(uint8_t * dataptr, std::size_t len)
void SOCKSHandler::HandleUpstreamData(uint8_t* /*dataptr*/, std::size_t len)
{
if (m_state == UPSTREAM_HANDSHAKE) {
m_upstream_response_len += len;
@ -740,7 +740,7 @@ namespace proxy
}
}
void SOCKSHandler::HandleUpstreamConnected(const boost::system::error_code & ecode, boost::asio::ip::tcp::resolver::iterator itr)
void SOCKSHandler::HandleUpstreamConnected(const boost::system::error_code & ecode, boost::asio::ip::tcp::resolver::iterator)
{
if (ecode) {
LogPrint(eLogWarning, "SOCKS: could not connect to upstream proxy: ", ecode.message());

View file

@ -537,7 +537,7 @@ namespace transport
Send (buf, msgLen);
}
void SSUSession::ProcessRelayRequest (const uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& from)
void SSUSession::ProcessRelayRequest (const uint8_t * buf, size_t /*len*/, const boost::asio::ip::udp::endpoint& from)
{
uint32_t relayTag = bufbe32toh (buf);
auto session = m_Server.FindRelaySession (relayTag);
@ -638,7 +638,7 @@ namespace transport
LogPrint (eLogDebug, "SSU: relay intro sent");
}
void SSUSession::ProcessRelayResponse (const uint8_t * buf, size_t len)
void SSUSession::ProcessRelayResponse (const uint8_t * buf, size_t /*len*/)
{
LogPrint (eLogDebug, "SSU message: Relay response received");
uint8_t remoteSize = *buf;
@ -690,7 +690,7 @@ namespace transport
LogPrint (eLogError, "SSU: Unsolicited RelayResponse, nonce=", nonce);
}
void SSUSession::ProcessRelayIntro (const uint8_t * buf, size_t len)
void SSUSession::ProcessRelayIntro (const uint8_t * buf, size_t /*len*/)
{
uint8_t size = *buf;
if (size == 4)

View file

@ -760,7 +760,7 @@ namespace stream
}
}
void Stream::HandleAckSendTimer (const boost::system::error_code& ecode)
void Stream::HandleAckSendTimer (const boost::system::error_code&)
{
if (m_IsAckSendScheduled)
{

View file

@ -51,12 +51,12 @@ namespace tunnel
}
}
void TransitTunnel::SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> msg)
void TransitTunnel::SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> /*msg*/)
{
LogPrint (eLogError, "TransitTunnel: We are not a gateway for ", GetTunnelID ());
}
void TransitTunnel::HandleTunnelDataMsg (std::shared_ptr<const i2p::I2NPMessage> tunnelMsg)
void TransitTunnel::HandleTunnelDataMsg (std::shared_ptr<const i2p::I2NPMessage> /*msg*/)
{
LogPrint (eLogError, "TransitTunnel: Incoming tunnel message is not supported ", GetTunnelID ());
}

View file

@ -434,7 +434,7 @@ namespace transport
}
void Transports::HandleNTCPResolve (const boost::system::error_code& ecode, boost::asio::ip::tcp::resolver::iterator it,
i2p::data::IdentHash ident, std::shared_ptr<boost::asio::ip::tcp::resolver> resolver)
i2p::data::IdentHash ident, std::shared_ptr<boost::asio::ip::tcp::resolver> /*resolver*/)
{
auto it1 = m_Peers.find (ident);
if (it1 != m_Peers.end ())
@ -477,7 +477,7 @@ namespace transport
}
void Transports::HandleSSUResolve (const boost::system::error_code& ecode, boost::asio::ip::tcp::resolver::iterator it,
i2p::data::IdentHash ident, std::shared_ptr<boost::asio::ip::tcp::resolver> resolver)
i2p::data::IdentHash ident, std::shared_ptr<boost::asio::ip::tcp::resolver> /*resolver*/)
{
auto it1 = m_Peers.find (ident);
if (it1 != m_Peers.end ())

View file

@ -102,7 +102,7 @@ namespace tunnel
i2p::transport::transports.SendMessage (GetNextIdentHash (), msg);
}
bool Tunnel::HandleTunnelBuildResponse (uint8_t * msg, size_t len)
bool Tunnel::HandleTunnelBuildResponse (uint8_t * msg, size_t /*len*/)
{
LogPrint (eLogDebug, "Tunnel: TunnelBuildResponse ", (int)msg[0], " records.");
@ -179,7 +179,7 @@ namespace tunnel
}
}
void Tunnel::SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> msg)
void Tunnel::SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> /*msg*/)
{
LogPrint (eLogWarning, "Tunnel: Can't send I2NP messages without delivery instructions");
}
@ -284,7 +284,7 @@ namespace tunnel
m_Gateway.SendBuffer ();
}
void OutboundTunnel::HandleTunnelDataMsg (std::shared_ptr<const i2p::I2NPMessage> tunnelMsg)
void OutboundTunnel::HandleTunnelDataMsg (std::shared_ptr<const i2p::I2NPMessage> /*msg*/)
{
LogPrint (eLogError, "Tunnel: incoming message for outbound tunnel ", GetTunnelID ());
}