Skip to content
/ i2pd Public
forked from PurpleI2P/i2pd

Commit

Permalink
ident fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xcps committed Feb 28, 2016
1 parent e45cfe7 commit a26dc39
Showing 1 changed file with 23 additions and 22 deletions.
45 changes: 23 additions & 22 deletions I2PTunnel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,25 +249,26 @@ namespace client

while (!m_InPacket.eof () && !m_InPacket.fail ())
{
std::getline (m_InPacket, line);
auto pos = line.find ("USER");
if (pos != std::string::npos && pos == 0)
{
pos = line.find (" ");
pos++;
pos = line.find (" ", pos);
pos++;
pos = line.find (" ", pos);
pos++;
auto nextpos = line.find (" ", pos);

m_OutPacket << line.substr (0, pos);
m_OutPacket << context.GetAddressBook ().ToAddress (m_From->GetIdentHash ());
m_OutPacket << line.substr (nextpos) << '\n';
} else {
m_OutPacket << line << '\n';
}
std::getline (m_InPacket, line);
auto pos = line.find ("USER");
if (pos != std::string::npos && pos == 0)
{
pos = line.find (" ");
pos++;
pos = line.find (" ", pos);
pos++;
pos = line.find (" ", pos);
pos++;
auto nextpos = line.find (" ", pos);

m_OutPacket << line.substr (0, pos);
m_OutPacket << context.GetAddressBook ().ToAddress (m_From->GetIdentHash ());
m_OutPacket << line.substr (nextpos) << '\n';
} else {
m_OutPacket << line << '\n';
}
}
LogPrint (eLogError, m_OutPacket.str ().substr (0, m_OutPacket.str ().length ()));
I2PTunnelConnection::Write ((uint8_t *)m_OutPacket.str ().c_str (), m_OutPacket.str ().length ());
}

Expand Down Expand Up @@ -477,15 +478,15 @@ namespace client

I2PServerTunnelIRC::I2PServerTunnelIRC (const std::string& name, const std::string& address,
int port, std::shared_ptr<ClientDestination> localDestination, int inport):
I2PServerTunnel (name, address, port, localDestination, inport)
I2PServerTunnel (name, address, port, localDestination, inport)
{
}

void I2PServerTunnelIRC::CreateI2PConnection (std::shared_ptr<i2p::stream::Stream> stream)
{
auto conn = std::make_shared<I2PTunnelConnectionIRC> (this, stream, std::make_shared<boost::asio::ip::tcp::socket> (GetService ()), GetEndpoint (), GetAddress ());
AddHandler (conn);
conn->Connect ();
auto conn = std::make_shared<I2PTunnelConnectionIRC> (this, stream, std::make_shared<boost::asio::ip::tcp::socket> (GetService ()), GetEndpoint (), GetAddress ());
AddHandler (conn);
conn->Connect ();
}
}
}

0 comments on commit a26dc39

Please sign in to comment.