summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiebluez/obluetooth.cpp57
-rw-r--r--libopie2/opiebluez/obluetooth.h40
2 files changed, 96 insertions, 1 deletions
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp
index c99a822..e0ba0ec 100644
--- a/libopie2/opiebluez/obluetooth.cpp
+++ b/libopie2/opiebluez/obluetooth.cpp
@@ -37,9 +37,11 @@ using namespace Opie::Core;
37#include <bluetooth/bluetooth.h> 37#include <bluetooth/bluetooth.h>
38#include <bluetooth/hci.h> 38#include <bluetooth/hci.h>
39#include <bluetooth/hci_lib.h> 39#include <bluetooth/hci_lib.h>
40#include <assert.h>
40#include <errno.h> 41#include <errno.h>
41#include <stdlib.h> 42#include <stdlib.h>
42#include <string.h> 43#include <string.h>
44#include <unistd.h>
43#include <sys/ioctl.h> 45#include <sys/ioctl.h>
44#include <sys/types.h> 46#include <sys/types.h>
45#include <sys/socket.h> 47#include <sys/socket.h>
@@ -189,6 +191,61 @@ bool OBluetoothInterface::isUp() const
189 return hci_test_bit( HCI_UP, &d->devinfo.flags ); 191 return hci_test_bit( HCI_UP, &d->devinfo.flags );
190} 192}
191 193
194OBluetoothInterface::DeviceIterator OBluetoothInterface::neighbourhood()
195{
196 _devices.clear();
197 struct hci_inquiry_req* ir;
198 int nrsp = 255;
199
200 char* mybuffer = static_cast<char*>( malloc( sizeof( *ir ) + ( sizeof( inquiry_info ) * (nrsp) ) ) );
201 assert( mybuffer );
202
203 ir = (struct hci_inquiry_req*) mybuffer;
204 memset( ir, 0, sizeof( *ir ) + ( sizeof( inquiry_info ) * (nrsp) ) );
205
206 ir->dev_id = d->devinfo.dev_id;
207 ir->num_rsp = nrsp;
208 ir->length = 8;
209 ir->flags = 0;
210 ir->lap[0] = 0x33;
211 ir->lap[1] = 0x8b;
212 ir->lap[2] = 0x9e;
213
214 int result = ::ioctl( d->ctlfd, HCIINQUIRY, mybuffer );
215 if ( result == -1 )
216 {
217 owarn << "OBluetoothInterface::neighbourhood() - can't issue HCIINQUIRY (" << strerror( errno ) << ")" << oendl;
218 return DeviceIterator( _devices );
219 }
220
221 for( int i = 0; i < ir->num_rsp; ++i )
222 {
223 odebug << "found a device" << oendl;
224 }
225
226 return DeviceIterator( _devices );
192} 227}
228
229
230/*======================================================================================
231 * OBluetoothDevice
232 *======================================================================================*/
233
234OBluetoothDevice::OBluetoothDevice( QObject* parent, const char* name )
235 :QObject( parent, name )
236{
237 odebug << "OBluetoothDevice::OBluetoothDevice() - '" << name << "'" << oendl;
238}
239
240OBluetoothDevice::~OBluetoothDevice()
241{
242 odebug << "OBluetoothDevice::~OBluetoothDevice()" << oendl;
193} 243}
194 244
245QString OBluetoothDevice::macAddress() const
246{
247 return "N/A";
248}
249
250}
251}
diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h
index 4423a55..ee4a90d 100644
--- a/libopie2/opiebluez/obluetooth.h
+++ b/libopie2/opiebluez/obluetooth.h
@@ -37,6 +37,7 @@ namespace Opie {
37namespace Bluez { 37namespace Bluez {
38 38
39class OBluetoothInterface; 39class OBluetoothInterface;
40class OBluetoothDevice;
40 41
41/** 42/**
42 * @brief A container class for all bluetooth interfaces 43 * @brief A container class for all bluetooth interfaces
@@ -104,7 +105,7 @@ class OBluetooth : public QObject
104/** 105/**
105 * @brief An bluetooth interface wrapper. 106 * @brief An bluetooth interface wrapper.
106 * 107 *
107 * This class provides a wrapper for an infrared interface. All the cumbersome details of 108 * This class provides a wrapper for a bluetooth HCI device. All the cumbersome details of
108 * Linux ioctls are hidden under a convenient high-level interface. 109 * Linux ioctls are hidden under a convenient high-level interface.
109 * @warning Most of the setting methods contained in this class require the appropriate 110 * @warning Most of the setting methods contained in this class require the appropriate
110 * process permissions to work. 111 * process permissions to work.
@@ -113,6 +114,11 @@ class OBluetooth : public QObject
113 */ 114 */
114class OBluetoothInterface : public QObject 115class OBluetoothInterface : public QObject
115{ 116{
117 Q_OBJECT
118 public:
119 typedef QDict<OBluetoothDevice> DeviceMap;
120 typedef QDictIterator<OBluetoothDevice> DeviceIterator;
121
116 public: 122 public:
117 /** 123 /**
118 * Constructor. Normally you don't create @ref OBluetoothInterface objects yourself, 124 * Constructor. Normally you don't create @ref OBluetoothInterface objects yourself,
@@ -135,13 +141,45 @@ class OBluetoothInterface : public QObject
135 * @returns true if the interface is up. 141 * @returns true if the interface is up.
136 */ 142 */
137 bool isUp() const; 143 bool isUp() const;
144 /**
145 * @returns an iterator usable for iterating through the devices in range
146 */
147 DeviceIterator neighbourhood();
138 148
139 private: 149 private:
150 DeviceMap _devices;
140 class Private; 151 class Private;
141 Private *d; 152 Private *d;
142}; 153};
143 154
155/*======================================================================================
156 * OBluetoothDevice
157 *======================================================================================*/
158
159/**
160 * @brief An bluetooth (remote) device abstraction.
161 *
162 * This class resembles a (remote) bluetooth device.
163 * @author Michael 'Mickey' Lauer <mickey@vanille.de>
164 */
165class OBluetoothDevice : public QObject
166{
167 Q_OBJECT
144 168
169 public:
170 /**
171 * Constructor.
172 */
173 OBluetoothDevice( QObject* parent, const char* name );
174 /**
175 * Destructor.
176 */
177 virtual ~OBluetoothDevice();
178 /**
179 * @returns the MAC address of the device's interface
180 */
181 QString macAddress() const;
182};
145 183
146} 184}
147} 185}