diff --git a/Reseed.cpp b/Reseed.cpp index 0aac168f..e787ba71 100644 --- a/Reseed.cpp +++ b/Reseed.cpp @@ -55,7 +55,7 @@ namespace data { std::string url = host + "i2pseeds.su3"; LogPrint (eLogInfo, "Dowloading SU3 from ", host); - std::string su3 = https ? HttpsRequest (url) : i2p::util::http::httpRequest (url); + std::string su3 = HttpsRequest (url); if (su3.length () > 0) { std::stringstream s(su3); diff --git a/util.cpp b/util.cpp index 6d2ee500..7c433cff 100644 --- a/util.cpp +++ b/util.cpp @@ -265,43 +265,6 @@ namespace filesystem namespace http { - std::string httpRequest(const std::string& address) - { - try - { - i2p::util::http::url u(address); - boost::asio::ip::tcp::iostream site; - // please don't uncomment following line because it's not compatible with boost 1.46 - // 1.46 is default boost for Ubuntu 12.04 LTS - //site.expires_from_now (boost::posix_time::seconds(30)); - if (u.port_ == 80) - site.connect(u.host_, "http"); - else - { - std::stringstream ss; ss << u.port_; - site.connect(u.host_, ss.str()); - } - if (site) - { - // User-Agent is needed to get the server list routerInfo files. - site << "GET " << u.path_ << " HTTP/1.1\r\nHost: " << u.host_ - << "\r\nAccept: */*\r\n" << "User-Agent: Wget/1.11.4\r\n" << "Connection: close\r\n\r\n"; - // read response and extract content - return GetHttpContent (site); - } - else - { - LogPrint ("Can't connect to ", address); - return ""; - } - } - catch (std::exception& ex) - { - LogPrint ("Failed to download ", address, " : ", ex.what ()); - return ""; - } - } - std::string GetHttpContent (std::istream& response) { std::string version, statusMessage; @@ -357,65 +320,6 @@ namespace http } } - int httpRequestViaI2pProxy(const std::string& address, std::string &content) - { - content = ""; - try - { - boost::asio::ip::tcp::iostream site; - // please don't uncomment following line because it's not compatible with boost 1.46 - // 1.46 is default boost for Ubuntu 12.04 LTS - //site.expires_from_now (boost::posix_time::seconds(30)); - { - std::stringstream ss; ss << i2p::util::config::GetArg("-httpproxyport", 4446); - site.connect("127.0.0.1", ss.str()); - } - if (site) - { - i2p::util::http::url u(address); - std::stringstream ss; - ss << "GET " << address << " HTTP/1.0" << std::endl; - ss << "Host: " << u.host_ << std::endl; - ss << "Accept: */*" << std::endl; - ss << "User - Agent: Wget / 1.11.4" << std::endl; - ss << "Connection: close" << std::endl; - ss << std::endl; - site << ss.str(); - - // read response - std::string version, statusMessage; - site >> version; // HTTP version - int status; - site >> status; // status - std::getline(site, statusMessage); - if (status == 200) // OK - { - std::string header; - while (std::getline(site, header) && header != "\r"){} - std::stringstream ss; - ss << site.rdbuf(); - content = ss.str(); - return status; - } - else - { - LogPrint("HTTP response ", status); - return status; - } - } - else - { - LogPrint("Can't connect to proxy"); - return 408; - } - } - catch (std::exception& ex) - { - LogPrint("Failed to download ", address, " : ", ex.what()); - return 408; - } - } - url::url(const std::string& url_s) { portstr_ = "80"; diff --git a/util.h b/util.h index 1a579283..8c72a97b 100644 --- a/util.h +++ b/util.h @@ -47,10 +47,8 @@ namespace util const char LAST_MODIFIED[] = "Last-Modified"; const char TRANSFER_ENCODING[] = "Transfer-Encoding"; - std::string httpRequest(const std::string& address); std::string GetHttpContent (std::istream& response); void MergeChunkedResponse (std::istream& response, std::ostream& merged); - int httpRequestViaI2pProxy(const std::string& address, std::string &content); // return http code std::string urlDecode(const std::string& data); struct url {