| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/edk/system/node_channel.h" | 5 #include "mojo/edk/system/node_channel.h" |
| 6 | 6 |
| 7 #include <cstring> | 7 #include <cstring> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <sstream> | 9 #include <sstream> |
| 10 | 10 |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 } | 520 } |
| 521 break; | 521 break; |
| 522 } | 522 } |
| 523 | 523 |
| 524 case MessageType::PORTS_MESSAGE: { | 524 case MessageType::PORTS_MESSAGE: { |
| 525 size_t num_handles = handles ? handles->size() : 0; | 525 size_t num_handles = handles ? handles->size() : 0; |
| 526 Channel::MessagePtr message( | 526 Channel::MessagePtr message( |
| 527 new Channel::Message(payload_size, num_handles)); | 527 new Channel::Message(payload_size, num_handles)); |
| 528 message->SetHandles(std::move(handles)); | 528 message->SetHandles(std::move(handles)); |
| 529 memcpy(message->mutable_payload(), payload, payload_size); | 529 memcpy(message->mutable_payload(), payload, payload_size); |
| 530 delegate_->OnPortsMessage(std::move(message)); | 530 delegate_->OnPortsMessage(remote_node_name_, std::move(message)); |
| 531 return; | 531 return; |
| 532 } | 532 } |
| 533 | 533 |
| 534 case MessageType::REQUEST_PORT_MERGE: { | 534 case MessageType::REQUEST_PORT_MERGE: { |
| 535 const RequestPortMergeData* data; | 535 const RequestPortMergeData* data; |
| 536 if (GetMessagePayload(payload, payload_size, &data)) { | 536 if (GetMessagePayload(payload, payload_size, &data)) { |
| 537 // Don't accept an empty token. | 537 // Don't accept an empty token. |
| 538 size_t token_size = payload_size - sizeof(*data) - sizeof(Header); | 538 size_t token_size = payload_size - sizeof(*data) - sizeof(Header); |
| 539 if (token_size == 0) | 539 if (token_size == 0) |
| 540 break; | 540 break; |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 | 754 |
| 755 base::AutoLock lock(channel_lock_); | 755 base::AutoLock lock(channel_lock_); |
| 756 if (!channel_) | 756 if (!channel_) |
| 757 DLOG(ERROR) << "Dropping message on closed channel."; | 757 DLOG(ERROR) << "Dropping message on closed channel."; |
| 758 else | 758 else |
| 759 channel_->Write(std::move(message)); | 759 channel_->Write(std::move(message)); |
| 760 } | 760 } |
| 761 | 761 |
| 762 } // namespace edk | 762 } // namespace edk |
| 763 } // namespace mojo | 763 } // namespace mojo |
| OLD | NEW |