Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

Unified Diff: remoting/host/security_key/remote_security_key_message_reader_impl.cc

Issue 2162083003: Renaming Gnubby and RemoteSecurityKey files/classes/members (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing a GYP build error Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/security_key/remote_security_key_message_reader_impl.cc
diff --git a/remoting/host/security_key/remote_security_key_message_reader_impl.cc b/remoting/host/security_key/remote_security_key_message_reader_impl.cc
deleted file mode 100644
index fc19760af38d6f5a24eefc25387ccf2257f3916e..0000000000000000000000000000000000000000
--- a/remoting/host/security_key/remote_security_key_message_reader_impl.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2016 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 "remoting/host/security_key/remote_security_key_message_reader_impl.h"
-
-#include <cstdint>
-#include <string>
-#include <utility>
-
-#include "base/bind.h"
-#include "base/files/file.h"
-#include "base/macros.h"
-#include "base/single_thread_task_runner.h"
-#include "base/stl_util.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "remoting/host/security_key/security_key_message.h"
-
-namespace remoting {
-
-RemoteSecurityKeyMessageReaderImpl::RemoteSecurityKeyMessageReaderImpl(
- base::File input_file)
- : read_stream_(std::move(input_file)),
- reader_thread_("RemoteSecurityKeyMessageReaderImpl"),
- weak_factory_(this) {
- base::Thread::Options options;
- options.message_loop_type = base::MessageLoop::TYPE_IO;
- reader_thread_.StartWithOptions(options);
-
- read_task_runner_ = reader_thread_.task_runner();
- main_task_runner_ = base::ThreadTaskRunnerHandle::Get();
-}
-
-RemoteSecurityKeyMessageReaderImpl::~RemoteSecurityKeyMessageReaderImpl() {
- DCHECK(main_task_runner_->RunsTasksOnCurrentThread());
-
- // In order to ensure the reader thread is stopped cleanly, we want to stop
- // the thread before the task runners and weak pointers are invalidated.
- reader_thread_.Stop();
-}
-
-void RemoteSecurityKeyMessageReaderImpl::Start(
- const SecurityKeyMessageCallback& message_callback,
- const base::Closure& error_callback) {
- DCHECK(main_task_runner_->RunsTasksOnCurrentThread());
-
- message_callback_ = message_callback;
- error_callback_ = error_callback;
-
- // base::Unretained is safe since this class owns the thread running this task
- // which will be destroyed before this instance is.
- read_task_runner_->PostTask(
- FROM_HERE, base::Bind(&RemoteSecurityKeyMessageReaderImpl::ReadMessage,
- base::Unretained(this)));
-}
-
-void RemoteSecurityKeyMessageReaderImpl::ReadMessage() {
- DCHECK(read_task_runner_->RunsTasksOnCurrentThread());
-
- while (true) {
- if (!read_stream_.IsValid()) {
- LOG(ERROR) << "Cannot read from invalid stream.";
- NotifyError();
- return;
- }
-
- uint32_t message_length_bytes = 0;
- if (!ReadFromStream(reinterpret_cast<char*>(&message_length_bytes), 4)) {
- NotifyError();
- return;
- }
-
- if (!SecurityKeyMessage::IsValidMessageSize(message_length_bytes)) {
- LOG(ERROR) << "Message size is invalid: " << message_length_bytes;
- NotifyError();
- return;
- }
-
- std::string message_data(message_length_bytes, '\0');
- if (!ReadFromStream(string_as_array(&message_data), message_data.size())) {
- NotifyError();
- return;
- }
-
- std::unique_ptr<SecurityKeyMessage> message(new SecurityKeyMessage());
- if (!message->ParseMessage(message_data)) {
- LOG(ERROR) << "Invalid message data received.";
- NotifyError();
- return;
- }
-
- // Notify callback of the new message received.
- main_task_runner_->PostTask(
- FROM_HERE,
- base::Bind(&RemoteSecurityKeyMessageReaderImpl::InvokeMessageCallback,
- weak_factory_.GetWeakPtr(), base::Passed(&message)));
- }
-}
-
-bool RemoteSecurityKeyMessageReaderImpl::ReadFromStream(char* buffer,
- size_t bytes_to_read) {
- DCHECK(buffer);
- DCHECK_GT(bytes_to_read, 0u);
-
- size_t bytes_read = 0;
- do {
- int read_result = read_stream_.ReadAtCurrentPosNoBestEffort(
- buffer + bytes_read, bytes_to_read - bytes_read);
- if (read_result < 1) {
- // 0 means EOF which is normal and should not be logged as an error.
- if (read_result != 0) {
- LOG(ERROR) << "Failed to read from stream, ReadAtCurrentPos returned "
- << read_result;
- }
- return false;
- }
- bytes_read += read_result;
- } while (bytes_read < bytes_to_read);
- DCHECK_EQ(bytes_read, bytes_to_read);
-
- return true;
-}
-
-void RemoteSecurityKeyMessageReaderImpl::NotifyError() {
- DCHECK(read_task_runner_->RunsTasksOnCurrentThread());
-
- main_task_runner_->PostTask(
- FROM_HERE,
- base::Bind(&RemoteSecurityKeyMessageReaderImpl::InvokeErrorCallback,
- weak_factory_.GetWeakPtr()));
-}
-
-void RemoteSecurityKeyMessageReaderImpl::InvokeMessageCallback(
- std::unique_ptr<SecurityKeyMessage> message) {
- DCHECK(main_task_runner_->RunsTasksOnCurrentThread());
- message_callback_.Run(std::move(message));
-}
-
-void RemoteSecurityKeyMessageReaderImpl::InvokeErrorCallback() {
- DCHECK(main_task_runner_->RunsTasksOnCurrentThread());
- error_callback_.Run();
-}
-
-} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698