summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc22
-rw-r--r--noncore/net/opietooth/lib/parser.cc90
-rw-r--r--noncore/net/opietooth/lib/parser.h3
-rw-r--r--noncore/net/opietooth/lib/services.cc66
-rw-r--r--noncore/net/opietooth/lib/services.h15
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,5 +1,8 @@
+
+
#include <opie/oprocess.h>
+#include "parser.h"
#include "manager.h"
@@ -13,7 +16,7 @@ Manager::Manager( const QString& dev )
m_hcitool = 0;
m_sdp = 0;
}
-Manager::Manager( Device* dev )
+Manager::Manager( Device* /*dev*/ )
: QObject()
{
m_hcitool = 0;
@@ -32,7 +35,7 @@ Manager::~Manager(){
void Manager::setDevice( const QString& dev ){
m_device = dev;
}
-void Manager::setDevice( Device* dev ){
+void Manager::setDevice( Device* /*dev*/ ){
}
void Manager::isAvailable( const QString& device ){
@@ -47,7 +50,8 @@ void Manager::isAvailable( const QString& device ){
}
}
-void Manager::isAvailable( Device* dev ){
+
+void Manager::isAvailable( Device* /*dev*/ ){
}
@@ -68,7 +72,7 @@ void Manager::searchDevices( const QString& device ){
}
}
-void Manager::searchDevices(Device* d ){
+void Manager::searchDevices(Device* /*d*/ ){
}
@@ -115,11 +119,11 @@ void Manager::searchServices( const QString& remDevice ){
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 ) {
bool conn= false;
@@ -157,6 +161,8 @@ 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
@@ -5,6 +5,34 @@
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 );
}
@@ -28,6 +56,7 @@ void Parser::parse( const QString& string) {
m_list.append( m_item );
Services serv;
m_item = serv;
+ m_complete = true;
continue;
}
}
@@ -37,6 +66,10 @@ void Parser::parse( const QString& string) {
if (parseProtocol( (*it) ) ) ;//continue;
if (parseProfile( (*it) ) ) ;//continue;
}
+ // missed the last one
+ if (m_complete) {
+ m_list.append(m_item );
+ }
}
bool Parser::parseName( const QString& str) {
if (str.startsWith("Service Name:") ) {
@@ -67,19 +100,18 @@ bool Parser::parseClassId( const QString& str) {
}else if ( m_classOver ) { // ok now are the informations in place
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
m_classOver = true;
@@ -91,23 +123,51 @@ bool Parser::parseProtocol( const QString& str) {
m_protocolAdded = false;
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 );
m_item.insertProtocolDescriptor( desc );
}
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 ) {
m_protocolOver = false;
}
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
@@ -23,10 +23,13 @@ namespace OpieTooth {
bool m_complete:1;
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
@@ -105,64 +105,78 @@ 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
@@ -63,7 +63,7 @@ namespace OpieTooth {
/**
* operator==
*/
- friend bool operator==(const ProfileDescriptor&, const ProfileDescriptor& );
+// friend bool operator==(const ProfileDescriptor&, const ProfileDescriptor& );
private:
QString m_id;
int m_idInt;
@@ -94,8 +94,8 @@ namespace OpieTooth {
int port()const;
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;
int m_number;
@@ -131,8 +131,13 @@ namespace OpieTooth {
void removeProfileDescriptor(const ProfileDescriptor& );
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;
};
};
#endif