- add bool OBluetoothInterface::setUp( bool )

- add void OBluetoothInterface::isUp() const

2 files changed, 46 insertions, 7 deletions

diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp
index b5df96e..c99a822 100644
--- a/libopie2/opiebluez/obluetooth.cpp
+++ b/libopie2/opiebluez/obluetooth.cpp
@@ -43,121 +43,152 @@ using namespace Opie::Core;
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
 namespace Opie {
 namespace Bluez {
 
 /*======================================================================================
  * OBluetooth
  *======================================================================================*/
 
 OBluetooth* OBluetooth::_instance = 0;
 
 OBluetooth::OBluetooth()
 {
     synchronize();
 }
 
 OBluetooth* OBluetooth::instance()
 {
     if ( !_instance ) _instance = new OBluetooth();
     return _instance;
 }
 
 OBluetooth::InterfaceIterator OBluetooth::iterator() const
 {
     return OBluetooth::InterfaceIterator( _interfaces );
 }
 
 int OBluetooth::count() const
 {
     return _interfaces.count();
 }
 
 OBluetoothInterface* OBluetooth::interface( const QString& iface ) const
 {
     return _interfaces[iface];
 }
 
 void OBluetooth::synchronize()
 {
     odebug << "OBluetooth::synchronize() - gathering available HCI devices" << oendl;
     _interfaces.clear();
 
     _fd = ::socket( AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI );
     if ( _fd == -1 )
     {
         owarn << "OBluetooth::synchronize() - can't open HCI control socket (" << strerror( errno ) << ")" << oendl;
         return;
     }
 
     struct hci_dev_list_req *dl;
     struct hci_dev_req *dr;
     struct hci_dev_info di;
 
     if (!(dl = (struct hci_dev_list_req*)malloc(HCI_MAX_DEV * sizeof(struct hci_dev_req) + sizeof(uint16_t))))
     {
         ofatal << "OBluetooth::synchronize() - can't allocate memory for HCI request" << oendl;
         return;
     }
 
     dl->dev_num = HCI_MAX_DEV;
     dr = dl->dev_req;
 
-    if (ioctl( _fd, HCIGETDEVLIST, (void *) dl) == -1)
+    if (::ioctl( _fd, HCIGETDEVLIST, (void *) dl) == -1)
     {
         owarn << "OBluetooth::synchronize() - can't complete HCIGETDEVLIST (" << strerror( errno ) << ")" << oendl;
         return;
     }
 
     for ( int i = 0; i < dl->dev_num; ++i )
     {
         di.dev_id = ( dr + i )->dev_id;
-        if ( ioctl( _fd, HCIGETDEVINFO, (void *) &di) == -1 )
+        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 ) );
+        _interfaces.insert( di.name, new OBluetoothInterface( this, di.name, (void*) &di, _fd ) );
     }
 }
 
 /*======================================================================================
  * OBluetoothInterface
  *======================================================================================*/
 
 class OBluetoothInterface::Private
 {
   public:
-    Private( struct hci_dev_info* di )
+    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 )
+OBluetoothInterface::OBluetoothInterface( QObject* parent, const char* name, void* devinfo, int ctlfd )
                     :QObject( parent, name )
 {
-    d = new OBluetoothInterface::Private( (struct hci_dev_info*) devinfo );
+    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 );
+}
+
 }
 }
 
diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h
index 10c8c49..4423a55 100644
--- a/libopie2/opiebluez/obluetooth.h
+++ b/libopie2/opiebluez/obluetooth.h
@@ -57,85 +57,93 @@ class OBluetooth : public QObject
     /**
      * @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 an infrared interface. 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
 {
   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 );
+    OBluetoothInterface( QObject* parent, const char* name, void* devinfo, int ctlfd );
     /**
      * Destructor.
      */
     virtual ~OBluetoothInterface();
     /**
      * @return the MAC address of the interfaces
      */
     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;
 
   private:
     class Private;
     Private *d;
 };
 
 
 
 }
 }
 #endif