-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 13 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/parser.cc | 49 |
2 files changed, 46 insertions, 16 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 177c94e..23506b3 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -101,21 +101,23 @@ void Manager::removeServices( const QStringList& list){ | |||
101 | QStringList::ConstIterator it; | 101 | QStringList::ConstIterator it; |
102 | for (it = list.begin(); it != list.end(); ++it ) | 102 | for (it = list.begin(); it != list.end(); ++it ) |
103 | removeService( (*it) ); | 103 | removeService( (*it) ); |
104 | } | 104 | } |
105 | void Manager::searchServices( const QString& remDevice ){ | 105 | void Manager::searchServices( const QString& remDevice ){ |
106 | OProcess *m_sdp =new OProcess(); | 106 | OProcess *m_sdp =new OProcess(); |
107 | *m_sdp << "sdptool" << "browse" << remDevice; | 107 | *m_sdp << "sdptool" << "browse" << remDevice; |
108 | m_sdp->setName( remDevice.latin1() ); | 108 | m_sdp->setName( remDevice.latin1() ); |
109 | qWarning("search Services for %s", remDevice.latin1() ); | ||
109 | connect(m_sdp, SIGNAL(processExited(OProcess*) ), | 110 | connect(m_sdp, SIGNAL(processExited(OProcess*) ), |
110 | this, SLOT(slotSDPExited(OProcess* ) ) ); | 111 | this, SLOT(slotSDPExited(OProcess* ) ) ); |
111 | connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | 112 | connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ), |
112 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); | 113 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); |
113 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 114 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
115 | qWarning("could not start sdptool" ); | ||
114 | delete m_sdp; | 116 | delete m_sdp; |
115 | Services::ValueList list; | 117 | Services::ValueList list; |
116 | emit foundServices( remDevice, list ); | 118 | emit foundServices( remDevice, list ); |
117 | } | 119 | } |
118 | } | 120 | } |
119 | void Manager::searchServices( const RemoteDevice& dev){ | 121 | void Manager::searchServices( const RemoteDevice& dev){ |
120 | searchServices( dev.mac() ); | 122 | searchServices( dev.mac() ); |
121 | } | 123 | } |
@@ -132,40 +134,45 @@ void Manager::slotProcessExited(OProcess* proc ) { | |||
132 | 134 | ||
133 | QString name = QString::fromLatin1(proc->name() ); | 135 | QString name = QString::fromLatin1(proc->name() ); |
134 | emit available( name, conn ); | 136 | emit available( name, conn ); |
135 | delete proc; | 137 | delete proc; |
136 | } | 138 | } |
137 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) | 139 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) |
138 | { | 140 | { |
139 | QCString str(ch, len+1 ); | 141 | QCString str(ch, len+1 ); |
142 | qWarning("SDP:%s", str.data() ); | ||
140 | QMap<QString, QString>::Iterator it; | 143 | QMap<QString, QString>::Iterator it; |
141 | it = m_out.find(proc->name() ); | 144 | it = m_out.find(proc->name() ); |
145 | QString string; | ||
142 | if ( it != m_out.end() ) { | 146 | if ( it != m_out.end() ) { |
143 | QString string = it.data(); | 147 | string = it.data(); |
144 | string.append( str ); | ||
145 | m_out.replace( proc->name(), string ); | ||
146 | } | 148 | } |
149 | string.append( str ); | ||
150 | m_out.replace( proc->name(), string ); | ||
147 | 151 | ||
148 | } | 152 | } |
149 | void Manager::slotSDPExited( OProcess* proc) | 153 | void Manager::slotSDPExited( OProcess* proc) |
150 | { | 154 | { |
155 | qWarning("proc name %s", proc->name() ); | ||
151 | Services::ValueList list; | 156 | Services::ValueList list; |
152 | if (proc->normalExit() ) { | 157 | if (proc->normalExit() ) { |
153 | QMap<QString, QString>::Iterator it = m_out.find( proc->name() ); | 158 | QMap<QString, QString>::Iterator it = m_out.find( proc->name() ); |
154 | if ( it != m_out.end() ) { | 159 | if ( it != m_out.end() ) { |
160 | qWarning("found process" ); | ||
155 | list = parseSDPOutput( it.data() ); | 161 | list = parseSDPOutput( it.data() ); |
156 | m_out.remove( it ); | 162 | m_out.remove( it ); |
157 | } | 163 | } |
158 | } | 164 | } |
159 | emit foundServices( proc->name(), list ); | 165 | emit foundServices( proc->name(), list ); |
160 | delete proc; | 166 | delete proc; |
161 | } | 167 | } |
162 | Services::ValueList Manager::parseSDPOutput( const QString& out ) { | 168 | Services::ValueList Manager::parseSDPOutput( const QString& out ) { |
163 | Services::ValueList list; | 169 | Services::ValueList list; |
170 | qWarning("parsing output" ); | ||
164 | Parser parser( out ); | 171 | Parser parser( out ); |
165 | list = parser.services(); | 172 | list = parser.services(); |
166 | return list; | 173 | return list; |
167 | } | 174 | } |
168 | 175 | ||
169 | void Manager::slotHCIExited(OProcess* proc ) { | 176 | void Manager::slotHCIExited(OProcess* proc ) { |
170 | qWarning("process exited"); | 177 | qWarning("process exited"); |
171 | RemoteDevice::ValueList list; | 178 | RemoteDevice::ValueList list; |
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc index 18d534e..00ec84a 100644 --- a/noncore/net/opietooth/lib/parser.cc +++ b/noncore/net/opietooth/lib/parser.cc | |||
@@ -8,30 +8,39 @@ using namespace OpieTooth; | |||
8 | namespace { | 8 | namespace { |
9 | 9 | ||
10 | 10 | ||
11 | // "Test Foo Bar" (0x3456) | 11 | // "Test Foo Bar" (0x3456) |
12 | // @param ret Test Foo Bar | 12 | // @param ret Test Foo Bar |
13 | // @eturn 13398 | 13 | // @eturn 13398 |
14 | // tactic find " ( | 14 | // tactic find " ( |
15 | int convert( const QString& line, QString& ret ) { | 15 | int convert( const QString& line, QString& ret ) { |
16 | // qWarning("called"); | ||
16 | ret = QString::null; | 17 | ret = QString::null; |
17 | int i = 0; | 18 | int i = 0; |
18 | int pos = line.findRev("\" ("); | 19 | int pos = line.findRev("\" ("); |
19 | if ( pos > 0 ) { // it shouldn't be at pos 0 | 20 | if ( pos > 0 ) { // it shouldn't be at pos 0 |
20 | ret = line.left(pos-1 ).stripWhiteSpace(); | 21 | ret = line.left(pos ).stripWhiteSpace(); |
21 | qWarning("ret: %s", ret.latin1() ); | 22 | // qWarning("ret: %s", ret.latin1() ); |
22 | ret = ret.replace(QRegExp("[\"]"), ""); | 23 | ret = ret.replace(QRegExp("[\"]"), ""); |
23 | qWarning("ret: %s", ret.latin1() ); | 24 | //qWarning("ret: %s", ret.latin1() ); |
24 | QString dummy = line.mid(pos + 4 ); | 25 | QString dummy = line.mid(pos + 5 ); |
25 | qWarning("dummy: %s", dummy.latin1() ); | 26 | //qWarning("dummy: %s", dummy.latin1() ); |
26 | dummy = dummy.remove( dummy.length() -1, 1 ); // remove the ( | 27 | dummy = dummy.replace(QRegExp("[)]"), ""); |
28 | //qWarning("dummy: %s", dummy.latin1() ); | ||
29 | // dummy = dummy.remove( dummy.length() -2, 1 ); // remove the ) | ||
27 | bool ok; | 30 | bool ok; |
28 | i = dummy.toInt(&ok, 16 ); | 31 | i = dummy.toInt(&ok, 16 ); |
32 | //if (ok ) { | ||
33 | // qWarning("converted %d", i); | ||
34 | //}else qWarning("failed" ); | ||
35 | //qWarning("exiting"); | ||
36 | return i; | ||
29 | } | 37 | } |
38 | //qWarning("output %d", i ); | ||
30 | return i; | 39 | return i; |
31 | } | 40 | } |
32 | 41 | ||
33 | }; | 42 | }; |
34 | 43 | ||
35 | 44 | ||
36 | Parser::Parser(const QString& output ) { | 45 | Parser::Parser(const QString& output ) { |
37 | parse( output ); | 46 | parse( output ); |
@@ -40,61 +49,75 @@ void Parser::setText(const QString& output) { | |||
40 | parse( output ); | 49 | parse( output ); |
41 | } | 50 | } |
42 | Services::ValueList Parser::services() const { | 51 | Services::ValueList Parser::services() const { |
43 | return m_list; | 52 | return m_list; |
44 | } | 53 | } |
45 | void Parser::parse( const QString& string) { | 54 | void Parser::parse( const QString& string) { |
46 | m_list.clear(); | 55 | m_list.clear(); |
47 | m_complete = true; | 56 | m_complete = true; |
48 | QStringList list = QStringList::split('\n', string ); | 57 | QStringList list = QStringList::split('\n', string,TRUE ); |
49 | QStringList::Iterator it; | 58 | QStringList::Iterator it; |
50 | for (it = list.begin(); it != list.end(); ++it ) { | 59 | for (it = list.begin(); it != list.end(); ++it ) { |
60 | qWarning("line:%s:line", (*it).latin1() ); | ||
51 | if ( (*it).startsWith("Browsing") ) continue; | 61 | if ( (*it).startsWith("Browsing") ) continue; |
52 | 62 | ||
53 | if ( (*it).isEmpty() ) { // line is empty because a new Service begins | 63 | if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins |
54 | // now see if complete and add | 64 | qWarning("could add"); |
65 | // now see if complete and add | ||
55 | if (m_complete ) { | 66 | if (m_complete ) { |
56 | m_list.append( m_item ); | 67 | if (!m_item.serviceName().isEmpty() ) |
68 | m_list.append( m_item ); | ||
57 | Services serv; | 69 | Services serv; |
58 | m_item = serv; | 70 | m_item = serv; |
59 | m_complete = true; | 71 | m_complete = true; |
60 | continue; | 72 | continue; |
61 | } | 73 | } |
62 | } | 74 | } |
63 | if (parseName( (*it) ) ) ;//continue; | 75 | if (parseName( (*it) ) ) ;//continue; |
64 | if (parseRecHandle( (*it) ) ) ;//continue; | 76 | if (parseRecHandle( (*it) ) ) ;//continue; |
65 | if (parseClassId( (*it) ) ) ;//continue; | 77 | if (parseClassId( (*it) ) ) ;//continue; |
66 | if (parseProtocol( (*it) ) ) ;//continue; | 78 | if (parseProtocol( (*it) ) ) ;//continue; |
67 | if (parseProfile( (*it) ) ) ;//continue; | 79 | if (parseProfile( (*it) ) ) ;//continue; |
68 | } | 80 | } |
69 | // missed the last one | 81 | // missed the last one |
70 | if (m_complete) { | 82 | if (m_complete) { |
71 | m_list.append(m_item ); | 83 | qWarning("adding"); |
84 | if (!m_item.serviceName().isEmpty() ) | ||
85 | m_list.append(m_item ); | ||
86 | } | ||
87 | QValueList<Services>::Iterator it2; | ||
88 | |||
89 | if (m_list.isEmpty() ) | ||
90 | qWarning("m_list is empty"); | ||
91 | for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) { | ||
92 | qWarning("name %s", (*it2).serviceName().latin1() ); | ||
72 | } | 93 | } |
73 | } | 94 | } |
74 | bool Parser::parseName( const QString& str) { | 95 | bool Parser::parseName( const QString& str) { |
75 | if (str.startsWith("Service Name:") ) { | 96 | if (str.startsWith("Service Name:") ) { |
76 | m_item.setServiceName( str.mid(13).stripWhiteSpace() ); | 97 | m_item.setServiceName( str.mid(13).stripWhiteSpace() ); |
77 | qWarning(m_item.serviceName() ); | 98 | qWarning(m_item.serviceName() ); |
78 | return true; | 99 | return true; |
79 | } | 100 | } |
80 | return false; | 101 | return false; |
81 | } | 102 | } |
82 | bool Parser::parseRecHandle( const QString& str) { | 103 | bool Parser::parseRecHandle( const QString& str) { |
83 | if (str.startsWith("Service RecHandle:" ) ) { | 104 | if (str.startsWith("Service RecHandle:" ) ) { |
84 | QString out = str.mid(18 ).stripWhiteSpace(); | 105 | QString out = str.mid(18 ).stripWhiteSpace(); |
85 | qWarning("out %s", out.latin1() ); | 106 | qWarning("out %s", out.latin1() ); |
86 | int value = out.toInt(&m_ok, 16 ); | 107 | int value = out.mid(2).toInt(&m_ok, 16 ); |
87 | if (m_ok && (value != -1) ) | 108 | if (m_ok && (value != -1) ) |
88 | m_complete = true; | 109 | m_complete = true; |
89 | else | 110 | else |
90 | m_complete = false; | 111 | m_complete = false; |
91 | return true; | 112 | qWarning("rec handle %d", value); |
92 | m_item.setRecHandle( value ); | 113 | m_item.setRecHandle( value ); |
114 | return true; | ||
115 | |||
93 | } | 116 | } |
94 | return false; | 117 | return false; |
95 | } | 118 | } |
96 | bool Parser::parseClassId( const QString& str) { | 119 | bool Parser::parseClassId( const QString& str) { |
97 | if (str.startsWith("Service Class ID List:") ) { | 120 | if (str.startsWith("Service Class ID List:") ) { |
98 | m_classOver = true; | 121 | m_classOver = true; |
99 | return true; | 122 | return true; |
100 | }else if ( m_classOver ) { // ok now are the informations in place | 123 | }else if ( m_classOver ) { // ok now are the informations in place |