summaryrefslogtreecommitdiff
authorzecke <zecke>2002-06-15 22:06:57 (UTC)
committer zecke <zecke>2002-06-15 22:06:57 (UTC)
commitac6c5de1e7a15b4ca5bdf226a9eeceffb82aea94 (patch) (side-by-side diff)
tree256f0b9d270972b30961bfae5529ab0de7fed9d6
parent9d02762b3d2e07f6db24c21621a5d577ea6acda7 (diff)
downloadopie-ac6c5de1e7a15b4ca5bdf226a9eeceffb82aea94.zip
opie-ac6c5de1e7a15b4ca5bdf226a9eeceffb82aea94.tar.gz
opie-ac6c5de1e7a15b4ca5bdf226a9eeceffb82aea94.tar.bz2
Fix the manager to find devices
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc37
1 files changed, 27 insertions, 10 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index d65dbd4..40c1f0a 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -5,12 +5,13 @@
using namespace OpieTooth;
Manager::Manager( const QString& dev )
: QObject()
{
+ qWarning("created");
m_device = dev;
m_hcitool = 0;
m_sdp = 0;
}
Manager::Manager( Device* dev )
: QObject()
@@ -48,20 +49,22 @@ void Manager::isConnected( const QString& device ){
}
void Manager::isConnected( Device* dev ){
}
void Manager::searchDevices( const QString& device ){
+ qWarning("search devices");
OProcess* hcitool = new OProcess();
- hcitool->setName( device.latin1() );
+ hcitool->setName( device.isEmpty() ? "hci0" : 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() ) {
+ if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
+ qWarning("could not start");
RemoteDevices::ValueList list;
emit foundDevices( device, list );
delete hcitool;
}
}
@@ -100,13 +103,13 @@ void Manager::searchServices( const QString& remDevice ){
*m_sdp << "sdptool" << "browse" << remDevice;
m_sdp->setName( remDevice.latin1() );
connect(m_sdp, SIGNAL(processExited(OProcess*) ),
this, SLOT(slotSDPExited(OProcess* ) ) );
connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ),
this, SLOT(slotSDPOut(OProcess*, char*, int) ) );
- if (!m_sdp->start() ) {
+ if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
delete m_sdp;
Services::ValueList list;
emit foundServices( remDevice, list );
}
}
void Manager::searchServices( const RemoteDevices& dev){
@@ -155,42 +158,56 @@ void Manager::slotSDPExited( OProcess* proc)
Services::ValueList Manager::parseSDPOutput( const QString& out ) {
Services::ValueList list;
return list;
}
void Manager::slotHCIExited(OProcess* proc ) {
+ qWarning("process exited");
RemoteDevices::ValueList list;
if (proc->normalExit() ) {
+ qWarning("normalExit %s", proc->name() );
QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
if (it != m_devices.end() ) {
+ qWarning("!= 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 );
+ qWarning("hci: %s", str.data() );
QMap<QString, QString>::Iterator it;
it = m_devices.find( proc->name() );
+ qWarning("proc->name %s", proc->name() );
+ QString string;
if (it != m_devices.end() ) {
- QString string = it.data();
- string.append( str );
- m_devices.replace( proc->name(), string );
+ qWarning("slotHCIOut ");
+ string = it.data();
}
+ string.append( str );
+
+ m_devices.replace( proc->name(), string );
}
RemoteDevices::ValueList Manager::parseHCIOutput(const QString& output ) {
+ qWarning("parseHCI %s", output.latin1() );
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 );
+ int pos = str.findRev(':' );
+ if ( pos > 0 ) {
+ QString mac = str.left(17 );
+ str.remove( 0, 17 );
+ qWarning("mac %s", mac.latin1() );
+ qWarning("rest:%s", str.latin1() );
+ RemoteDevices rem( mac , str.stripWhiteSpace() );
+ list.append( rem );
+ }
}
return list;
}