summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc64
-rw-r--r--noncore/net/opietooth/lib/manager.h7
2 files changed, 69 insertions, 2 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index eeeab19..d65dbd4 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -30,49 +30,60 @@ Manager::~Manager(){
}
void Manager::setDevice( const QString& dev ){
m_device = dev;
}
void Manager::setDevice( Device* dev ){
}
void Manager::isConnected( const QString& device ){
OProcess* l2ping = new OProcess();
l2ping->setName( device.latin1() );
*l2ping << "l2ping" << "-c1" << device;
connect(l2ping, SIGNAL(processExited(OProcess* ) ),
this, SLOT(slotProcessExited(OProcess*) ) );
if (!l2ping->start() ) {
emit connected( device, false );
delete l2ping;
}
}
void Manager::isConnected( Device* dev ){
}
void Manager::searchDevices( const QString& device ){
-
+ OProcess* hcitool = new OProcess();
+ hcitool->setName( device.latin1() );
+ *hcitool << "hcitool" << "scan";
+ connect( hcitool, SIGNAL(processExited(OProcess*) ) ,
+ this, SLOT(slotHCIExited(OProcess* ) ) );
+ connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ),
+ this, SLOT(slotHCIOut(OProcess*, char*, int ) ) );
+ if (!hcitool->start() ) {
+ RemoteDevices::ValueList list;
+ emit foundDevices( device, list );
+ delete hcitool;
+ }
}
void Manager::searchDevices(Device* d ){
}
void Manager::addService(const QString& name ){
OProcess proc;
proc << "sdptool" << "add" << name;
bool bo = true;
if (!proc.start(OProcess::DontCare ) )
bo = false;
emit addedService( name, bo );
}
void Manager::addServices(const QStringList& list){
QStringList::ConstIterator it;
for (it = list.begin(); it != list.end(); ++it )
addService( (*it) );
}
void Manager::removeService( const QString& name ){
OProcess prc;
prc << "sdptool" << "del" << name;
bool bo = true;
if (!prc.start(OProcess::DontCare ) )
@@ -109,26 +120,77 @@ QString Manager::toMac( const QString &device ){
}
void Manager::slotProcessExited(OProcess* proc ) {
bool conn= false;
if (proc->normalExit() && proc->exitStatus() == 0 )
conn = true;
QString name = QString::fromLatin1(proc->name() );
emit connected( name, conn );
delete proc;
}
void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
{
QCString str(ch, len+1 );
QMap<QString, QString>::Iterator it;
it = m_out.find(proc->name() );
if ( it != m_out.end() ) {
QString string = it.data();
string.append( str );
m_out.replace( proc->name(), string );
}
}
void Manager::slotSDPExited( OProcess* proc)
{
+ Services::ValueList list;
+ if (proc->normalExit() ) {
+ QMap<QString, QString>::Iterator it = m_out.find( proc->name() );
+ if ( it != m_out.end() ) {
+ list = parseSDPOutput( it.data() );
+ m_out.remove( it );
+ }
+ }
+ emit foundServices( proc->name(), list );
+ delete proc;
+}
+Services::ValueList Manager::parseSDPOutput( const QString& out ) {
+ Services::ValueList list;
+ return list;
+}
+
+void Manager::slotHCIExited(OProcess* proc ) {
+ RemoteDevices::ValueList list;
+ if (proc->normalExit() ) {
+ QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
+ if (it != m_devices.end() ) {
+ list = parseHCIOutput( it.data() );
+ m_devices.remove( it );
+ }
+ }
+ emit foundDevices( proc->name(), list );
delete proc;
}
+void Manager::slotHCIOut(OProcess* proc, char* ch, int len) {
+ QCString str( ch, len+1 );
+ QMap<QString, QString>::Iterator it;
+ it = m_devices.find( proc->name() );
+ if (it != m_devices.end() ) {
+ QString string = it.data();
+ string.append( str );
+ m_devices.replace( proc->name(), string );
+ }
+}
+RemoteDevices::ValueList Manager::parseHCIOutput(const QString& output ) {
+ RemoteDevices::ValueList list;
+ QStringList strList = QStringList::split('\n', output );
+ QStringList::Iterator it;
+ QString str;
+ for ( it = strList.begin(); it != strList.end(); ++it ) {
+ str = (*it).stripWhiteSpace();
+ qWarning("OpieTooth %s", str.latin1() );
+ QStringList split = QStringList::split(" ", str );
+ qWarning("Left:%s Right:%s", split[0].latin1() , split[1].latin1() );
+ RemoteDevices rem( split[0].latin1() , split[1].latin1() );
+ list.append( rem );
+ }
+ return list;
+}
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h
index 03375c5..95e4306 100644
--- a/noncore/net/opietooth/lib/manager.h
+++ b/noncore/net/opietooth/lib/manager.h
@@ -89,38 +89,43 @@ Q_OBJECT
* Removes a list from the sdpd
*/
void removeServices(const QStringList& );
/**
* search for services on a remote device
*
*/
void searchServices( const QString& remDevice );
/**
* search for services on a remote device
*/
void searchServices( const RemoteDevices& );
/*static*/ QString toDevice( const QString& mac );
/*static*/ QString toMac( const QString &device );
signals:
// device either mac or dev name
// the first device is the device which you access
void connected( 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 );
void foundDevices( const QString& device, RemoteDevices::ValueList );
- void foundNothing( const QString& device );
+
private slots:
void slotProcessExited(OProcess* );
void slotSDPExited(OProcess*);
void slotSDPOut(OProcess*, char*, int);
+ void slotHCIExited(OProcess* );
+ void slotHCIOut(OProcess*, char*, int );
private:
+ Services::ValueList parseSDPOutput( const QString& );
+ RemoteDevices::ValueList parseHCIOutput( const QString& );
OProcess *m_hcitool;
OProcess *m_sdp; // not only one
QString m_device;
QMap<QString, QString> m_out;
+ QMap<QString, QString> m_devices;
};
};
#endif