summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 2234333..e07f9da 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -233,13 +233,13 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
* cause hcitool gets reparented
*/
void Manager::connectTo( const QString& mac) {
OProcess proc;
proc << "hcitool";
proc << "cc";
- proc << "mac";
+ proc << mac;
proc.start(OProcess::DontCare); // the lib does not care at this point
}
void Manager::searchConnections() {
qWarning("searching connections?");
@@ -256,13 +256,13 @@ void Manager::searchConnections() {
if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
Connection::ValueList list;
emit connections( list );
delete proc;
}
}
-void Manager::slotConnectionExited( OProcess* 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) {
@@ -283,9 +283,17 @@ Connection::ValueList Manager::parseConnections( const QString& out ) {
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() );
+ Connection 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() );
+ con.setLinkMode( value[8] == QString::fromLatin1("MASTER") ? Master : Client );
+ list2.append( con );
}
return list2;
}