5 files changed, 142 insertions, 54 deletions

diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index fcd21f6..177c94e 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -1,4 +1,7 @@
+
+
 #include <opie/oprocess.h>
 
+#include "parser.h"
 #include "manager.h"
 
@@ -14,5 +17,5 @@ Manager::Manager( const QString& dev )
     m_sdp = 0;
 }
-Manager::Manager( Device* dev )
+Manager::Manager( Device* /*dev*/ )
   : QObject()
 {
@@ -33,5 +36,5 @@ void Manager::setDevice( const QString& dev ){
     m_device = dev;
 }
-void Manager::setDevice( Device* dev ){
+void Manager::setDevice( Device* /*dev*/ ){
 
 }
@@ -48,5 +51,6 @@ void Manager::isAvailable( const QString& device ){
 
 }
-void Manager::isAvailable( Device* dev ){
+
+void Manager::isAvailable( Device* /*dev*/ ){
 
 
@@ -69,5 +73,5 @@ void Manager::searchDevices( const QString& device ){
 }
 
-void Manager::searchDevices(Device* d ){
+void Manager::searchDevices(Device* /*d*/ ){
 
 
@@ -116,9 +120,9 @@ void Manager::searchServices( const RemoteDevice& dev){
     searchServices( dev.mac() );
 }
-QString Manager::toDevice( const QString& mac ){
-
+QString Manager::toDevice( const QString& /*mac*/ ){
+    return QString::null;
 }
-QString Manager::toMac( const QString &device ){
-
+QString Manager::toMac( const QString &/*device*/ ){
+    return QString::null;
 }
 void Manager::slotProcessExited(OProcess* proc ) {
@@ -158,4 +162,6 @@ void Manager::slotSDPExited( OProcess* proc)
 Services::ValueList Manager::parseSDPOutput( const QString& out ) {
     Services::ValueList list;
+    Parser parser( out );
+    list = parser.services();
     return list;
 }
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc
index 452917b..18d534e 100644
--- a/noncore/net/opietooth/lib/parser.cc
+++ b/noncore/net/opietooth/lib/parser.cc
@@ -6,4 +6,32 @@
 using namespace OpieTooth;
 
+namespace {
+
+
+    // "Test Foo Bar" (0x3456)
+    // @param ret Test Foo Bar
+    // @eturn 13398
+    // tactic find " (
+int convert( const QString& line, QString& ret ) {
+    ret = QString::null;
+    int i = 0;
+    int pos = line.findRev("\" (");
+    if ( pos > 0 ) { // it shouldn't be at pos 0
+        ret = line.left(pos-1 ).stripWhiteSpace();
+        qWarning("ret: %s",  ret.latin1() );
+        ret = ret.replace(QRegExp("[\"]"), "");
+        qWarning("ret: %s", ret.latin1() );
+        QString dummy = line.mid(pos + 4 );
+        qWarning("dummy: %s",  dummy.latin1() );
+        dummy = dummy.remove( dummy.length() -1, 1 ); // remove the (
+        bool ok;
+        i = dummy.toInt(&ok, 16 );
+    }
+    return i;
+}
+
+};
+
+
 Parser::Parser(const QString& output ) {
     parse( output );
@@ -29,4 +57,5 @@ void Parser::parse( const QString& string) {
                 Services serv;
                 m_item = serv;
+                m_complete = true;
                 continue;
             }
@@ -38,4 +67,8 @@ void Parser::parse( const QString& string) {
         if (parseProfile(   (*it) ) ) ;//continue;
     }
+    // missed the last one
+    if (m_complete) {
+        m_list.append(m_item );
+    }
 }
 bool Parser::parseName( const QString& str) {
@@ -68,17 +101,16 @@ bool Parser::parseClassId( const QString& str) {
 
         m_classOver = false;
-        QStringList list = QStringList::split('\n', str.stripWhiteSpace() );
-
-        if ( list.count() == 2 ) {
-            m_item.setClassIdList( list[0] );
-            // now let's parse the number (0x1105)
-            QString classId= list[1];
-            int classIdInt;
-            qWarning("%s",  list[1].latin1() );
-            classId = classId.remove(0, 3 );
-            classId = classId.remove( classId.length()-1, 1 );
-            qWarning("%s", classId.latin1() );
-            m_item.setClassIdList( classId.toInt(&m_ok, 16 ) );
-        }
+
+        // "Obex Object Push" (0x1105)
+        //  find backwards the " and the from 0 to pos and the mid pos+1
+        // then stripWhiteSpace add name replace '"' with ""
+        // and then convert 0x1105 toInt()
+        QString classes;
+        int ids;
+        ids = convert( str, classes );
+        qWarning("ids %d", ids );
+        m_item.setClassIdList( classes );
+        m_item.setClassIdList( ids );
+
         return true;
     }else
@@ -92,6 +124,7 @@ bool Parser::parseProtocol( const QString& str) {
         return true;
 
-    }else if (m_protocolOver && str.startsWith("  ") ) {
+    }else if (m_protocolOver && str.startsWith("  ") ) { // "L2CAP" (0x0100)
         qWarning("double protocol filter");
+
         if (!m_protocolAdded ) { // the protocol does neither supply a channel nor port so add it now
             Services::ProtocolDescriptor desc(  m_protName,  m_protId );
@@ -99,8 +132,18 @@ bool Parser::parseProtocol( const QString& str) {
         }
         m_protocolAdded = false;
+        { // the find function
+            m_protId = convert(str, m_protName );
+        }
         return true;
     }else if (m_protocolOver && str.startsWith("   ") ) {
         qWarning("tripple protocol filter");
         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 ) {
@@ -109,5 +152,22 @@ bool Parser::parseProtocol( const QString& str) {
     return false;
 }
-bool Parser::parseProfile( const QString& ) {
+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
+        int pos = str.findRev(':');
+        if ( pos > 0 ) {
+            int dummy = str.mid(pos+1 ).stripWhiteSpace().toInt();
+            qWarning("dummyInt:%d",  dummy );
+            Services::ProfileDescriptor desc( m_profName, m_profId, dummy );
+            m_item.insertProfileDescriptor(desc);
+        }
+    }else
+        m_profOver = false;
+
+
     return false;
 }
diff --git a/noncore/net/opietooth/lib/parser.h b/noncore/net/opietooth/lib/parser.h
index 7642ac3..520a725 100644
--- a/noncore/net/opietooth/lib/parser.h
+++ b/noncore/net/opietooth/lib/parser.h
@@ -24,8 +24,11 @@ namespace OpieTooth {
         bool m_ok;
         bool m_classOver:1;
+        bool m_profOver:1;
         bool m_protocolOver:1;
         bool m_protocolAdded:1;
         QString m_protName;
         int m_protId;
+        QString m_profName;
+        int m_profId;
     };
 };
diff --git a/noncore/net/opietooth/lib/services.cc b/noncore/net/opietooth/lib/services.cc
index d91e4a1..93ee70a 100644
--- a/noncore/net/opietooth/lib/services.cc
+++ b/noncore/net/opietooth/lib/services.cc
@@ -106,63 +106,77 @@ Services::Services(){
 }
 Services::Services(const Services& service ){
-
+    (*this) = service;
 }
 Services::~Services(){
 
 }
-Services &Services::operator=( const Services& ){
+Services &Services::operator=( const Services& ser){
+    m_name =  ser.m_name;
+    m_recHandle = ser.m_recHandle;
+    m_classList = ser.m_classList;
+    m_classId = ser.m_classId;
+    m_protocols = ser.m_protocols;
+    m_profiles = ser.m_profiles;
   return *this;
 }
-bool operator==( const Services&,
-                 const Services& ){
+bool operator==( const Services& one,
+                 const Services& two){
+    if ( ( one.recHandle() == two.recHandle() ) &&
+         ( one.classIdListInt() == two.classIdListInt() ) &&
+         ( one.serviceName() == two.serviceName() ) &&
+         ( one.classIdList() == two.classIdList() ) &&
+         ( one.protocolDescriptorList() == two.protocolDescriptorList() ) &&
+         ( one.profileDescriptor() == two.profileDescriptor() ) )
+        return true;
   return false;
 }
 QString Services::serviceName() const{
-
+    return m_name;
 }
 void Services::setServiceName( const QString& service ){
-
+    m_name = service;
 }
 int Services::recHandle() const{
-
+    return m_recHandle;
 }
-void Services::setRecHandle( int ){
-
+void Services::setRecHandle( int handle){
+    m_recHandle = handle;
 }
 QString Services::classIdList() const{
-
+    return m_classList;
 }
-void Services::setClassIdList( const QString& ){
-
+void Services::setClassIdList( const QString& str){
+    m_classList = str;
 }
 int Services::classIdListInt() const{
-
+    return m_classId;
 }
-void Services::setClassIdList(int ){
-
+void Services::setClassIdList(int id){
+    m_classId = id;
 }
-void Services::insertProtocolDescriptor( const ProtocolDescriptor& ){
-
+void Services::insertProtocolDescriptor( const ProtocolDescriptor& prot){
+    m_protocols.append( prot );
 }
 void Services::clearProtocolDescriptorList(){
-
+    m_protocols.clear();
 }
-void Services::removeProtocolDescriptor( const ProtocolDescriptor& ){
-
+void Services::removeProtocolDescriptor( const ProtocolDescriptor& prot){
+    m_protocols.remove( prot );
 }
 Services::ProtocolDescriptor::ValueList Services::protocolDescriptorList()const{
-
+    return m_protocols;
 }
 
-void Services::insertProfileDescriptor( const ProfileDescriptor& ){
 
+void Services::insertProfileDescriptor( const ProfileDescriptor& prof){
+    m_profiles.append( prof );
 }
 void Services::clearProfileDescriptorList(){
-
+    m_profiles.clear();
 }
-void Services::removeProfileDescriptor( const ProfileDescriptor& ){
-
+void Services::removeProfileDescriptor( const ProfileDescriptor& prof){
+    m_profiles.remove(prof );
 }
 Services::ProfileDescriptor::ValueList Services::profileDescriptor() const{
-
+    return m_profiles;
 }
diff --git a/noncore/net/opietooth/lib/services.h b/noncore/net/opietooth/lib/services.h
index 65de049..881d383 100644
--- a/noncore/net/opietooth/lib/services.h
+++ b/noncore/net/opietooth/lib/services.h
@@ -64,5 +64,5 @@ namespace OpieTooth {
        * operator==
        */
-      friend bool operator==(const ProfileDescriptor&, const ProfileDescriptor& );
+//      friend bool operator==(const ProfileDescriptor&, const ProfileDescriptor& );
     private:
       QString m_id;
@@ -95,6 +95,6 @@ namespace OpieTooth {
       void setPort(int );
       ProtocolDescriptor &operator=( const ProtocolDescriptor& );
-      friend bool operator==( const ProtocolDescriptor&,
-                              const ProtocolDescriptor& );
+        //friend bool operator==( const ProtocolDescriptor&,
+                //      const ProtocolDescriptor& );
     private:
       QString m_name;
@@ -132,6 +132,11 @@ namespace OpieTooth {
     ProfileDescriptor::ValueList profileDescriptor()const;
 
-
-
+  private:
+      QString m_name;
+      int m_recHandle;
+      QString m_classList;
+      int m_classId;
+      QValueList<ProfileDescriptor> m_profiles;
+      QValueList<ProtocolDescriptor> m_protocols;
   };
 };