3 files changed, 160 insertions, 14 deletions

diff --git a/examples/opiebluez/oblueztest/main.cpp b/examples/opiebluez/oblueztest/main.cpp
index 361dbd8..6c2ca75 100644
--- a/examples/opiebluez/oblueztest/main.cpp
+++ b/examples/opiebluez/oblueztest/main.cpp
@@ -1,23 +1,34 @@
 #include <opie2/odebug.h>
 #include <opie2/obluetooth.h>
 
 using namespace Opie::Core;
 using namespace Opie::Bluez;
 
 int main( int argc, char** argv )
 {
     OBluetooth* sys = OBluetooth::instance();
-
     OBluetooth::InterfaceIterator it = sys->iterator();
 
     while( it.current() )
     {
         odebug << "APP: Bluetooth host controller interface '" << it.current()->name() << "' has MAC '" << it.current()->macAddress() << "'" << oendl;
-        odebug << "APP: Interface is " << ( it.current()->isUp() ? "UP" : "DOWN" ) << ". Trying to toggle state..." << oendl;
-        it.current()->setUp( !it.current()->isUp() );
         odebug << "APP: Interface is " << ( it.current()->isUp() ? "UP" : "DOWN" ) << "." << oendl;
+        //odebug << "APP: Trying to toggle state..." << oendl;
+        //it.current()->setUp( !it.current()->isUp() );
+        //odebug << "APP: Interface is " << ( it.current()->isUp() ? "UP" : "DOWN" ) << "." << oendl;
+
+        odebug << "APP: scanning..." << oendl;
+
+        OBluetoothInterface::DeviceIterator devit = it.current()->neighbourhood();
+        while( devit.current() )
+        {
+            odebug << "APP: Neighbourhood '" << devit.current()->name() << "' has MAC '" << devit.current()->macAddress() << "'" << oendl;
+            odebug << "APP: Neighbourhood '" << devit.current()->name() << "' has class '" << devit.current()->deviceClass() << "'" << oendl;
+            ++devit;
+        }
+
         ++it;
     }
     return 0;
 }
 
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp
index e0ba0ec..80f4bfc 100644
--- a/libopie2/opiebluez/obluetooth.cpp
+++ b/libopie2/opiebluez/obluetooth.cpp
@@ -112,140 +112,263 @@ void OBluetooth::synchronize()
         return;
     }
 
     for ( int i = 0; i < dl->dev_num; ++i )
     {
         di.dev_id = ( dr + i )->dev_id;
         if ( ::ioctl( _fd, HCIGETDEVINFO, (void *) &di ) == -1 )
         {
             owarn << "OBluetooth::synchronize() - can't issue HCIGETDEVINFO on device " << i << " (" << strerror( errno ) << ") - skipping that device. " << oendl;
             continue;
         }
         odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl;
         _interfaces.insert( di.name, new OBluetoothInterface( this, di.name, (void*) &di, _fd ) );
     }
 }
 
 /*======================================================================================
  * OBluetoothInterface
  *======================================================================================*/
 
 class OBluetoothInterface::Private
 {
   public:
     Private( struct hci_dev_info* di, int fd )
     {
         ::memcpy( &devinfo, di, sizeof(struct hci_dev_info) );
         ctlfd = fd;
     }
     void reloadInfo()
     {
         int result = ::ioctl( ctlfd, HCIGETDEVINFO, (void *) &devinfo );
         if ( result == -1 )
         {
             owarn << "OBluetoothInterface::Private - can't reload device info (" << strerror( errno ) << ")" << oendl;
         }
     }
     struct hci_dev_info devinfo;
     int ctlfd;
 };
 
 OBluetoothInterface::OBluetoothInterface( QObject* parent, const char* name, void* devinfo, int ctlfd )
                     :QObject( parent, name )
 {
     d = new OBluetoothInterface::Private( (struct hci_dev_info*) devinfo, ctlfd );
 }
 
 OBluetoothInterface::~OBluetoothInterface()
 {
 }
 
 QString OBluetoothInterface::macAddress() const
 {
     return QString().sprintf( "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
                               d->devinfo.bdaddr.b[5],
                               d->devinfo.bdaddr.b[4],
                               d->devinfo.bdaddr.b[3],
                               d->devinfo.bdaddr.b[2],
                               d->devinfo.bdaddr.b[1],
                               d->devinfo.bdaddr.b[0] );
 }
 
 bool OBluetoothInterface::setUp( bool b )
 {
     int cmd = b ? HCIDEVUP : HCIDEVDOWN;
     int result = ::ioctl( d->ctlfd, cmd, d->devinfo.dev_id );
     if ( result == -1 && errno != EALREADY )
     {
         owarn << "OBluetoothInterface::setUp( " << b << " ) - couldn't change interface state (" << strerror( errno ) << ")" << oendl;
         return false;
     }
     else
     {
         d->reloadInfo();
         return true;
     }
 }
 
 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->length  = 8; // 10 seconds
     ir->flags   = 0;
-    ir->lap[0] = 0x33;
+    ir->lap[0] = 0x33; // GIAC
     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 )
+    inquiry_info* ii = (inquiry_info*)( ir+1 );
+
+    for ( int i = 0; i < ir->num_rsp; ++i )
     {
-        odebug << "found a device" << oendl;
+        OBluetoothDevice* dev = new OBluetoothDevice( this, 0, ii );
+        _devices.insert( dev->macAddress(), dev );
+        ++ii;
     }
 
     return DeviceIterator( _devices );
 }
 
-
 /*======================================================================================
  * OBluetoothDevice
  *======================================================================================*/
 
-OBluetoothDevice::OBluetoothDevice( QObject* parent, const char* name )
+class OBluetoothDevice::Private
+{
+  public:
+    Private( inquiry_info* ii )
+    {
+        ::memcpy( &inqinfo, ii, sizeof(inquiry_info) );
+    }
+    inquiry_info inqinfo;
+};
+
+OBluetoothDevice::OBluetoothDevice( QObject* parent, const char* name, void* inqinfo )
                  :QObject( parent, name )
 {
     odebug << "OBluetoothDevice::OBluetoothDevice() - '" << name << "'" << oendl;
+    d = new OBluetoothDevice::Private( (inquiry_info*) inqinfo );
 }
 
 OBluetoothDevice::~OBluetoothDevice()
 {
     odebug << "OBluetoothDevice::~OBluetoothDevice()" << oendl;
 }
 
 QString OBluetoothDevice::macAddress() const
 {
-    return "N/A";
+    return QString().sprintf( "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
+    d->inqinfo.bdaddr.b[5],
+    d->inqinfo.bdaddr.b[4],
+    d->inqinfo.bdaddr.b[3],
+    d->inqinfo.bdaddr.b[2],
+    d->inqinfo.bdaddr.b[1],
+    d->inqinfo.bdaddr.b[0] );
+}
+
+QString OBluetoothDevice::deviceClass() const
+{
+    int maj = d->inqinfo.dev_class[1] & 0x1f;
+    int min = d->inqinfo.dev_class[0] >> 2;
+
+    QString major = QString( "Unknown(%1)" ).arg( maj );
+    QString minor = QString( "Unknown(%1)" ).arg( min );
+
+    switch ( maj )
+    {
+        case 0: major = "Miscellaneous";
+        break;
+
+        case 1: major = "Computer";
+        switch ( min )
+        {
+            case 0: minor = "Uncategorized";
+            case 1: minor = "Desktop workstation";
+            case 2: minor = "Server";
+            case 3: minor = "Laptop";
+            case 4: minor = "Handheld";
+            case 5: minor = "Palm";
+            case 6: minor = "Wearable";
+        }
+        break;
+
+        case 2: major = "Phone";
+        switch ( min )
+        {
+            case 0: minor = "Uncategorized"; break;
+            case 1: minor = "Cellular"; break;
+            case 2: minor = "Cordless"; break;
+            case 3: minor = "Smart phone"; break;
+            case 4: minor = "Wired modem or voice gateway"; break;
+            case 5: minor = "Common ISDN Access"; break;
+            case 6: minor = "Sim Card Reader"; break;
+        }
+        break;
+
+        case 3: major = "LAN Access";
+        break;
+
+        case 4: major = "Audio/Video";
+        switch ( min )
+        {
+            case 0: minor = "Uncategorized"; break;
+            case 1: minor = "Device conforms to the Headset profile"; break;
+            case 2: minor = "Hands-free"; break;
+            case 3: minor = "Reserved(3)"; break;
+            case 4: minor = "Microphone"; break;
+            case 5: minor = "Loudspeaker"; break;
+            case 6: minor = "Headphones"; break;
+            case 7: minor = "Portable Audio"; break;
+            case 8: minor = "Car Audio"; break;
+            case 9: minor = "Set-top box"; break;
+            case 10: minor = "HiFi Audio Device"; break;
+            case 11: minor = "VCR"; break;
+            case 12: minor = "Video Camera"; break;
+            case 13: minor = "Camcorder"; break;
+            case 14: minor = "Video Monitor"; break;
+            case 15: minor = "Video Display and Loudspeaker"; break;
+            case 16: minor = "Video Conferencing"; break;
+            case 17: minor = "Reserved(17)"; break;
+            case 18: minor = "Gaming/Toy"; break;
+        }
+        break;
+
+        case 5: major = "Peripheral";
+        switch ( min )
+        {
+            case 16: minor = "Keyboard"; break;
+            case 32: minor = "Pointing Device"; break;
+            case 48: minor = "Keyboard and Pointing Device"; break;
+        }
+        break;
+
+        case 6: major = "Imaging";
+        if (min & 4) minor = "Display";
+        else if (min & 8) minor = "Camera";
+        else if (min & 16) minor = "Scanner";
+        else if (min & 32) minor = "Printer";
+        break;
+
+        case 63: major = "Uncategorized";
+        break;
+    }
+
+    return QString( "%1:%2" ).arg( major ).arg( minor );
 }
 
+QString OBluetoothDevice::getName()
+{
+    /* FIXME: Uahhh, this gets ugly.
+    The BlueZ kernel interface seems to be very badly (if at all) documented.
+    All people are assuming that you use libbluetooth to talk to that stack.
+    However since libbluetooth is GPL, we can't do that :/
+    Guess, we are stuck here until someone finds time and/or motivation to look
+    into that and create some easy-to-understand examples for how to talk
+    directly to the BlueZ kernel interface.
+    */
+};
+
+
 }
 }
diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h
index ee4a90d..fa3d2c1 100644
--- a/libopie2/opiebluez/obluetooth.h
+++ b/libopie2/opiebluez/obluetooth.h
@@ -37,151 +37,163 @@ 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.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class OBluetooth : public QObject
 {
   Q_OBJECT
 
   public:
     typedef QDict<OBluetoothInterface> InterfaceMap;
     typedef QDictIterator<OBluetoothInterface> InterfaceIterator;
 
   public:
     /**
      * @returns the number of available interfaces
      */
     int count() const;
     /**
      * @returns a pointer to the (one and only) @ref OBluetooth instance.
      */
     static OBluetooth* instance();
     /**
      * @returns an iterator usable for iterating through all network interfaces.
      */
     InterfaceIterator iterator() const;
     /**
      * @returns true, if the @a interface is present.
      */
     bool isPresent( const char* interface ) const;
     /**
      * @returns true, if the @a interface supports the wireless extension protocol.
      */
     bool isWirelessInterface( const char* interface ) const;
     /**
      * @returns a pointer to the @ref OBluetoothInterface object for the specified @a interface or 0, if not found.
      * @see OBluetoothInterface
      */
     OBluetoothInterface* interface( const QString& interface ) const;
     /**
      * @internal Rebuild the internal interface database
      * @note Sometimes it might be useful to call this from client code,
      * e.g. after issuing a cardctl insert
      */
     void synchronize();
 
   protected:
     OBluetooth();
 
   private:
     static OBluetooth* _instance;
     InterfaceMap _interfaces;
     class OBluetoothPrivate;
     OBluetoothPrivate *d;
     int _fd;
 };
 
 /*======================================================================================
  * OBluetoothInterface
  *======================================================================================*/
 
 /**
  * @brief An bluetooth interface wrapper.
  *
  * 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 );
     /**
      * Destructor.
      */
     virtual ~OBluetoothInterface();
     /**
-     * @return the MAC address of the interfaces
+     * @return the MAC address of the interface.
      */
     QString macAddress() const;
     /**
      * Setting an interface to up enables it to receive packets.
      */
     bool setUp( bool );
     /**
      * @returns true if the interface is up.
      */
     bool isUp() const;
     /**
-      * @returns an iterator usable for iterating through the devices in range
+      * @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 );
+    OBluetoothDevice( QObject* parent, const char* name, void* inqinfo );
     /**
      * Destructor.
      */
     virtual ~OBluetoothDevice();
     /**
-      * @returns the MAC address of the device's interface
+      * @returns the MAC address of the device's interface.
       */
     QString macAddress() const;
+    /**
+     * @returns the class of device.
+     */
+    QString deviceClass() const;
+    /**
+     * @returns the device name.
+     */
+    QString getName();
+
+  private:
+    class Private;
+    Private *d;
 };
 
 }
 }
 #endif