-rw-r--r-- | x11/ipc/server/ocopserver.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/x11/ipc/server/ocopserver.cpp b/x11/ipc/server/ocopserver.cpp index ee5ea18..992cb8c 100644 --- a/x11/ipc/server/ocopserver.cpp +++ b/x11/ipc/server/ocopserver.cpp | |||
@@ -30,9 +30,9 @@ void OCopServer::init() { | |||
30 | /* | 30 | /* |
31 | * we set SIGPIPE to SIG_IGN | 31 | * we set SIGPIPE to SIG_IGN |
32 | * to get EPIPE on reads ;) | 32 | * to get EPIPE on reads ;) |
33 | */ | 33 | */ |
34 | qWarning("SIGPIPE to be ignored"); | 34 | // qWarning("SIGPIPE to be ignored"); |
35 | signal(SIGPIPE, SIG_IGN ); | 35 | signal(SIGPIPE, SIG_IGN ); |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * initialize some variables | 38 | * initialize some variables |
@@ -120,9 +120,9 @@ void OCopServer::newOnServer() { | |||
120 | * set SocketNotifier | 120 | * set SocketNotifier |
121 | * connect it | 121 | * connect it |
122 | * and a OCOPClient | 122 | * and a OCOPClient |
123 | */ | 123 | */ |
124 | qWarning("Heureka new connection %d", fd ); | 124 | // qWarning("Heureka new connection %d", fd ); |
125 | 125 | ||
126 | 126 | ||
127 | registerClient( fd ); | 127 | registerClient( fd ); |
128 | } | 128 | } |
@@ -193,10 +193,10 @@ void OCopServer::newOnClient( int fd ) { | |||
193 | OCOPPacket packet( head.type, channel, func, data ); | 193 | OCOPPacket packet( head.type, channel, func, data ); |
194 | dispatch( packet, fd ); | 194 | dispatch( packet, fd ); |
195 | 195 | ||
196 | }else{ | 196 | }else{ |
197 | qWarning("magic does not match"); | 197 | // qWarning("magic does not match"); |
198 | qWarning("magic %d", head.magic ); | 198 | // qWarning("magic %d", head.magic ); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | void OCopServer::registerClient( int fd ) { | 201 | void OCopServer::registerClient( int fd ) { |
202 | if (m_clients.contains(fd) ) | 202 | if (m_clients.contains(fd) ) |
@@ -208,9 +208,9 @@ void OCopServer::registerClient( int fd ) { | |||
208 | OCOPClient client; | 208 | OCOPClient client; |
209 | client.fd = fd; | 209 | client.fd = fd; |
210 | client.notify = notify; | 210 | client.notify = notify; |
211 | m_clients.insert( client.fd, client ); | 211 | m_clients.insert( client.fd, client ); |
212 | qWarning("clients are up to %d", m_clients.count() ); | 212 | // qWarning("clients are up to %d", m_clients.count() ); |
213 | }; | 213 | }; |
214 | void OCopServer::deregisterClient(int fd ) { | 214 | void OCopServer::deregisterClient(int fd ) { |
215 | QMap<int, OCOPClient>::Iterator it = m_clients.find( fd ); | 215 | QMap<int, OCOPClient>::Iterator it = m_clients.find( fd ); |
216 | if (it != m_clients.end() ) { | 216 | if (it != m_clients.end() ) { |
@@ -228,18 +228,18 @@ void OCopServer::deregisterClient(int fd ) { | |||
228 | for ( it2 = m_channels.begin(); it2 != m_channels.end(); ++it2 ) { | 228 | for ( it2 = m_channels.begin(); it2 != m_channels.end(); ++it2 ) { |
229 | /* | 229 | /* |
230 | * The channel contains this fd | 230 | * The channel contains this fd |
231 | */ | 231 | */ |
232 | qWarning("Channel %s %d", it2.key().data(), it2.data().count() ); | 232 | // qWarning("Channel %s %d", it2.key().data(), it2.data().count() ); |
233 | if ( it2.data().contains( fd ) ) { | 233 | if ( it2.data().contains( fd ) ) { |
234 | qWarning("contains"); | 234 | qWarning("contains"); |
235 | QValueList<int> array = it2.data(); | 235 | QValueList<int> array = it2.data(); |
236 | 236 | ||
237 | /* | 237 | /* |
238 | * remove channel or just replace | 238 | * remove channel or just replace |
239 | */ | 239 | */ |
240 | if ( array.count() == 1 || array.count() == 0) { | 240 | if ( array.count() == 1 || array.count() == 0) { |
241 | qWarning("Invalidate!"); | 241 | // qWarning("Invalidate!"); |
242 | /* is the list now invalidatet? */ | 242 | /* is the list now invalidatet? */ |
243 | m_channels.remove( it2 ); | 243 | m_channels.remove( it2 ); |
244 | /* That is the first go to of my life | 244 | /* That is the first go to of my life |
245 | * but Iterator remove( Iterator ) | 245 | * but Iterator remove( Iterator ) |
@@ -249,9 +249,9 @@ void OCopServer::deregisterClient(int fd ) { | |||
249 | * so the only way is to reiterate :( | 249 | * so the only way is to reiterate :( |
250 | */ | 250 | */ |
251 | goto repeatIt; | 251 | goto repeatIt; |
252 | }else{ | 252 | }else{ |
253 | qWarning("removing count %d %d",fd, array.count() ); | 253 | // qWarning("removing count %d %d",fd, array.count() ); |
254 | QValueList<int>::Iterator it3 = array.find( fd ); | 254 | QValueList<int>::Iterator it3 = array.find( fd ); |
255 | it3 = array.remove( it3 ); | 255 | it3 = array.remove( it3 ); |
256 | QCString key = it2.key().copy(); | 256 | QCString key = it2.key().copy(); |
257 | it2 = m_channels.replace( key, array ); | 257 | it2 = m_channels.replace( key, array ); |
@@ -262,16 +262,16 @@ void OCopServer::deregisterClient(int fd ) { | |||
262 | delete client.notify; | 262 | delete client.notify; |
263 | m_clients.remove(fd ); | 263 | m_clients.remove(fd ); |
264 | close(fd ); | 264 | close(fd ); |
265 | } | 265 | } |
266 | qWarning("clients are now at %d", m_clients.count() ); | 266 | // qWarning("clients are now at %d", m_clients.count() ); |
267 | }; | 267 | } |
268 | /** | 268 | /** |
269 | * this function will evaluate | 269 | * this function will evaluate |
270 | * the package and then do the appropriate thins | 270 | * the package and then do the appropriate thins |
271 | */ | 271 | */ |
272 | void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { | 272 | void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { |
273 | qWarning("packet.type() == %d", packet.type() ); | 273 | // qWarning("packet.type() == %d", packet.type() ); |
274 | switch( packet.type() ) { | 274 | switch( packet.type() ) { |
275 | case OCOPPacket::Register: | 275 | case OCOPPacket::Register: |
276 | registerClient(sourceFD ); | 276 | registerClient(sourceFD ); |
277 | break; | 277 | break; |
@@ -299,9 +299,9 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { | |||
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("Server:IsRegistered %s", packet.channel().data() ); | 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 | } |
@@ -332,9 +332,9 @@ void OCopServer::addChannel( const QCString& channel, | |||
332 | if ( it != m_channels.end() ) { | 332 | if ( it != m_channels.end() ) { |
333 | /* could be empty */ | 333 | /* could be empty */ |
334 | QValueList<int> list = it.data(); | 334 | QValueList<int> list = it.data(); |
335 | list.append( fd ); | 335 | list.append( fd ); |
336 | qWarning("count is now in addChannel %d %s", list.count(), channel.data() ); | 336 | qWarning("Server:count is now in addChannel %d %s", list.count(), channel.data() ); |
337 | it = m_channels.replace( channel, list ); | 337 | it = m_channels.replace( channel, list ); |
338 | }else { | 338 | }else { |
339 | QValueList<int> ints; | 339 | QValueList<int> ints; |
340 | ints.append( fd ); | 340 | ints.append( fd ); |
@@ -342,9 +342,9 @@ void OCopServer::addChannel( const QCString& channel, | |||
342 | } | 342 | } |
343 | }; | 343 | }; |
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; |
@@ -360,13 +360,13 @@ void OCopServer::delChannel( const QCString& channel, | |||
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("Server:isRegistered %s", channel.data() ); | 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 ) ); |
@@ -378,12 +378,12 @@ void OCopServer::isRegistered( const QCString& channel, int fd) { | |||
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 | //qWarning("Server:Channel is Registered %d", head.chlen); |
383 | }else{ | 383 | }else{ |
384 | func[0] = 0; | 384 | func[0] = 0; |
385 | qWarning("Server:Channel is NotRegistered"); | 385 | //qWarning("Server:Channel is NotRegistered"); |
386 | } | 386 | } |
387 | 387 | ||
388 | /** | 388 | /** |
389 | * write the head | 389 | * write the head |
@@ -402,9 +402,9 @@ void OCopServer::call( const OCOPPacket& p, int ) { | |||
402 | QValueList<int>::Iterator it; | 402 | QValueList<int>::Iterator it; |
403 | 403 | ||
404 | OCOPHead head = p.head(); | 404 | OCOPHead head = p.head(); |
405 | 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() ); | 406 | // qWarning("Server:calling %d %s %s", (*it), p.channel().data(), p.header().data() ); |
407 | write( (*it), &head, sizeof(head ) ); | 407 | write( (*it), &head, sizeof(head ) ); |
408 | /* expl. shared! */ | 408 | /* expl. shared! */ |
409 | write( (*it), p.channel().data(), p.channel().size() ); | 409 | write( (*it), p.channel().data(), p.channel().size() ); |
410 | write( (*it), p.header().data(), p.header().size() ); | 410 | write( (*it), p.header().data(), p.header().size() ); |