* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
HTTPSocket *socket;
std::string orig;
public:
- HTTPResolver(HTTPSocket *s, InspIRCd *Instance, const string &hostname, bool &cached, Module* me) : Resolver(Instance, hostname, DNS_QUERY_FORWARD, cached, me), socket(s)
+ HTTPResolver(HTTPSocket *s, InspIRCd *Instance, const std::string &hostname, bool &cached, Module* me) : Resolver(Instance, hostname, DNS_QUERY_FORWARD, cached, me), socket(s)
{
ServerInstance->Log(DEBUG,">>>>>>>>>>>>>>>>>> HTTPResolver::HTTPResolver <<<<<<<<<<<<<<<");
orig = hostname;
}
- void OnLookupComplete(const string &result, unsigned int ttl, bool cached, int resultnum = 0)
+ void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
{
ServerInstance->Log(DEBUG,"************* HTTPResolver::OnLookupComplete ***************");
if (!resultnum)
socket->OnClose();
}
- void OnError(ResolverError e, const string &errmsg)
+ void OnError(ResolverError e, const std::string &errmsg)
{
ServerInstance->Log(DEBUG,"!!!!!!!!!!!!!!!! HTTPResolver::OnError: %s", errmsg.c_str());
socket->OnClose();
}
};
-typedef vector<HTTPSocket*> HTTPList;
+typedef std::vector<HTTPSocket*> HTTPList;
class ModuleHTTPClient : public Module
{
}
};
-HTTPSocket::HTTPSocket(InspIRCd *Instance, ModuleHTTPClient *Mod)
- : BufferedSocket(Instance), Server(Instance), Mod(Mod), status(HTTP_CLOSED)
+HTTPSocket::HTTPSocket(InspIRCd *SI, ModuleHTTPClient *m)
+ : BufferedSocket(SI), Server(SI), Mod(m), status(HTTP_CLOSED)
{
Instance->Log(DEBUG,"HTTPSocket::HTTPSocket");
this->port = 80;
}
}
-bool HTTPSocket::DoRequest(HTTPClientRequest *req)
+bool HTTPSocket::DoRequest(HTTPClientRequest *request)
{
Instance->Log(DEBUG,"HTTPSocket::DoRequest");
/* Tweak by brain - we take a copy of this,
* pointers knocking around, less chance of
* a memory leak.
*/
- this->req = *req;
+ this->req = *request;
if (!ParseURL(this->req.GetURL()))
return false;
return true;
}
-void HTTPSocket::Connect(const string &ip)
+void HTTPSocket::Connect(const std::string &ip)
{
this->response = new HTTPClientResponse((Module*)Mod, req.GetSource() , url.url, 0, "");
bool HTTPSocket::OnDataReady()
{
Instance->Log(DEBUG,"HTTPSocket::OnDataReady() for %s", url.url.c_str());
- char *data = this->Read();
+ char *sdata = this->Read();
- if (!data)
+ if (!sdata)
return false;
if (this->status < HTTP_DATA)
std::string line;
std::string::size_type pos;
- this->buffer += data;
+ this->buffer += sdata;
while ((pos = buffer.find("\r\n")) != std::string::npos)
{
line = buffer.substr(0, pos);
if (this->status == HTTP_REQSENT)
{
// HTTP reply (HTTP/1.1 200 msg)
- char const* data = line.c_str();
- data += 9;
- response->SetResponse(data);
- response->SetData(data + 4);
+ char const* sdata2 = line.c_str();
+ sdata2 += 9;
+ response->SetResponse(sdata2);
+ response->SetData(sdata2 + 4);
this->status = HTTP_HEADERS;
continue;
}