Implementation and fixes for Blimp client/engine E2E communication.

blimp/net/blimp_message_pump.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/blimp_message_pump.h"
 
 #include "base/macros.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/blimp_message_processor.h"
 #include "blimp/net/common.h"
@@ skipping 12 matching lines @@
                      base::Unretained(this))),
       read_callback_(base::Bind(&BlimpMessagePump::OnReadPacketComplete,
                                 base::Unretained(this))) {
   DCHECK(reader_);
   buffer_->SetCapacity(kMaxPacketPayloadSizeBytes);
 }
 
 BlimpMessagePump::~BlimpMessagePump() {}
 
 void BlimpMessagePump::SetMessageProcessor(BlimpMessageProcessor* processor) {
+  DVLOG(1) << "SetMessageProcessor, processor=" << processor;
   if (processor && !processor_) {
     processor_ = processor;
     ReadNextPacket();
   } else {
     // Don't allow |processor_| to be cleared while there's a read inflight.
     if (processor) {
       DCHECK(!processor_ || !read_inflight_);
     }
     processor_ = processor;
   }
 }
 
 void BlimpMessagePump::ReadNextPacket() {
+  DVLOG(2) << "ReadNextPacket";
   DCHECK(processor_);
   DCHECK(!read_inflight_);
   read_inflight_ = true;
   buffer_->set_offset(0);
   reader_->ReadPacket(buffer_.get(), read_callback_.callback());
 }
 
 void BlimpMessagePump::OnReadPacketComplete(int result) {
+  DVLOG(2) << "OnReadPacketComplete, result=" << result;
   DCHECK(read_inflight_);
   read_inflight_ = false;
   if (result == net::OK) {
     scoped_ptr<BlimpMessage> message(new BlimpMessage);
     if (message->ParseFromArray(buffer_->StartOfBuffer(), buffer_->offset())) {
       processor_->ProcessMessage(std::move(message),
                                  process_msg_callback_.callback());
     } else {
       result = net::ERR_FAILED;
     }
   }
 
   if (result != net::OK) {
     error_observer_->OnConnectionError(result);
   }
 }
 
 void BlimpMessagePump::OnProcessMessageComplete(int result) {
-  // No error is expected from the message receiver.
-  DCHECK_EQ(net::OK, result);
+  DVLOG(2) << "OnProcessMessageComplete, result=" << result;
+
+  if (result != net::OK) {

[haibinlu, 2016/01/04 19:45:45]

per offline discussion, we should document that feature shall return OK for
messages it wants to ignore, any error code will result in connection to be
dropped.

[Kevin M, 2016/01/04 20:42:13]

Done in blimp_message_pump.h.

+    error_observer_->OnConnectionError(result);
+    return;
+  }
+
   if (processor_)
     ReadNextPacket();
 }
 
 }  // namespace blimp