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

Side by Side Diff: chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.cc

Issue 10899037: Refactoring bluetooth API code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed ASSERT_TRUE checks. 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.h" 5 #include "chrome/browser/chromeos/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 "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h" 18 #include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
18 #include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h" 19 #include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
19 20
20 namespace chromeos { 21 namespace chromeos {
21 22
22 BluetoothSocket::BluetoothSocket(const std::string& address, int fd) 23 BluetoothSocketChromeOs::BluetoothSocketChromeOs(
24 const std::string& address, int fd)
23 : address_(address), 25 : address_(address),
24 fd_(fd) { 26 fd_(fd) {
25 } 27 }
26 28
27 BluetoothSocket::~BluetoothSocket() { 29 BluetoothSocketChromeOs::~BluetoothSocketChromeOs() {
28 close(fd_); 30 close(fd_);
29 } 31 }
30 32
31 // static 33 // static
32 scoped_refptr<BluetoothSocket> BluetoothSocket::CreateBluetoothSocket( 34 scoped_refptr<BluetoothSocket> BluetoothSocketChromeOs::CreateBluetoothSocket(
33 const BluetoothServiceRecord& service_record) { 35 const BluetoothServiceRecord& service_record) {
34 BluetoothSocket* bluetooth_socket = NULL; 36 BluetoothSocketChromeOs* bluetooth_socket = NULL;
35 if (service_record.SupportsRfcomm()) { 37 if (service_record.SupportsRfcomm()) {
36 int socket_fd = socket( 38 int socket_fd = socket(
37 AF_BLUETOOTH, SOCK_STREAM | SOCK_NONBLOCK, BTPROTO_RFCOMM); 39 AF_BLUETOOTH, SOCK_STREAM | SOCK_NONBLOCK, BTPROTO_RFCOMM);
38 struct sockaddr_rc socket_address = { 0 }; 40 struct sockaddr_rc socket_address = { 0 };
39 socket_address.rc_family = AF_BLUETOOTH; 41 socket_address.rc_family = AF_BLUETOOTH;
40 socket_address.rc_channel = service_record.rfcomm_channel(); 42 socket_address.rc_channel = service_record.rfcomm_channel();
41 bluetooth_utils::str2ba(service_record.address(), 43 bluetooth_utils::str2ba(service_record.address(),
42 &socket_address.rc_bdaddr); 44 &socket_address.rc_bdaddr);
43 45
44 int status = connect(socket_fd, (struct sockaddr *)&socket_address, 46 int status = connect(socket_fd, (struct sockaddr *)&socket_address,
45 sizeof(socket_address)); 47 sizeof(socket_address));
46 int errsv = errno; 48 int errsv = errno;
47 if (status == 0 || errno == EINPROGRESS) { 49 if (status == 0 || errno == EINPROGRESS) {
48 bluetooth_socket = new BluetoothSocket(service_record.address(), 50 bluetooth_socket = new BluetoothSocketChromeOs(service_record.address(),
49 socket_fd); 51 socket_fd);
50 } else { 52 } else {
51 LOG(ERROR) << "Failed to connect bluetooth socket " 53 LOG(ERROR) << "Failed to connect bluetooth socket "
52 << "(" << service_record.address() << "): " 54 << "(" << service_record.address() << "): "
53 << "(" << errsv << ") " << strerror(errsv); 55 << "(" << errsv << ") " << strerror(errsv);
54 close(socket_fd); 56 close(socket_fd);
55 } 57 }
56 } 58 }
57 // TODO(bryeung): add support for L2CAP sockets as well. 59 // TODO(bryeung): add support for L2CAP sockets as well.
58 60
59 return scoped_refptr<BluetoothSocket>(bluetooth_socket); 61 return scoped_refptr<BluetoothSocketChromeOs>(bluetooth_socket);
62 }
63
64 int BluetoothSocketChromeOs::fd() const {
65 return fd_;
60 } 66 }
61 67
62 } // namespace chromeos 68 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698