Diffstat (limited to 'x11/ipc/server/ocopserver.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | x11/ipc/server/ocopserver.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/x11/ipc/server/ocopserver.cpp b/x11/ipc/server/ocopserver.cpp index 0f818b7..ee5ea18 100644 --- a/x11/ipc/server/ocopserver.cpp +++ b/x11/ipc/server/ocopserver.cpp | |||
@@ -146,49 +146,49 @@ void OCopServer::newOnClient( int fd ) { | |||
146 | */ | 146 | */ |
147 | if ( rea <= 0 ) { | 147 | if ( rea <= 0 ) { |
148 | deregisterClient( fd ); | 148 | deregisterClient( fd ); |
149 | return; | 149 | return; |
150 | } | 150 | } |
151 | /* | 151 | /* |
152 | * OCOPHead | 152 | * OCOPHead |
153 | */ | 153 | */ |
154 | //qWarning("data %s %d", &bug, rea ); | 154 | //qWarning("data %s %d", &bug, rea ); |
155 | 155 | ||
156 | /* | 156 | /* |
157 | * Check the magic | 157 | * Check the magic |
158 | * if chcked read till EOF if magic does not match | 158 | * if chcked read till EOF if magic does not match |
159 | * otherwise do read | 159 | * otherwise do read |
160 | * channel | 160 | * channel |
161 | * func | 161 | * func |
162 | * data into mem | 162 | * data into mem |
163 | * and then send the OCOPPacket | 163 | * and then send the OCOPPacket |
164 | * | 164 | * |
165 | */ | 165 | */ |
166 | if (head.magic == 47 ) { | 166 | if (head.magic == 47 ) { |
167 | // qWarning("magic match"); | 167 | // qWarning("magic match"); |
168 | QCString channel( head.chlen+1 ); | 168 | QCString channel( head.chlen+1 ); |
169 | QCString func( head.funclen+1 ); | 169 | QCString func( head.funclen+1 ); |
170 | QByteArray data ( head.datalen ); | 170 | QByteArray data ( head.datalen+1 ); |
171 | 171 | ||
172 | /* | 172 | /* |
173 | * we do not check for errors | 173 | * we do not check for errors |
174 | */ | 174 | */ |
175 | // qWarning("read "); | 175 | // qWarning("read "); |
176 | int s = read(fd, channel.data(), head.chlen ); | 176 | int s = read(fd, channel.data(), head.chlen ); |
177 | s = read(fd, func.data(), head.funclen ); | 177 | s = read(fd, func.data(), head.funclen ); |
178 | s = read(fd, data.data(), head.datalen ); | 178 | s = read(fd, data.data(), head.datalen ); |
179 | // qWarning("read"); | 179 | // qWarning("read"); |
180 | 180 | ||
181 | /* debug output */ | 181 | /* debug output */ |
182 | // qWarning("channel %s %d", channel.data(), head.chlen ); | 182 | // qWarning("channel %s %d", channel.data(), head.chlen ); |
183 | // qWarning("func %s %d", func.data(), head.funclen ); | 183 | // qWarning("func %s %d", func.data(), head.funclen ); |
184 | /* debug end */ | 184 | /* debug end */ |
185 | 185 | ||
186 | /* | 186 | /* |
187 | * now that we got the complete body | 187 | * now that we got the complete body |
188 | * we need to make a package | 188 | * we need to make a package |
189 | * and then we need to send it to clients | 189 | * and then we need to send it to clients |
190 | * making a package is done here | 190 | * making a package is done here |
191 | * dispatching it not | 191 | * dispatching it not |
192 | */ | 192 | */ |
193 | OCOPPacket packet( head.type, channel, func, data ); | 193 | OCOPPacket packet( head.type, channel, func, data ); |
194 | dispatch( packet, fd ); | 194 | dispatch( packet, fd ); |
@@ -279,49 +279,49 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { | |||
279 | deregisterClient(sourceFD ); | 279 | deregisterClient(sourceFD ); |
280 | break; | 280 | break; |
281 | case OCOPPacket::Call: | 281 | case OCOPPacket::Call: |
282 | call( packet, sourceFD ); | 282 | call( packet, sourceFD ); |
283 | break; | 283 | break; |
284 | /* not implemented */ | 284 | /* not implemented */ |
285 | case OCOPPacket::Method: | 285 | case OCOPPacket::Method: |
286 | break; | 286 | break; |
287 | /* nit implemented */ | 287 | /* nit implemented */ |
288 | case OCOPPacket::Reply: | 288 | case OCOPPacket::Reply: |
289 | break; | 289 | break; |
290 | case OCOPPacket::RegisterChannel: | 290 | case OCOPPacket::RegisterChannel: |
291 | addChannel( packet.channel() , sourceFD ); | 291 | addChannel( packet.channel() , sourceFD ); |
292 | break; | 292 | break; |
293 | case OCOPPacket::UnregisterChannel: | 293 | case OCOPPacket::UnregisterChannel: |
294 | delChannel( packet.channel(), sourceFD ); | 294 | delChannel( packet.channel(), sourceFD ); |
295 | break; | 295 | break; |
296 | /* not implemented */ | 296 | /* not implemented */ |
297 | case OCOPPacket::Return: | 297 | case OCOPPacket::Return: |
298 | break; | 298 | break; |
299 | /* not implemented :( */ | 299 | /* not implemented :( */ |
300 | case OCOPPacket::Signal: | 300 | case OCOPPacket::Signal: |
301 | break; | 301 | break; |
302 | case OCOPPacket::IsRegistered: | 302 | case OCOPPacket::IsRegistered: |
303 | qWarning("IsRegistered"); | 303 | qWarning("Server:IsRegistered %s", packet.channel().data() ); |
304 | isRegistered( packet.channel(), sourceFD ); | 304 | isRegistered( packet.channel(), sourceFD ); |
305 | break; | 305 | break; |
306 | }; | 306 | }; |
307 | } | 307 | } |
308 | void OCopServer::errorOnServer() { | 308 | void OCopServer::errorOnServer() { |
309 | /* | 309 | /* |
310 | * something is wrong on the server socket? | 310 | * something is wrong on the server socket? |
311 | * what should we do? | 311 | * what should we do? |
312 | * FIXME | 312 | * FIXME |
313 | */ | 313 | */ |
314 | } | 314 | } |
315 | QStringList OCopServer::channels() { | 315 | QStringList OCopServer::channels() { |
316 | QStringList list; | 316 | QStringList list; |
317 | { | 317 | { |
318 | QMap<QCString, QValueList<int> >::Iterator it; | 318 | QMap<QCString, QValueList<int> >::Iterator it; |
319 | for (it = m_channels.begin(); it != m_channels.end(); ++it ) { | 319 | for (it = m_channels.begin(); it != m_channels.end(); ++it ) { |
320 | list << it.key(); | 320 | list << it.key(); |
321 | }; | 321 | }; |
322 | } | 322 | } |
323 | return list; | 323 | return list; |
324 | } | 324 | } |
325 | bool OCopServer::isChannelRegistered( const QCString& chan ) const{ | 325 | bool OCopServer::isChannelRegistered( const QCString& chan ) const{ |
326 | return m_channels.contains( chan ); | 326 | return m_channels.contains( chan ); |
327 | } | 327 | } |
@@ -344,67 +344,70 @@ void OCopServer::addChannel( const QCString& channel, | |||
344 | void OCopServer::delChannel( const QCString& channel, | 344 | void OCopServer::delChannel( const QCString& channel, |
345 | int fd ) { | 345 | int fd ) { |
346 | qWarning("remove %s, %d", channel.data(), fd ); | 346 | qWarning("remove %s, %d", channel.data(), fd ); |
347 | if (!m_channels.contains( channel ) ) | 347 | if (!m_channels.contains( channel ) ) |
348 | return; | 348 | return; |
349 | 349 | ||
350 | QMap<QCString, QValueList<int> >::Iterator it; | 350 | QMap<QCString, QValueList<int> >::Iterator it; |
351 | it = m_channels.find( channel ); | 351 | it = m_channels.find( channel ); |
352 | 352 | ||
353 | if ( it.data().contains(fd) ) { | 353 | if ( it.data().contains(fd) ) { |
354 | QValueList<int> ints = it.data(); | 354 | QValueList<int> ints = it.data(); |
355 | if ( ints.count() == 1 ) | 355 | if ( ints.count() == 1 ) |
356 | m_channels.remove( channel ); | 356 | m_channels.remove( channel ); |
357 | else{ | 357 | else{ |
358 | QValueList<int> ints = it.data(); | 358 | QValueList<int> ints = it.data(); |
359 | QValueList<int>::Iterator rem = ints.find( fd ); | 359 | QValueList<int>::Iterator rem = ints.find( fd ); |
360 | rem = ints.remove( rem ); | 360 | rem = ints.remove( rem ); |
361 | QCString str = it.key().copy(); | 361 | QCString str = it.key().copy(); |
362 | m_channels.replace( str, ints ); | 362 | m_channels.replace( str, ints ); |
363 | } | 363 | } |
364 | qWarning(" channel count is now %d", ints.count() ); | 364 | qWarning(" channel count is now %d", ints.count() ); |
365 | } | 365 | } |
366 | } | 366 | } |
367 | void OCopServer::isRegistered( const QCString& channel, int fd) { | 367 | void OCopServer::isRegistered( const QCString& channel, int fd) { |
368 | // qWarning("isRegistered"); | 368 | qWarning("Server:isRegistered %s", channel.data() ); |
369 | OCOPHead head; | 369 | OCOPHead head; |
370 | QCString func(2); | 370 | QCString func(2); |
371 | 371 | ||
372 | memset(&head, 0, sizeof(head ) ); | 372 | memset(&head, 0, sizeof(head ) ); |
373 | head.magic = 47; | 373 | head.magic = 47; |
374 | head.type = OCOPPacket::IsRegistered; | 374 | head.type = OCOPPacket::IsRegistered; |
375 | head.chlen = channel.size(); | 375 | head.chlen = channel.size(); |
376 | head.funclen = func.size(); | 376 | head.funclen = func.size(); |
377 | head.datalen = 0; | 377 | head.datalen = 0; |
378 | 378 | ||
379 | if ( isChannelRegistered( channel ) ) { | 379 | if ( isChannelRegistered( channel ) ) { |
380 | //is registered | 380 | //is registered |
381 | func[0] = 1; | 381 | func[0] = 1; |
382 | qWarning("Server:Channel is Registered %d", head.chlen); | ||
382 | }else{ | 383 | }else{ |
383 | func[0] = 0; | 384 | func[0] = 0; |
385 | qWarning("Server:Channel is NotRegistered"); | ||
384 | } | 386 | } |
385 | 387 | ||
386 | /** | 388 | /** |
387 | * write the head | 389 | * write the head |
388 | * and then channel | 390 | * and then channel |
389 | * success/failure inside func | 391 | * success/failure inside func |
390 | */ | 392 | */ |
391 | write(fd, &head, sizeof(head) ); | 393 | write(fd, &head, sizeof(head) ); |
392 | write(fd, channel.data(), channel.size() ); | 394 | write(fd, channel.data(), channel.size() ); |
393 | write(fd, func.data(), func.size() ); | 395 | write(fd, func.data(), func.size() ); |
394 | } | 396 | } |
395 | QValueList<int> OCopServer::clients( const QCString& channel ) { | 397 | QValueList<int> OCopServer::clients( const QCString& channel ) { |
396 | return m_channels[channel]; | 398 | return m_channels[channel]; |
397 | } | 399 | } |
398 | void OCopServer::call( const OCOPPacket& p, int ) { | 400 | void OCopServer::call( const OCOPPacket& p, int ) { |
399 | QValueList<int> cli = clients( p.channel() ); | 401 | QValueList<int> cli = clients( p.channel() ); |
400 | QValueList<int>::Iterator it; | 402 | QValueList<int>::Iterator it; |
401 | 403 | ||
402 | OCOPHead head = p.head(); | 404 | OCOPHead head = p.head(); |
403 | for (it = cli.begin(); it != cli.end(); ++it ) { | 405 | for (it = cli.begin(); it != cli.end(); ++it ) { |
406 | qWarning("Server:calling %d %s %s", (*it), p.channel().data(), p.header().data() ); | ||
404 | write( (*it), &head, sizeof(head ) ); | 407 | write( (*it), &head, sizeof(head ) ); |
405 | /* expl. shared! */ | 408 | /* expl. shared! */ |
406 | write( (*it), p.channel().data(), p.channel().size() ); | 409 | write( (*it), p.channel().data(), p.channel().size() ); |
407 | write( (*it), p.header().data(), p.header().size() ); | 410 | write( (*it), p.header().data(), p.header().size() ); |
408 | write( (*it), p.content().data(), p.content().size() ); | 411 | write( (*it), p.content().data(), p.content().size() ); |
409 | }; | 412 | }; |
410 | } | 413 | } |