summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/parser.cc22
1 files changed, 10 insertions, 12 deletions
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc
index 7e95907..d20b9f3 100644
--- a/noncore/net/opietooth/lib/parser.cc
+++ b/noncore/net/opietooth/lib/parser.cc
@@ -146,47 +146,45 @@ bool Parser::parseClassId( const QString& str) {
}else{
owarn << "Else " << m_classOver << oendl;
m_classOver = false;
}
return false;
}
bool Parser::parseProtocol( const QString& str) {
if (str.startsWith("Protocol Descriptor List:") ) {
m_protocolOver = true;
m_protocolAdded = false;
return true;
+ }else if (m_protocolOver && str.startsWith(" ") ) {
+ m_protocolAdded = true;
+ QString dummy = str.stripWhiteSpace();
+ int pos = dummy.findRev(':');
+ if ( pos > -1 ) {
+ int port = dummy.mid(pos+1 ).stripWhiteSpace().toInt();
+ Services::ProtocolDescriptor desc( m_protName, m_protId, port );
+ m_item.insertProtocolDescriptor( desc );
+ }
+ return true;
}else if (m_protocolOver && str.startsWith(" ") ) { // "L2CAP" (0x0100)
- owarn << "double protocol filter" << oendl;
if (!m_protocolAdded ) { // the protocol does neither supply a channel nor port so add it now
Services::ProtocolDescriptor desc( m_protName, m_protId );
m_item.insertProtocolDescriptor( desc );
}
m_protocolAdded = false;
{ // the find function
m_protId = convert(str, m_protName );
}
return true;
- }else if (m_protocolOver && str.startsWith(" ") ) {
- owarn << "tripple protocol filter" << oendl;
- m_protocolAdded = true;
- QString dummy = str.stripWhiteSpace();
- int pos = dummy.findRev(':');
- if ( pos > -1 ) {
- int port = dummy.mid(pos+1 ).stripWhiteSpace().toInt();
- Services::ProtocolDescriptor desc( m_protName, m_protId, port );
- m_item.insertProtocolDescriptor( desc );
- }
- return true;
}else if (m_protocolOver ) {
m_protocolOver = false;
}
return false;
}
bool Parser::parseProfile( const QString& str) {
if (str.startsWith("Profile Descriptor List:") ) {
m_profOver = true;
}else if ( m_profOver && str.startsWith(" ") ) {
m_profId = convert( str, m_profName );
}else if ( m_profOver && str.startsWith(" ") ) {
// now find