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
@@ -16,51 +16,53 @@
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.=       =       ; Library General Public License for more
20++=   -.     .`     .: details. 20++=   -.     .`     .: details.
21 :     =  ...= . :.=- 21 :     =  ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22 -.   .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23  -_. . .   )=.  = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24    --        :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#include "obluetooth.h" 30#include "obluetooth.h"
31 31
32/* OPIE */ 32/* OPIE */
33#include <opie2/odebug.h> 33#include <opie2/odebug.h>
34using namespace Opie::Core; 34using namespace Opie::Core;
35 35
36/* STD */ 36/* STD */
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>
46 48
47namespace Opie { 49namespace Opie {
48namespace Bluez { 50namespace Bluez {
49 51
50/*====================================================================================== 52/*======================================================================================
51 * OBluetooth 53 * OBluetooth
52 *======================================================================================*/ 54 *======================================================================================*/
53 55
54OBluetooth* OBluetooth::_instance = 0; 56OBluetooth* OBluetooth::_instance = 0;
55 57
56OBluetooth::OBluetooth() 58OBluetooth::OBluetooth()
57{ 59{
58 synchronize(); 60 synchronize();
59} 61}
60 62
61OBluetooth* OBluetooth::instance() 63OBluetooth* OBluetooth::instance()
62{ 64{
63 if ( !_instance ) _instance = new OBluetooth(); 65 if ( !_instance ) _instance = new OBluetooth();
64 return _instance; 66 return _instance;
65} 67}
66 68
@@ -168,27 +170,82 @@ QString OBluetoothInterface::macAddress() const
168 d->devinfo.bdaddr.b[0] ); 170 d->devinfo.bdaddr.b[0] );
169} 171}
170 172
171bool OBluetoothInterface::setUp( bool b ) 173bool OBluetoothInterface::setUp( bool b )
172{ 174{
173 int cmd = b ? HCIDEVUP : HCIDEVDOWN; 175 int cmd = b ? HCIDEVUP : HCIDEVDOWN;
174 int result = ::ioctl( d->ctlfd, cmd, d->devinfo.dev_id ); 176 int result = ::ioctl( d->ctlfd, cmd, d->devinfo.dev_id );
175 if ( result == -1 && errno != EALREADY ) 177 if ( result == -1 && errno != EALREADY )
176 { 178 {
177 owarn << "OBluetoothInterface::setUp( " << b << " ) - couldn't change interface state (" << strerror( errno ) << ")" << oendl; 179 owarn << "OBluetoothInterface::setUp( " << b << " ) - couldn't change interface state (" << strerror( errno ) << ")" << oendl;
178 return false; 180 return false;
179 } 181 }
180 else 182 else
181 { 183 {
182 d->reloadInfo(); 184 d->reloadInfo();
183 return true; 185 return true;
184 } 186 }
185} 187}
186 188
187bool OBluetoothInterface::isUp() const 189bool OBluetoothInterface::isUp() const
188{ 190{
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
@@ -16,48 +16,49 @@
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.=       =       ; Library General Public License for more
20++=   -.     .`     .: details. 20++=   -.     .`     .: details.
21 :     =  ...= . :.=- 21 :     =  ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22 -.   .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23  -_. . .   )=.  = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24    --        :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#ifndef OBLUETOOTH_H 30#ifndef OBLUETOOTH_H
31#define OBLUETOOTH_H 31#define OBLUETOOTH_H
32 32
33#include <qobject.h> 33#include <qobject.h>
34#include <qdict.h> 34#include <qdict.h>
35 35
36namespace Opie { 36namespace 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
43 * 44 *
44 * This class provides access to all available bluetooth interfaces of your computer. 45 * This class provides access to all available bluetooth interfaces of your computer.
45 * 46 *
46 * @author Michael 'Mickey' Lauer <mickey@vanille.de> 47 * @author Michael 'Mickey' Lauer <mickey@vanille.de>
47 */ 48 */
48class OBluetooth : public QObject 49class OBluetooth : public QObject
49{ 50{
50 Q_OBJECT 51 Q_OBJECT
51 52
52 public: 53 public:
53 typedef QDict<OBluetoothInterface> InterfaceMap; 54 typedef QDict<OBluetoothInterface> InterfaceMap;
54 typedef QDictIterator<OBluetoothInterface> InterfaceIterator; 55 typedef QDictIterator<OBluetoothInterface> InterfaceIterator;
55 56
56 public: 57 public:
57 /** 58 /**
58 * @returns the number of available interfaces 59 * @returns the number of available interfaces
59 */ 60 */
60 int count() const; 61 int count() const;
61 /** 62 /**
62 * @returns a pointer to the (one and only) @ref OBluetooth instance. 63 * @returns a pointer to the (one and only) @ref OBluetooth instance.
63 */ 64 */
@@ -83,67 +84,104 @@ class OBluetooth : public QObject
83 * @internal Rebuild the internal interface database 84 * @internal Rebuild the internal interface database
84 * @note Sometimes it might be useful to call this from client code, 85 * @note Sometimes it might be useful to call this from client code,
85 * e.g. after issuing a cardctl insert 86 * e.g. after issuing a cardctl insert
86 */ 87 */
87 void synchronize(); 88 void synchronize();
88 89
89 protected: 90 protected:
90 OBluetooth(); 91 OBluetooth();
91 92
92 private: 93 private:
93 static OBluetooth* _instance; 94 static OBluetooth* _instance;
94 InterfaceMap _interfaces; 95 InterfaceMap _interfaces;
95 class OBluetoothPrivate; 96 class OBluetoothPrivate;
96 OBluetoothPrivate *d; 97 OBluetoothPrivate *d;
97 int _fd; 98 int _fd;
98}; 99};
99 100
100/*====================================================================================== 101/*======================================================================================
101 * OBluetoothInterface 102 * OBluetoothInterface
102 *======================================================================================*/ 103 *======================================================================================*/
103 104
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.
111 * 112 *
112 * @author Michael 'Mickey' Lauer <mickey@vanille.de> 113 * @author Michael 'Mickey' Lauer <mickey@vanille.de>
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,
119 * but access them via @ref OBluetooth::interface(). 125 * but access them via @ref OBluetooth::interface().
120 */ 126 */
121 OBluetoothInterface( QObject* parent, const char* name, void* devinfo, int ctlfd ); 127 OBluetoothInterface( QObject* parent, const char* name, void* devinfo, int ctlfd );
122 /** 128 /**
123 * Destructor. 129 * Destructor.
124 */ 130 */
125 virtual ~OBluetoothInterface(); 131 virtual ~OBluetoothInterface();
126 /** 132 /**
127 * @return the MAC address of the interfaces 133 * @return the MAC address of the interfaces
128 */ 134 */
129 QString macAddress() const; 135 QString macAddress() const;
130 /** 136 /**
131 * Setting an interface to up enables it to receive packets. 137 * Setting an interface to up enables it to receive packets.
132 */ 138 */
133 bool setUp( bool ); 139 bool setUp( bool );
134 /** 140 /**
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}
148#endif 186#endif
149 187