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
@@ -34,15 +34,17 @@
 using namespace Opie::Core;
 
 /* STD */
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
+#include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
 namespace Opie {
 namespace Bluez {
@@ -186,9 +188,64 @@ bool OBluetoothInterface::setUp( bool b )
 
 bool OBluetoothInterface::isUp() const
 {
     return hci_test_bit( HCI_UP, &d->devinfo.flags );
 }
 
+OBluetoothInterface::DeviceIterator OBluetoothInterface::neighbourhood()
+{
+    _devices.clear();
+    struct hci_inquiry_req* ir;
+    int nrsp = 255;
+
+    char* mybuffer = static_cast<char*>( malloc( sizeof( *ir ) + ( sizeof( inquiry_info ) * (nrsp) ) ) );
+    assert( mybuffer );
+
+    ir = (struct hci_inquiry_req*) mybuffer;
+    memset( ir, 0, sizeof( *ir ) + ( sizeof( inquiry_info ) * (nrsp) ) );
+
+    ir->dev_id  = d->devinfo.dev_id;
+    ir->num_rsp = nrsp;
+    ir->length  = 8;
+    ir->flags   = 0;
+    ir->lap[0] = 0x33;
+    ir->lap[1] = 0x8b;
+    ir->lap[2] = 0x9e;
+
+    int result = ::ioctl( d->ctlfd, HCIINQUIRY, mybuffer );
+    if ( result == -1 )
+    {
+        owarn << "OBluetoothInterface::neighbourhood() - can't issue HCIINQUIRY (" << strerror( errno ) << ")" << oendl;
+        return DeviceIterator( _devices );
+    }
+
+    for( int i = 0; i < ir->num_rsp; ++i )
+    {
+        odebug << "found a device" << oendl;
+    }
+
+    return DeviceIterator( _devices );
 }
+
+
+/*======================================================================================
+ * OBluetoothDevice
+ *======================================================================================*/
+
+OBluetoothDevice::OBluetoothDevice( QObject* parent, const char* name )
+                 :QObject( parent, name )
+{
+    odebug << "OBluetoothDevice::OBluetoothDevice() - '" << name << "'" << oendl;
+}
+
+OBluetoothDevice::~OBluetoothDevice()
+{
+    odebug << "OBluetoothDevice::~OBluetoothDevice()" << oendl;
 }
 
+QString OBluetoothDevice::macAddress() const
+{
+    return "N/A";
+}
+
+}
+}
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
@@ -34,12 +34,13 @@
 #include <qdict.h>
 
 namespace Opie {
 namespace Bluez {
 
 class OBluetoothInterface;
+class OBluetoothDevice;
 
 /**
  * @brief A container class for all bluetooth interfaces
  *
  * This class provides access to all available bluetooth interfaces of your computer.
  *
@@ -101,21 +102,26 @@ class OBluetooth : public QObject
  * OBluetoothInterface
  *======================================================================================*/
 
 /**
  * @brief An bluetooth interface wrapper.
  *
- * This class provides a wrapper for an infrared interface. All the cumbersome details of
+ * This class provides a wrapper for a bluetooth HCI device. All the cumbersome details of
  * Linux ioctls are hidden under a convenient high-level interface.
  * @warning Most of the setting methods contained in this class require the appropriate
  * process permissions to work.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class OBluetoothInterface : public QObject
 {
+  Q_OBJECT
+  public:
+    typedef QDict<OBluetoothDevice> DeviceMap;
+    typedef QDictIterator<OBluetoothDevice> DeviceIterator;
+
   public:
     /**
      * Constructor. Normally you don't create @ref OBluetoothInterface objects yourself,
      * but access them via @ref OBluetooth::interface().
      */
     OBluetoothInterface( QObject* parent, const char* name, void* devinfo, int ctlfd );
@@ -132,18 +138,50 @@ class OBluetoothInterface : public QObject
      */
     bool setUp( bool );
     /**
      * @returns true if the interface is up.
      */
     bool isUp() const;
+    /**
+      * @returns an iterator usable for iterating through the devices in range
+      */
+    DeviceIterator neighbourhood();
 
   private:
+    DeviceMap _devices;
     class Private;
     Private *d;
 };
 
+/*======================================================================================
+ * OBluetoothDevice
+ *======================================================================================*/
+
+/**
+ * @brief An bluetooth (remote) device abstraction.
+ *
+ * This class resembles a (remote) bluetooth device.
+ * @author Michael 'Mickey' Lauer <mickey@vanille.de>
+ */
+class OBluetoothDevice : public QObject
+{
+  Q_OBJECT
 
+  public:
+    /**
+     * Constructor.
+     */
+    OBluetoothDevice( QObject* parent, const char* name );
+    /**
+     * Destructor.
+     */
+    virtual ~OBluetoothDevice();
+    /**
+      * @returns the MAC address of the device's interface
+      */
+    QString macAddress() const;
+};
 
 }
 }
 #endif