summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chromeos/network/firewall_hole.cc21
-rw-r--r--chromeos/network/firewall_hole.h23
-rw-r--r--dbus/file_descriptor.cc9
-rw-r--r--dbus/file_descriptor.h10
4 files changed, 31 insertions, 32 deletions
diff --git a/chromeos/network/firewall_hole.cc b/chromeos/network/firewall_hole.cc
index 3ad3463..425e423 100644
--- a/chromeos/network/firewall_hole.cc
+++ b/chromeos/network/firewall_hole.cc
@@ -50,7 +50,7 @@ const char* PortTypeToString(FirewallHole::PortType type) {
void PortReleased(FirewallHole::PortType type,
uint16_t port,
const std::string& interface,
- dbus::ScopedFileDescriptor lifeline_fd,
+ FirewallHole::ScopedFileDescriptor lifeline_fd,
bool success) {
if (!success) {
LOG(WARNING) << "Failed to release firewall hole for "
@@ -61,13 +61,20 @@ void PortReleased(FirewallHole::PortType type,
} // namespace
+void CHROMEOS_EXPORT FirewallHole::FileDescriptorDeleter::operator()(
+ dbus::FileDescriptor* fd) {
+ base::WorkerPool::PostTask(
+ FROM_HERE, base::Bind(&base::DeletePointer<dbus::FileDescriptor>, fd),
+ false);
+}
+
// static
void FirewallHole::Open(PortType type,
uint16_t port,
const std::string& interface,
const OpenCallback& callback) {
- dbus::ScopedFileDescriptor lifeline_local(new dbus::FileDescriptor());
- dbus::ScopedFileDescriptor lifeline_remote(new dbus::FileDescriptor());
+ ScopedFileDescriptor lifeline_local(new dbus::FileDescriptor());
+ ScopedFileDescriptor lifeline_remote(new dbus::FileDescriptor());
// This closure shares pointers with the one below. PostTaskAndReply
// guarantees that it will always be deleted first.
@@ -102,8 +109,8 @@ FirewallHole::~FirewallHole() {
void FirewallHole::RequestPortAccess(PortType type,
uint16_t port,
const std::string& interface,
- dbus::ScopedFileDescriptor lifeline_local,
- dbus::ScopedFileDescriptor lifeline_remote,
+ ScopedFileDescriptor lifeline_local,
+ ScopedFileDescriptor lifeline_remote,
const OpenCallback& callback) {
if (!lifeline_local->is_valid() || !lifeline_remote->is_valid()) {
callback.Run(nullptr);
@@ -133,7 +140,7 @@ void FirewallHole::RequestPortAccess(PortType type,
void FirewallHole::PortAccessGranted(PortType type,
uint16_t port,
const std::string& interface,
- dbus::ScopedFileDescriptor lifeline_fd,
+ ScopedFileDescriptor lifeline_fd,
const FirewallHole::OpenCallback& callback,
bool success) {
if (success) {
@@ -147,7 +154,7 @@ void FirewallHole::PortAccessGranted(PortType type,
FirewallHole::FirewallHole(PortType type,
uint16_t port,
const std::string& interface,
- dbus::ScopedFileDescriptor lifeline_fd)
+ ScopedFileDescriptor lifeline_fd)
: type_(type),
port_(port),
interface_(interface),
diff --git a/chromeos/network/firewall_hole.h b/chromeos/network/firewall_hole.h
index e6d119d..2bd6788 100644
--- a/chromeos/network/firewall_hole.h
+++ b/chromeos/network/firewall_hole.h
@@ -11,7 +11,10 @@
#include "base/callback_forward.h"
#include "base/memory/scoped_ptr.h"
#include "chromeos/chromeos_export.h"
-#include "dbus/file_descriptor.h"
+
+namespace dbus {
+class FileDescriptor;
+}
namespace chromeos {
@@ -26,6 +29,14 @@ class CHROMEOS_EXPORT FirewallHole {
typedef base::Callback<void(scoped_ptr<FirewallHole>)> OpenCallback;
+ // This provides a simple way to pass around file descriptors since they must
+ // be closed on a thread that is allowed to perform I/O.
+ struct FileDescriptorDeleter {
+ void CHROMEOS_EXPORT operator()(dbus::FileDescriptor* fd);
+ };
+ typedef scoped_ptr<dbus::FileDescriptor, FileDescriptorDeleter>
+ ScopedFileDescriptor;
+
// Opens a port on the system firewall for the given network interface (or all
// interfaces if |interface| is ""). The hole will be closed when the object
// provided to the callback is destroyed.
@@ -40,28 +51,28 @@ class CHROMEOS_EXPORT FirewallHole {
static void RequestPortAccess(PortType type,
uint16_t port,
const std::string& interface,
- dbus::ScopedFileDescriptor lifeline_local,
- dbus::ScopedFileDescriptor lifeline_remote,
+ ScopedFileDescriptor lifeline_local,
+ ScopedFileDescriptor lifeline_remote,
const OpenCallback& callback);
static void PortAccessGranted(PortType type,
uint16_t port,
const std::string& interface,
- dbus::ScopedFileDescriptor lifeline_fd,
+ ScopedFileDescriptor lifeline_fd,
const FirewallHole::OpenCallback& callback,
bool success);
FirewallHole(PortType type,
uint16_t port,
const std::string& interface,
- dbus::ScopedFileDescriptor lifeline_fd);
+ ScopedFileDescriptor lifeline_fd);
const PortType type_;
const uint16_t port_;
const std::string interface_;
// A file descriptor used by firewalld to track the lifetime of this process.
- dbus::ScopedFileDescriptor lifeline_fd_;
+ ScopedFileDescriptor lifeline_fd_;
};
} // namespace chromeos
diff --git a/dbus/file_descriptor.cc b/dbus/file_descriptor.cc
index e607fc0..d2d6a31 100644
--- a/dbus/file_descriptor.cc
+++ b/dbus/file_descriptor.cc
@@ -2,21 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
#include "base/files/file.h"
-#include "base/location.h"
#include "base/logging.h"
-#include "base/threading/worker_pool.h"
#include "dbus/file_descriptor.h"
namespace dbus {
-void CHROME_DBUS_EXPORT FileDescriptor::Deleter::operator()(
- FileDescriptor* fd) {
- base::WorkerPool::PostTask(
- FROM_HERE, base::Bind(&base::DeletePointer<FileDescriptor>, fd), false);
-}
-
FileDescriptor::~FileDescriptor() {
if (owner_)
base::File auto_closer(value_);
diff --git a/dbus/file_descriptor.h b/dbus/file_descriptor.h
index 1e62c87..19e0b1a 100644
--- a/dbus/file_descriptor.h
+++ b/dbus/file_descriptor.h
@@ -6,7 +6,6 @@
#define DBUS_FILE_DESCRIPTOR_H_
#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
#include "dbus/dbus_export.h"
namespace dbus {
@@ -34,12 +33,6 @@ namespace dbus {
// with i/o restrictions.
class CHROME_DBUS_EXPORT FileDescriptor {
public:
- // This provides a simple way to pass around file descriptors since they must
- // be closed on a thread that is allowed to perform I/O.
- struct Deleter {
- void CHROME_DBUS_EXPORT operator()(FileDescriptor* fd);
- };
-
// Permits initialization without a value for passing to
// dbus::MessageReader::PopFileDescriptor to fill in and from int values.
FileDescriptor() : value_(-1), owner_(false), valid_(false) {}
@@ -77,9 +70,6 @@ class CHROME_DBUS_EXPORT FileDescriptor {
DISALLOW_COPY_AND_ASSIGN(FileDescriptor);
};
-using ScopedFileDescriptor =
- scoped_ptr<FileDescriptor, FileDescriptor::Deleter> CHROME_DBUS_EXPORT;
-
} // namespace dbus
#endif // DBUS_FILE_DESCRIPTOR_H_
generated by cgit v1.1 at 2024-05-23 04:29:45 +0000