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

Side by Side Diff: device/bluetooth/bluetooth_socket_chromeos.cc

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix so that this CL compiles on Windows. Created 8 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.h" 5 #include "device/bluetooth/bluetooth_socket_chromeos.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include <bluetooth/bluetooth.h> 9 #include <bluetooth/bluetooth.h>
10 #include <bluetooth/rfcomm.h> 10 #include <bluetooth/rfcomm.h>
11 #include <errno.h> 11 #include <errno.h>
12 #include <sys/socket.h> 12 #include <sys/socket.h>
13 #include <sys/types.h> 13 #include <sys/types.h>
14 #include <string.h> 14 #include <string.h>
15 #include <unistd.h> 15 #include <unistd.h>
16 16
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h" 18 #include "device/bluetooth/bluetooth_service_record.h"
19 #include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h" 19 #include "device/bluetooth/bluetooth_utils.h"
20 20
21 namespace chromeos { 21 namespace bluetooth {
keybuk 2012/10/12 00:13:18 namespace?
youngki 2012/10/12 01:50:12 Done.
22 22
23 BluetoothSocketChromeOs::BluetoothSocketChromeOs( 23 BluetoothSocketChromeOs::BluetoothSocketChromeOs(
24 const std::string& address, int fd) 24 const std::string& address, int fd)
25 : address_(address), 25 : address_(address),
26 fd_(fd) { 26 fd_(fd) {
27 } 27 }
28 28
29 BluetoothSocketChromeOs::~BluetoothSocketChromeOs() { 29 BluetoothSocketChromeOs::~BluetoothSocketChromeOs() {
30 close(fd_); 30 close(fd_);
31 } 31 }
32 32
33 // static 33 // static
34 scoped_refptr<BluetoothSocket> BluetoothSocketChromeOs::CreateBluetoothSocket( 34 scoped_refptr<BluetoothSocket> BluetoothSocketChromeOs::CreateBluetoothSocket(
35 const BluetoothServiceRecord& service_record) { 35 const BluetoothServiceRecord& service_record) {
36 BluetoothSocketChromeOs* bluetooth_socket = NULL; 36 BluetoothSocketChromeOs* bluetooth_socket = NULL;
37 if (service_record.SupportsRfcomm()) { 37 if (service_record.SupportsRfcomm()) {
38 int socket_fd = socket( 38 int socket_fd = socket(
39 AF_BLUETOOTH, SOCK_STREAM | SOCK_NONBLOCK, BTPROTO_RFCOMM); 39 AF_BLUETOOTH, SOCK_STREAM | SOCK_NONBLOCK, BTPROTO_RFCOMM);
40 struct sockaddr_rc socket_address = { 0 }; 40 struct sockaddr_rc socket_address = { 0 };
41 socket_address.rc_family = AF_BLUETOOTH; 41 socket_address.rc_family = AF_BLUETOOTH;
42 socket_address.rc_channel = service_record.rfcomm_channel(); 42 socket_address.rc_channel = service_record.rfcomm_channel();
43 bluetooth_utils::str2ba(service_record.address(), 43 utils::str2ba(service_record.address(),
44 &socket_address.rc_bdaddr); 44 &socket_address.rc_bdaddr);
45 45
46 int status = connect(socket_fd, (struct sockaddr *)&socket_address, 46 int status = connect(socket_fd, (struct sockaddr *)&socket_address,
47 sizeof(socket_address)); 47 sizeof(socket_address));
48 int errsv = errno; 48 int errsv = errno;
49 if (status == 0 || errno == EINPROGRESS) { 49 if (status == 0 || errno == EINPROGRESS) {
50 bluetooth_socket = new BluetoothSocketChromeOs(service_record.address(), 50 bluetooth_socket = new BluetoothSocketChromeOs(service_record.address(),
51 socket_fd); 51 socket_fd);
52 } else { 52 } else {
53 LOG(ERROR) << "Failed to connect bluetooth socket " 53 LOG(ERROR) << "Failed to connect bluetooth socket "
54 << "(" << service_record.address() << "): " 54 << "(" << service_record.address() << "): "
55 << "(" << errsv << ") " << strerror(errsv); 55 << "(" << errsv << ") " << strerror(errsv);
56 close(socket_fd); 56 close(socket_fd);
57 } 57 }
58 } 58 }
59 // TODO(bryeung): add support for L2CAP sockets as well. 59 // TODO(bryeung): add support for L2CAP sockets as well.
60 60
61 return scoped_refptr<BluetoothSocketChromeOs>(bluetooth_socket); 61 return scoped_refptr<BluetoothSocketChromeOs>(bluetooth_socket);
62 } 62 }
63 63
64 int BluetoothSocketChromeOs::fd() const { 64 int BluetoothSocketChromeOs::fd() const {
65 return fd_; 65 return fd_;
66 } 66 }
67 67
68 } // namespace chromeos 68 } // namespace bluetooth
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698