-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 65 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.h | 18 |
2 files changed, 83 insertions, 0 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 23506b3..2234333 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -219,8 +219,73 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { qWarning("mac %s", mac.latin1() ); qWarning("rest:%s", str.latin1() ); RemoteDevice rem( mac , str.stripWhiteSpace() ); list.append( rem ); } } return list; } + +////// hcitool cc and hcitool con + +/** + * Create it on the stack as don't care + * so we don't need to care for it + * cause hcitool gets reparented + */ +void Manager::connectTo( const QString& mac) { + OProcess proc; + proc << "hcitool"; + proc << "cc"; + proc << "mac"; + proc.start(OProcess::DontCare); // the lib does not care at this point +} + + +void Manager::searchConnections() { + qWarning("searching connections?"); + OProcess* proc = new OProcess(); + m_hcitoolCon = QString::null; + + connect(proc, SIGNAL(processExited(OProcess*) ), + this, SLOT(slotConnectionExited( OProcess*) ) ); + connect(proc, SIGNAL(receivedStdout(OProcess*, char*, int) ), + this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) ); + *proc << "hcitool"; + *proc << "con"; + + if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { + Connection::ValueList list; + emit connections( list ); + delete proc; + } +} +void Manager::slotConnectionExited( OProcess* proc ) { + qWarning("exited"); + Connection::ValueList list; + list = parseConnections( m_hcitoolCon ); + emit connections(list ); +} +void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) { + QCString str(cha, len ); + m_hcitoolCon.append( str ); + delete proc; +} +Connection::ValueList Manager::parseConnections( const QString& out ) { + Connection::ValueList list2; + QStringList list = QStringList::split('\n', out ); + QStringList::Iterator it; + for (it = list.begin(); it != list.end(); ++it ) { + QString row = (*it).stripWhiteSpace(); + QStringList value = QStringList::split(' ', row ); + qWarning("0: %s", value[0].latin1() ); + qWarning("1: %s", value[1].latin1() ); + qWarning("2: %s", value[2].latin1() ); + qWarning("3: %s", value[3].latin1() ); + qWarning("4: %s", value[4].latin1() ); + qWarning("5: %s", value[5].latin1() ); + qWarning("6: %s", value[6].latin1() ); + qWarning("7: %s", value[7].latin1() ); + qWarning("8: %s", value[8].latin1() ); + } + return list2; +} diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h index 2589e9b..b32327c 100644 --- a/noncore/net/opietooth/lib/manager.h +++ b/noncore/net/opietooth/lib/manager.h @@ -2,16 +2,17 @@ #ifndef OpieToothManager_H #define OpieToothManager_H #include <qobject.h> #include <qstring.h> #include <qmap.h> #include <qvaluelist.h> +#include "connection.h" #include "remotedevice.h" #include "services.h" class OProcess; namespace OpieTooth { class Device; /** Manager manages a blueZ device (hci0 for example) * without Manager you can control the things you @@ -104,18 +105,34 @@ namespace OpieTooth { * */ void searchServices( const QString& remDevice ); /** * search for services on a remote device */ void searchServices( const RemoteDevice& ); + + /** + * Starts to connect to the device + * in @param + */ + void connectTo(const QString& ); + + /** + * Searches for active connections + * the result is emitted with the + * connections signal + */ + void searchConnections(); + +//// not implemented yet /*static*/ QString toDevice( const QString& mac ); /*static*/ QString toMac( const QString &device ); +//// not implemented yet over signals: // device either mac or dev name // the first device is the device which you access void available( const QString& device, bool connected ); void addedService( const QString& service, bool added ); void removedService( const QString& service, bool removed ); void foundServices( const QString& device, Services::ValueList ); @@ -131,16 +148,17 @@ private slots: void slotHCIExited(OProcess* ); void slotHCIOut(OProcess*, char*, int ); void slotConnectionExited(OProcess* ); void slotConnectionOutput(OProcess*, char*, int ); private: Services::ValueList parseSDPOutput( const QString& ); RemoteDevice::ValueList parseHCIOutput( const QString& ); + Connection::ValueList parseConnections( const QString& ); OProcess *m_hcitool; OProcess *m_sdp; // not only one QString m_device; QMap<QString, QString> m_out; QMap<QString, QString> m_devices; QString m_hcitoolCon; }; }; |