Implementation and fixes for Blimp client/engine E2E communication.

blimp/net/stream_packet_reader.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/net/stream_packet_reader.h"
 
 #include <iostream>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 85 matching lines @@
 
 int StreamPacketReader::DoReadHeader(int result) {
   DCHECK_EQ(ReadState::HEADER, read_state_);
   DCHECK_GT(kPacketHeaderSizeBytes,
             static_cast<size_t>(header_buffer_->offset()));
   DCHECK_GE(result, 0);
 
   header_buffer_->set_offset(header_buffer_->offset() + result);
   if (static_cast<size_t>(header_buffer_->offset()) < kPacketHeaderSizeBytes) {
     // There is more header to read.
-    return socket_->Read(header_buffer_.get(),
-                         kPacketHeaderSizeBytes - header_buffer_->offset(),
-                         base::Bind(&StreamPacketReader::OnReadComplete,
-                                    weak_factory_.GetWeakPtr()));
+    int result = socket_->Read(
+        header_buffer_.get(), kPacketHeaderSizeBytes - header_buffer_->offset(),
+        base::Bind(&StreamPacketReader::OnReadComplete,
+                   weak_factory_.GetWeakPtr()));
+    return (result != 0 ? result : net::ERR_CONNECTION_CLOSED);
   }
 
   // Finished reading the header. Parse the size and prepare for payload read.
   payload_size_ = base::NetToHost32(
       *reinterpret_cast<uint32_t*>(header_buffer_->StartOfBuffer()));
   if (payload_size_ > static_cast<size_t>(payload_buffer_->capacity()) ||
       payload_size_ == 0) {
     DLOG(ERROR) << "Illegal payload size: " << payload_size_;
     return net::ERR_INVALID_RESPONSE;
   }
@@ skipping 14 matching lines @@
   }
 
   // Finished reading the payload.
   read_state_ = ReadState::IDLE;
   return net::OK;
 }
 
 void StreamPacketReader::OnReadComplete(int result) {
   DCHECK_NE(net::ERR_IO_PENDING, result);
 
+  if (result == 0 /* EOF */) {
+    payload_buffer_ = nullptr;
+    base::ResetAndReturn(&callback_).Run(net::ERR_CONNECTION_CLOSED);
+    return;
+  }
+
   // If the read was succesful, then process the result.
   if (result > 0) {
     result = DoReadLoop(result);
   }
 
   // If all reading completed, either successfully or by error, inform the
   // caller.
   if (result != net::ERR_IO_PENDING) {
     payload_buffer_ = nullptr;
     base::ResetAndReturn(&callback_).Run(result);
   }
 }
 
 }  // namespace blimp