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

Unified Diff: ipc/ipc_channel_factory.cc

Issue 12761003: Revert 187233 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « ipc/ipc_channel_factory.h ('k') | ipc/ipc_channel_posix.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_channel_factory.cc
===================================================================
--- ipc/ipc_channel_factory.cc (revision 187239)
+++ ipc/ipc_channel_factory.cc (working copy)
@@ -1,88 +0,0 @@
-// Copyright 2013 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 "ipc/ipc_channel_factory.h"
-
-#include "base/file_util.h"
-#include "base/logging.h"
-#include "ipc/unix_domain_socket_util.h"
-
-namespace IPC {
-
-ChannelFactory::ChannelFactory(const base::FilePath& path, Delegate* delegate)
- : path_(path), delegate_(delegate), listen_fd_(-1) {
- DCHECK(delegate_);
- CreateSocket();
-}
-
-ChannelFactory::~ChannelFactory() {
- Close();
-}
-
-bool ChannelFactory::CreateSocket() {
- DCHECK(listen_fd_ < 0);
-
- // Create the socket.
- return CreateServerUnixDomainSocket(path_, &listen_fd_);
-}
-
-bool ChannelFactory::Listen() {
- if (listen_fd_ < 0)
- return false;
-
- // Watch the fd for connections, and turn any connections into
- // active sockets.
- MessageLoopForIO::current()->WatchFileDescriptor(
- listen_fd_,
- true,
- MessageLoopForIO::WATCH_READ,
- &server_listen_connection_watcher_,
- this);
- return true;
-}
-
-// Called by libevent when we can read from the fd without blocking.
-void ChannelFactory::OnFileCanReadWithoutBlocking(int fd) {
- DCHECK(fd == listen_fd_);
- int new_fd = -1;
- if (!ServerAcceptConnection(listen_fd_, &new_fd)) {
- Close();
- delegate_->OnListenError();
- return;
- }
-
- if (new_fd < 0) {
- // The accept() failed, but not in such a way that the factory needs to be
- // shut down.
- return;
- }
-
- file_util::ScopedFD scoped_fd(&new_fd);
-
- // Verify that the IPC channel peer is running as the same user.
- if (!IsPeerAuthorized(new_fd))
- return;
-
- ChannelHandle handle("", base::FileDescriptor(*scoped_fd.release(), true));
- delegate_->OnClientConnected(handle);
-}
-
-void ChannelFactory::OnFileCanWriteWithoutBlocking(int fd) {
- NOTREACHED() << "Listen fd should never be writable.";
-}
-
-void ChannelFactory::Close() {
- if (listen_fd_ < 0)
- return;
- if (HANDLE_EINTR(close(listen_fd_)) < 0)
- PLOG(ERROR) << "close";
- listen_fd_ = -1;
- if (unlink(path_.value().c_str()) < 0)
- PLOG(ERROR) << "unlink";
-
- // Unregister libevent for the listening socket and close it.
- server_listen_connection_watcher_.StopWatchingFileDescriptor();
-}
-
-} // namespace IPC
« no previous file with comments | « ipc/ipc_channel_factory.h ('k') | ipc/ipc_channel_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698