PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge pull request #1143 from l-n-s/i2pcontrol_updates 

I2pcontrol updates
pull/1145/head
orignal 7 years ago committed by GitHub
parent
64ed485cdf f9fc744949
commit
ca1fa11cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 135 additions and 135 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 270
      daemon/I2PControl.cpp

270
daemon/I2PControl.cpp
Unescape View File

@ -299,11 +299,11 @@ namespace client
} }
void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, const boost::property_tree::ptree& value) const void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, const boost::property_tree::ptree& value) const
{ {
std::ostringstream buf; std::ostringstream buf;
boost::property_tree::write_json (buf, value, false); boost::property_tree::write_json (buf, value, false);
ss << "\"" << name << "\":" << buf.str(); ss << "\"" << name << "\":" << buf.str();
} }
void I2PControlService::SendResponse (std::shared_ptr<ssl_socket> socket, void I2PControlService::SendResponse (std::shared_ptr<ssl_socket> socket,
std::shared_ptr<I2PControlBuffer> buf, std::ostringstream& response, bool isHtml) std::shared_ptr<I2PControlBuffer> buf, std::ostringstream& response, bool isHtml)
@ -624,157 +624,157 @@ namespace client
void I2PControlService::I2PTunnelInfoHandler (std::ostringstream& results) void I2PControlService::I2PTunnelInfoHandler (std::ostringstream& results)
{ {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
boost::property_tree::ptree client_tunnels, server_tunnels; boost::property_tree::ptree client_tunnels, server_tunnels;
for (auto& it: i2p::client::context.GetClientTunnels ()) for (auto& it: i2p::client::context.GetClientTunnels ())
{ {
auto& ident = it.second->GetLocalDestination ()->GetIdentHash(); auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
boost::property_tree::ptree ct; boost::property_tree::ptree ct;
ct.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident)); ct.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
client_tunnels.add_child(it.second->GetName (), ct); client_tunnels.add_child(it.second->GetName (), ct);
} }
auto& serverTunnels = i2p::client::context.GetServerTunnels (); auto& serverTunnels = i2p::client::context.GetServerTunnels ();
if (!serverTunnels.empty ()) { if (!serverTunnels.empty ()) {
for (auto& it: serverTunnels) for (auto& it: serverTunnels)
{ {
auto& ident = it.second->GetLocalDestination ()->GetIdentHash(); auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
boost::property_tree::ptree st; boost::property_tree::ptree st;
st.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident)); st.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
st.put("port", it.second->GetLocalPort ()); st.put("port", it.second->GetLocalPort ());
server_tunnels.add_child(it.second->GetName (), st); server_tunnels.add_child(it.second->GetName (), st);
} }
} }
auto& clientForwards = i2p::client::context.GetClientForwards (); auto& clientForwards = i2p::client::context.GetClientForwards ();
if (!clientForwards.empty ()) if (!clientForwards.empty ())
{ {
for (auto& it: clientForwards) for (auto& it: clientForwards)
{ {
auto& ident = it.second->GetLocalDestination ()->GetIdentHash(); auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
boost::property_tree::ptree ct; boost::property_tree::ptree ct;
ct.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident)); ct.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
client_tunnels.add_child(it.second->GetName (), ct); client_tunnels.add_child(it.second->GetName (), ct);
} }
} }
auto& serverForwards = i2p::client::context.GetServerForwards (); auto& serverForwards = i2p::client::context.GetServerForwards ();
if (!serverForwards.empty ()) if (!serverForwards.empty ())
{ {
for (auto& it: serverForwards) for (auto& it: serverForwards)
{ {
auto& ident = it.second->GetLocalDestination ()->GetIdentHash(); auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
boost::property_tree::ptree st; boost::property_tree::ptree st;
st.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident)); st.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
server_tunnels.add_child(it.second->GetName (), st); server_tunnels.add_child(it.second->GetName (), st);
} }
} }
pt.add_child("client", client_tunnels); pt.add_child("client", client_tunnels);
pt.add_child("server", server_tunnels); pt.add_child("server", server_tunnels);
InsertParam (results, "I2PTunnel", pt); InsertParam (results, "I2PTunnel", pt);
} }
void I2PControlService::HTTPProxyInfoHandler (std::ostringstream& results) void I2PControlService::HTTPProxyInfoHandler (std::ostringstream& results)
{ {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
auto httpProxy = i2p::client::context.GetHttpProxy (); auto httpProxy = i2p::client::context.GetHttpProxy ();
if (httpProxy) if (httpProxy)
{ {
auto& ident = httpProxy->GetLocalDestination ()->GetIdentHash(); auto& ident = httpProxy->GetLocalDestination ()->GetIdentHash();
pt.put("enabled", true); pt.put("enabled", true);
pt.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident)); pt.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
} }
else else
pt.put("enabled", false); pt.put("enabled", false);
InsertParam (results, "HTTPProxy", pt); InsertParam (results, "HTTPProxy", pt);
} }
void I2PControlService::SOCKSInfoHandler (std::ostringstream& results) void I2PControlService::SOCKSInfoHandler (std::ostringstream& results)
{ {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
auto socksProxy = i2p::client::context.GetSocksProxy (); auto socksProxy = i2p::client::context.GetSocksProxy ();
if (socksProxy) if (socksProxy)
{ {
auto& ident = socksProxy->GetLocalDestination ()->GetIdentHash(); auto& ident = socksProxy->GetLocalDestination ()->GetIdentHash();
pt.put("enabled", true); pt.put("enabled", true);
pt.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident)); pt.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
} }
else else
pt.put("enabled", false); pt.put("enabled", false);
InsertParam (results, "SOCKS", pt); InsertParam (results, "SOCKS", pt);
} }
void I2PControlService::SAMInfoHandler (std::ostringstream& results) void I2PControlService::SAMInfoHandler (std::ostringstream& results)
{ {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
auto sam = i2p::client::context.GetSAMBridge (); auto sam = i2p::client::context.GetSAMBridge ();
if (sam) if (sam)
{
pt.put("enabled", true);
boost::property_tree::ptree sam_sessions;
for (auto& it: sam->GetSessions ())
{ {
boost::property_tree::ptree sam_session, sam_session_sockets; pt.put("enabled", true);
auto& name = it.second->localDestination->GetNickname (); boost::property_tree::ptree sam_sessions;
auto& ident = it.second->localDestination->GetIdentHash(); for (auto& it: sam->GetSessions ())
sam_session.put("name", name); {
sam_session.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident)); boost::property_tree::ptree sam_session, sam_session_sockets;
auto& name = it.second->localDestination->GetNickname ();
for (const auto& socket: it.second->ListSockets()) auto& ident = it.second->localDestination->GetIdentHash();
{ sam_session.put("name", name);
boost::property_tree::ptree stream; sam_session.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
stream.put("type", socket->GetSocketType ());
stream.put("remote_endpoint", socket->GetSocket ().remote_endpoint()); for (const auto& socket: it.second->ListSockets())
{
sam_session_sockets.push_back(std::make_pair("", stream)); boost::property_tree::ptree stream;
} stream.put("type", socket->GetSocketType ());
sam_session.add_child("sockets", sam_session_sockets); stream.put("peer", socket->GetSocket ().remote_endpoint());
sam_sessions.add_child(it.first, sam_session);
} sam_session_sockets.push_back(std::make_pair("", stream));
}
pt.add_child("sessions", sam_sessions); sam_session.add_child("sockets", sam_session_sockets);
} sam_sessions.add_child(it.first, sam_session);
else }
pt.put("enabled", false);
pt.add_child("sessions", sam_sessions);
InsertParam (results, "SAM", pt); }
} else
pt.put("enabled", false);
InsertParam (results, "SAM", pt);
}
void I2PControlService::BOBInfoHandler (std::ostringstream& results) void I2PControlService::BOBInfoHandler (std::ostringstream& results)
{ {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
auto bob = i2p::client::context.GetBOBCommandChannel (); auto bob = i2p::client::context.GetBOBCommandChannel ();
if (bob) if (bob)
{ {
/* TODO more info */ /* TODO more info */
pt.put("enabled", true); pt.put("enabled", true);
} }
else else
pt.put("enabled", false); pt.put("enabled", false);
InsertParam (results, "BOB", pt); InsertParam (results, "BOB", pt);
} }
void I2PControlService::I2CPInfoHandler (std::ostringstream& results) void I2PControlService::I2CPInfoHandler (std::ostringstream& results)
{ {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
auto i2cp = i2p::client::context.GetI2CPServer (); auto i2cp = i2p::client::context.GetI2CPServer ();
if (i2cp) if (i2cp)
{ {
/* TODO more info */ /* TODO more info */
pt.put("enabled", true); pt.put("enabled", true);
} }
else else
pt.put("enabled", false); pt.put("enabled", false);
InsertParam (results, "I2CP", pt); InsertParam (results, "I2CP", pt);
} }
} }
} }

Write Preview
Loading…
Cancel
Save