summaryrefslogtreecommitdiff
authorzecke <zecke>2002-06-28 21:22:46 (UTC)
committer zecke <zecke>2002-06-28 21:22:46 (UTC)
commit26be5facf38c25f2b22b18a19ea7fa710f5e2236 (patch) (side-by-side diff)
treedc78f9e3b27968675f25f8613e23d9d08499d0e8
parent63c022af051f205c8080040bf60a9221e691304b (diff)
downloadopie-26be5facf38c25f2b22b18a19ea7fa710f5e2236.zip
opie-26be5facf38c25f2b22b18a19ea7fa710f5e2236.tar.gz
opie-26be5facf38c25f2b22b18a19ea7fa710f5e2236.tar.bz2
update the parser
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
@@ -236,7 +236,7 @@ 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
}
@@ -259,7 +259,7 @@ void Manager::searchConnections() {
delete proc;
}
}
-void Manager::slotConnectionExited( OProcess* proc ) {
+void Manager::slotConnectionExited( OProcess* /*proc*/ ) {
qWarning("exited");
Connection::ValueList list;
list = parseConnections( m_hcitoolCon );
@@ -286,6 +286,14 @@ Connection::ValueList Manager::parseConnections( const QString& out ) {
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;
}