X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fclient.cpp;fp=source%2Fclient.cpp;h=cb7b0eabc48302047cdfa5754bb4a40d78c877b3;hb=df006bfbbe8e8b49a52296f42894d4a452ed4c90;hp=be579184fa98e62a71d7ea3d09d5c247907fa16f;hpb=4f7b7be13874ae30d2a9cbb481bdacf4e160505f;p=libs%2Fnet.git diff --git a/source/client.cpp b/source/client.cpp index be57918..cb7b0ea 100644 --- a/source/client.cpp +++ b/source/client.cpp @@ -37,7 +37,7 @@ void Client::use_event_dispatcher(IO::EventDispatcher *ed) { if(event_disp && sock) event_disp->remove(*sock); - event_disp=ed; + event_disp = ed; if(event_disp && sock) event_disp->add(*sock); } @@ -47,13 +47,13 @@ void Client::start_request(const Request &r) if(request) throw InvalidState("Already processing a request"); - string host=r.get_header("Host"); + string host = r.get_header("Host"); if(host.find(':')==string::npos) - host+=":80"; - RefPtr addr=Net::resolve(host); + host += ":80"; + RefPtr addr = Net::resolve(host); delete sock; - sock=new Net::StreamSocket(addr->get_family()); + sock = new Net::StreamSocket(addr->get_family()); sock->set_block(false); sock->signal_data_available.connect(sigc::mem_fun(this, &Client::data_available)); @@ -63,12 +63,12 @@ void Client::start_request(const Request &r) sock->connect(*addr); - request=new Request(r); + request = new Request(r); if(!user_agent.empty()) request->set_header("User-Agent", user_agent); delete response; - response=0; + response = 0; in_buf.clear(); } @@ -84,7 +84,7 @@ void Client::tick() if(!request) return; - while(IO::PollEvent ev=IO::poll(*sock, sock->get_events(), Time::zero)) + while(IO::PollEvent ev = IO::poll(*sock, sock->get_events(), Time::zero)) sock->event(ev); if(response && response->is_complete()) @@ -92,9 +92,9 @@ void Client::tick() signal_response_complete.emit(*response); delete sock; - sock=0; + sock = 0; delete request; - request=0; + request = 0; } } @@ -107,9 +107,9 @@ void Client::wait_response() void Client::abort() { delete sock; - sock=0; + sock = 0; delete request; - request=0; + request = 0; } void Client::connect_finished(int err) @@ -120,7 +120,7 @@ void Client::connect_finished(int err) sock->close(); delete request; - request=0; + request = 0; } else sock->write(request->str()); @@ -129,21 +129,21 @@ void Client::connect_finished(int err) void Client::data_available() { char rbuf[4096]; - unsigned len=sock->read(rbuf, sizeof(rbuf)); + unsigned len = sock->read(rbuf, sizeof(rbuf)); in_buf.append(rbuf, len); if(!response) { if(in_buf.find("\r\n\r\n")!=string::npos || in_buf.find("\n\n")!=string::npos) { - response=new Response(Response::parse(in_buf)); + response = new Response(Response::parse(in_buf)); response->set_user_data(request->get_user_data()); - in_buf=string(); + in_buf = string(); } } else { - len=response->parse_content(in_buf); + len = response->parse_content(in_buf); in_buf.erase(0, len); } @@ -153,7 +153,7 @@ void Client::data_available() sock->close(); delete request; - request=0; + request = 0; } }