Archives/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2024-11-17 21:26:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #766 from majestrate/i2pcontrol-fixes

Browse Source 
fix i2pcontrol bugs
This commit is contained in:
orignal 2017-01-05 12:32:51 -05:00 committed by GitHub
commit c577706415
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
I2PControl.cpp
View File

@ -205,7 +205,7 @@ namespace client
} }
/* append to json chunk of data from 1st request */ /* append to json chunk of data from 1st request */
json.write(buf->data() + len, bytes_transferred - len); json.write(buf->data() + len, bytes_transferred - len);
remains = req.content_length() - len; remains = req.content_length();
/* if request has Content-Length header, fetch rest of data and store to json buffer */ /* if request has Content-Length header, fetch rest of data and store to json buffer */
while (remains > 0) { while (remains > 0) {
len = ((long int) buf->size() < remains) ? buf->size() : remains; len = ((long int) buf->size() < remains) ? buf->size() : remains;
@ -216,15 +216,17 @@ namespace client
} else { } else {
json.write(buf->data(), bytes_transferred); json.write(buf->data(), bytes_transferred);
} }
LogPrint(eLogDebug, "I2PControl: json from request: ", json.str()); //LogPrint(eLogDebug, "I2PControl: json from request: ", json.str());
#if GCC47_BOOST149 #if GCC47_BOOST149
LogPrint (eLogError, "I2PControl: json_read is not supported due bug in boost 1.49 with gcc 4.7"); LogPrint (eLogError, "I2PControl: json_read is not supported due bug in boost 1.49 with gcc 4.7");
BuildErrorResponse(response, 32603, "JSON requests is not supported with this version of boost"); BuildErrorResponse(response, 32603, "JSON requests is not supported with this version of boost");
#else #else
/* now try to parse json itself */ /* now try to parse json itself */
std::string j_str = json.str();
std::stringstream _json(j_str);
try { try {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
boost::property_tree::read_json (json, pt); boost::property_tree::read_json (_json, pt);
std::string id = pt.get<std::string>("id"); std::string id = pt.get<std::string>("id");
std::string method = pt.get<std::string>("method"); std::string method = pt.get<std::string>("method");
@ -342,8 +344,9 @@ namespace client
(this->*(it1->second))(it.second.data ()); (this->*(it1->second))(it.second.data ());
InsertParam (results, it.first, ""); InsertParam (results, it.first, "");
} }
else else {
LogPrint (eLogError, "I2PControl: I2PControl unknown request: ", it.first); LogPrint (eLogError, "I2PControl: I2PControl unknown request: ", it.first);
}
} }
} }
@ -361,14 +364,17 @@ namespace client
for (auto it = params.begin (); it != params.end (); ++it) for (auto it = params.begin (); it != params.end (); ++it)
{ {
LogPrint (eLogDebug, "I2PControl: RouterInfo request: ", it->first); LogPrint (eLogDebug, "I2PControl: RouterInfo request: ", it->first);
if (it != params.begin ()) results << ",";
auto it1 = m_RouterInfoHandlers.find (it->first); auto it1 = m_RouterInfoHandlers.find (it->first);
if (it1 != m_RouterInfoHandlers.end ()) if (it1 != m_RouterInfoHandlers.end ())
{ {
if (it != params.begin ()) results << ",";
(this->*(it1->second))(results); (this->*(it1->second))(results);
} }
else else
{
InsertParam(results, it->first, "");
LogPrint (eLogError, "I2PControl: RouterInfo unknown request ", it->first); LogPrint (eLogError, "I2PControl: RouterInfo unknown request ", it->first);
}
} }
} }
@ -439,10 +445,15 @@ namespace client
if (it != params.begin ()) results << ","; if (it != params.begin ()) results << ",";
LogPrint (eLogDebug, "I2PControl: RouterManager request: ", it->first); LogPrint (eLogDebug, "I2PControl: RouterManager request: ", it->first);
auto it1 = m_RouterManagerHandlers.find (it->first); auto it1 = m_RouterManagerHandlers.find (it->first);
if (it1 != m_RouterManagerHandlers.end ()) { if (it1 != m_RouterManagerHandlers.end ())
{
(this->*(it1->second))(results); (this->*(it1->second))(results);
} else }
else
{
InsertParam(results, it->first, "");
LogPrint (eLogError, "I2PControl: RouterManager unknown request: ", it->first); LogPrint (eLogError, "I2PControl: RouterManager unknown request: ", it->first);
}
} }
} }
@ -488,10 +499,15 @@ namespace client
if (it != params.begin ()) results << ","; if (it != params.begin ()) results << ",";
LogPrint (eLogDebug, "I2PControl: NetworkSetting request: ", it->first); LogPrint (eLogDebug, "I2PControl: NetworkSetting request: ", it->first);
auto it1 = m_NetworkSettingHandlers.find (it->first); auto it1 = m_NetworkSettingHandlers.find (it->first);
if (it1 != m_NetworkSettingHandlers.end ()) { if (it1 != m_NetworkSettingHandlers.end ())
{
(this->*(it1->second))(it->second.data (), results); (this->*(it1->second))(it->second.data (), results);
} else }
else
{
InsertParam(results, it->first, "");
LogPrint (eLogError, "I2PControl: NetworkSetting unknown request: ", it->first); LogPrint (eLogError, "I2PControl: NetworkSetting unknown request: ", it->first);
}
} }
} }