| Index: net/tools/flip_server/sm_connection.cc
|
| diff --git a/net/tools/flip_server/sm_connection.cc b/net/tools/flip_server/sm_connection.cc
|
| index 4acdea44adf10c2365b287125e94bb77f8ce6ed2..a3b6a41b9cc5bab4911dc2bb8a9490a7f0ae3a6f 100644
|
| --- a/net/tools/flip_server/sm_connection.cc
|
| +++ b/net/tools/flip_server/sm_connection.cc
|
| @@ -54,14 +54,17 @@ SMConnection::SMConnection(EpollServer* epoll_server,
|
| sm_interface_(NULL),
|
| log_prefix_(log_prefix),
|
| max_bytes_sent_per_dowrite_(4096),
|
| - ssl_(NULL) {}
|
| + ssl_(NULL) {
|
| +}
|
|
|
| SMConnection::~SMConnection() {
|
| if (initialized())
|
| Reset();
|
| }
|
|
|
| -EpollServer* SMConnection::epoll_server() { return epoll_server_; }
|
| +EpollServer* SMConnection::epoll_server() {
|
| + return epoll_server_;
|
| +}
|
|
|
| void SMConnection::ReadyToSend() {
|
| VLOG(2) << log_prefix_ << ACCEPTOR_CLIENT_IDENT
|
| @@ -298,7 +301,7 @@ void SMConnection::HandleEvents() {
|
| }
|
| return;
|
|
|
| - handle_close_or_error:
|
| +handle_close_or_error:
|
| Cleanup("HandleEvents");
|
| }
|
|
|
| @@ -481,11 +484,11 @@ bool SMConnection::DoRead() {
|
| }
|
| goto error_or_close;
|
| }
|
| - done:
|
| +done:
|
| VLOG(2) << log_prefix_ << ACCEPTOR_CLIENT_IDENT << "DoRead done!";
|
| return true;
|
|
|
| - error_or_close:
|
| +error_or_close:
|
| VLOG(1) << log_prefix_ << ACCEPTOR_CLIENT_IDENT
|
| << "DoRead(): error_or_close. "
|
| << "Cleaning up, then returning false";
|
| @@ -523,7 +526,9 @@ bool SMConnection::DoConsumeReadData() {
|
| return true;
|
| }
|
|
|
| -void SMConnection::HandleResponseFullyRead() { sm_interface_->Cleanup(); }
|
| +void SMConnection::HandleResponseFullyRead() {
|
| + sm_interface_->Cleanup();
|
| +}
|
|
|
| bool SMConnection::DoWrite() {
|
| size_t bytes_sent = 0;
|
| @@ -610,11 +615,11 @@ bool SMConnection::DoWrite() {
|
| << "0 bytes written with send call.";
|
| goto error_or_close;
|
| }
|
| - done:
|
| +done:
|
| UncorkSocket();
|
| return true;
|
|
|
| - error_or_close:
|
| +error_or_close:
|
| VLOG(1) << log_prefix_ << ACCEPTOR_CLIENT_IDENT
|
| << "DoWrite: error_or_close. Returning false "
|
| << "after cleaning up";
|
|
|