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

Side by Side Diff: remoting/host/ipc_util_posix.cc

Issue 307463004: Remove PlatformFile from remoting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compilation Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/ipc_util.h ('k') | remoting/host/ipc_util_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "remoting/host/ipc_util.h" 5 #include "remoting/host/ipc_util.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 #include <sys/socket.h> 8 #include <sys/socket.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 11
12 #include "base/files/file.h"
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "base/posix/eintr_wrapper.h" 14 #include "base/posix/eintr_wrapper.h"
14 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
15 #include "ipc/ipc_channel.h" 16 #include "ipc/ipc_channel.h"
16 #include "ipc/ipc_channel_proxy.h" 17 #include "ipc/ipc_channel_proxy.h"
17 18
18 namespace remoting { 19 namespace remoting {
19 20
20 bool CreateConnectedIpcChannel( 21 bool CreateConnectedIpcChannel(
21 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 22 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
22 IPC::Listener* listener, 23 IPC::Listener* listener,
23 IPC::PlatformFileForTransit* client_out, 24 base::File* client_out,
24 scoped_ptr<IPC::ChannelProxy>* server_out) { 25 scoped_ptr<IPC::ChannelProxy>* server_out) {
25 // Create a socket pair. 26 // Create a socket pair.
26 int pipe_fds[2]; 27 int pipe_fds[2];
27 if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipe_fds) != 0) { 28 if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipe_fds) != 0) {
28 PLOG(ERROR) << "socketpair()"; 29 PLOG(ERROR) << "socketpair()";
29 return false; 30 return false;
30 } 31 }
31 32
32 // Set both ends to be non-blocking. 33 // Set both ends to be non-blocking.
33 if (fcntl(pipe_fds[0], F_SETFL, O_NONBLOCK) == -1 || 34 if (fcntl(pipe_fds[0], F_SETFL, O_NONBLOCK) == -1 ||
34 fcntl(pipe_fds[1], F_SETFL, O_NONBLOCK) == -1) { 35 fcntl(pipe_fds[1], F_SETFL, O_NONBLOCK) == -1) {
35 PLOG(ERROR) << "fcntl(O_NONBLOCK)"; 36 PLOG(ERROR) << "fcntl(O_NONBLOCK)";
36 if (IGNORE_EINTR(close(pipe_fds[0])) < 0) 37 if (IGNORE_EINTR(close(pipe_fds[0])) < 0)
37 PLOG(ERROR) << "close()"; 38 PLOG(ERROR) << "close()";
38 if (IGNORE_EINTR(close(pipe_fds[1])) < 0) 39 if (IGNORE_EINTR(close(pipe_fds[1])) < 0)
39 PLOG(ERROR) << "close()"; 40 PLOG(ERROR) << "close()";
40 return false; 41 return false;
41 } 42 }
42 43
43 std::string socket_name = "Chromoting socket"; 44 std::string socket_name = "Chromoting socket";
44 45
45 // Wrap the pipe into an IPC channel. 46 // Wrap the pipe into an IPC channel.
46 base::FileDescriptor fd(pipe_fds[0], false); 47 base::FileDescriptor fd(pipe_fds[0], false);
47 IPC::ChannelHandle handle(socket_name, fd); 48 IPC::ChannelHandle handle(socket_name, fd);
48 server_out->reset(new IPC::ChannelProxy(IPC::ChannelHandle(socket_name, fd), 49 server_out->reset(new IPC::ChannelProxy(IPC::ChannelHandle(socket_name, fd),
49 IPC::Channel::MODE_SERVER, 50 IPC::Channel::MODE_SERVER,
50 listener, 51 listener,
51 io_task_runner.get())); 52 io_task_runner.get()));
52 53
53 *client_out = base::FileDescriptor(pipe_fds[1], false); 54 *client_out = base::File(pipe_fds[1]);
54 return true; 55 return true;
55 } 56 }
56 57
57 } // namespace remoting 58 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/ipc_util.h ('k') | remoting/host/ipc_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698