author | mickeyl <mickeyl> | 2005-07-09 16:05:57 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-07-09 16:05:57 (UTC) |
commit | 9b070d84b36c5dc764b6b4a8a3ca511d2e3d441f (patch) (side-by-side diff) | |
tree | 9d42efed66329ad925f3079e2739d9a3a9ced880 /noncore/net/opietooth/lib | |
parent | 5dbfa604bcc5dd32401d862372af806bfe674e89 (diff) | |
download | opie-9b070d84b36c5dc764b6b4a8a3ca511d2e3d441f.zip opie-9b070d84b36c5dc764b6b4a8a3ca511d2e3d441f.tar.gz opie-9b070d84b36c5dc764b6b4a8a3ca511d2e3d441f.tar.bz2 |
autopopulate services list, use odebug where appropriate instead of owarn
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 53122c1..83100f1 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -10,13 +10,13 @@ using namespace Opie::Core; using namespace OpieTooth; using Opie::Core::OProcess; Manager::Manager( const QString& dev ) : QObject() { - owarn << "created" << oendl; + odebug << "Manager: created" << oendl; m_device = dev; m_hcitool = 0; m_sdp = 0; } Manager::Manager( Device* /*dev*/ ) : QObject() @@ -55,22 +55,22 @@ void Manager::isAvailable( const QString& device ){ void Manager::isAvailable( Device* /*dev*/ ){ } void Manager::searchDevices( const QString& device ){ - owarn << "search devices" << oendl; + odebug << "Manager: search devices" << oendl; OProcess* hcitool = new OProcess(); hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); *hcitool << "hcitool" << "scan"; connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) ); connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) ); if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { - owarn << "could not start" << oendl; + odebug << "Manager: could not start" << oendl; RemoteDevice::ValueList list; emit foundDevices( device, list ); delete hcitool; } } @@ -105,19 +105,19 @@ void Manager::removeServices( const QStringList& list){ removeService( (*it) ); } void Manager::searchServices( const QString& remDevice ){ OProcess *m_sdp =new OProcess(); *m_sdp << "sdptool" << "browse" << remDevice; m_sdp->setName( remDevice.latin1() ); - owarn << "search Services for " << remDevice.latin1() << oendl; + odebug << "Manager: search Services for " << remDevice.latin1() << oendl; connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) ); connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) ); if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { - owarn << "could not start sdptool" << oendl; + odebug << "Manager: could not start sdptool" << oendl; delete m_sdp; Services::ValueList list; emit foundServices( remDevice, list ); } } void Manager::searchServices( const RemoteDevice& dev){ @@ -138,91 +138,91 @@ void Manager::slotProcessExited(OProcess* proc ) { emit available( name, conn ); delete proc; } void Manager::slotSDPOut(OProcess* proc, char* ch, int len) { QCString str(ch, len+1 ); - owarn << "SDP:" << str.data() << oendl; + odebug << "Manager: SDP:" << str.data() << oendl; QMap<QString, QString>::Iterator it; it = m_out.find(proc->name() ); QString string; if ( it != m_out.end() ) { string = it.data(); } string.append( str ); m_out.replace( proc->name(), string ); } void Manager::slotSDPExited( OProcess* proc) { - owarn << "proc name " << proc->name() << oendl; + odebug << "Manager: proc name " << proc->name() << oendl; Services::ValueList list; if (proc->normalExit() ) { QMap<QString, QString>::Iterator it = m_out.find( proc->name() ); if ( it != m_out.end() ) { - owarn << "found process" << oendl; + odebug << "Manager: found process" << oendl; 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; - owarn << "parsing output" << oendl; + odebug << "Manager: parsing output" << oendl; Parser parser( out ); list = parser.services(); return list; } void Manager::slotHCIExited(OProcess* proc ) { - owarn << "process exited" << oendl; + odebug << "Manager: process exited" << oendl; RemoteDevice::ValueList list; if (proc->normalExit() ) { - owarn << "normalExit " << proc->name() << oendl; + odebug << "Manager: normalExit " << proc->name() << oendl; QMap<QString, QString>::Iterator it = m_devices.find(proc->name() ); if (it != m_devices.end() ) { - owarn << "!= end ;)" << oendl; + odebug << "Manager: != end ;)" << oendl; 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 ); - owarn << "hci: " << str.data() << oendl; + odebug << "Manager: hci: " << str.data() << oendl; QMap<QString, QString>::Iterator it; it = m_devices.find( proc->name() ); - owarn << "proc->name " << proc->name() << oendl; + odebug << "Manager: proc->name " << proc->name() << oendl; QString string; if (it != m_devices.end() ) { - owarn << "slotHCIOut " << oendl; + odebug << "Manager: slotHCIOut " << oendl; string = it.data(); } string.append( str ); m_devices.replace( proc->name(), string ); } RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { - owarn << "parseHCI " << output.latin1() << oendl; + odebug << "Manager: parseHCI " << output.latin1() << oendl; RemoteDevice::ValueList list; QStringList strList = QStringList::split('\n', output ); QStringList::Iterator it; QString str; for ( it = strList.begin(); it != strList.end(); ++it ) { str = (*it).stripWhiteSpace(); - owarn << "OpieTooth " << str.latin1() << oendl; + odebug << "Manager: OpieTooth " << str.latin1() << oendl; int pos = str.findRev(':' ); if ( pos > 0 ) { QString mac = str.left(17 ); str.remove( 0, 17 ); - owarn << "mac " << mac.latin1() << oendl; - owarn << "rest: " << str.latin1() << oendl; + odebug << "Manager: mac " << mac.latin1() << oendl; + odebug << "Manager: rest: " << str.latin1() << oendl; RemoteDevice rem( mac , str.stripWhiteSpace() ); list.append( rem ); } } return list; } @@ -241,13 +241,13 @@ void Manager::connectTo( const QString& mac) { proc << mac; proc.start(OProcess::DontCare); // the lib does not care at this point } void Manager::searchConnections() { - owarn << "searching connections?" << oendl; + odebug << "Manager: searchConnections()" << oendl; OProcess* proc = new OProcess(); m_hcitoolCon = QString::null; connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotConnectionExited( Opie::Core::OProcess*) ) ); connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), @@ -279,21 +279,21 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) { // remove the first line ( "Connections:") it = list.begin(); it = list.remove( it ); for (; it != list.end(); ++it ) { QString row = (*it).stripWhiteSpace(); QStringList value = QStringList::split(' ', row ); - owarn << "0: %s" << value[0].latin1() << oendl; - owarn << "1: %s" << value[1].latin1() << oendl; - owarn << "2: %s" << value[2].latin1() << oendl; - owarn << "3: %s" << value[3].latin1() << oendl; - owarn << "4: %s" << value[4].latin1() << oendl; - owarn << "5: %s" << value[5].latin1() << oendl; - owarn << "6: %s" << value[6].latin1() << oendl; - owarn << "7: %s" << value[7].latin1() << oendl; - owarn << "8: %s" << value[8].latin1() << oendl; + odebug << "Manager: 0: " << value[0].latin1() << oendl; + odebug << "Manager: 1: " << value[1].latin1() << oendl; + odebug << "Manager: 2: " << value[2].latin1() << oendl; + odebug << "Manager: 3: " << value[3].latin1() << oendl; + odebug << "Manager: 4: " << value[4].latin1() << oendl; + odebug << "Manager: 5: " << value[5].latin1() << oendl; + odebug << "Manager: 6: " << value[6].latin1() << oendl; + odebug << "Manager: 7: " << value[7].latin1() << oendl; + odebug << "Manager: 8: " << value[8].latin1() << oendl; ConnectionState con; con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); con.setConnectionMode( value[1] ); con.setMac( value[2] ); con.setHandle( value[4].toInt() ); con.setState( value[6].toInt() ); |