author | zecke <zecke> | 2003-02-10 21:36:08 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-10 21:36:08 (UTC) |
commit | eb9be7ada3de060d8c5ce52590bd91120ed5e1bd (patch) (unidiff) | |
tree | 58a5566691737f6f3ee12fa7005b8bdf2d12332b /x11/ipc | |
parent | bbb3cdf8f91d567f6c2e786bd144b64bd679ff9a (diff) | |
download | opie-eb9be7ada3de060d8c5ce52590bd91120ed5e1bd.zip opie-eb9be7ada3de060d8c5ce52590bd91120ed5e1bd.tar.gz opie-eb9be7ada3de060d8c5ce52590bd91120ed5e1bd.tar.bz2 |
better commit that...
-rw-r--r-- | x11/ipc/client/ocopclient.cpp | 8 | ||||
-rw-r--r-- | x11/ipc/server/ocopserver.cpp | 38 |
2 files changed, 23 insertions, 23 deletions
diff --git a/x11/ipc/client/ocopclient.cpp b/x11/ipc/client/ocopclient.cpp index 91827e7..f59fa41 100644 --- a/x11/ipc/client/ocopclient.cpp +++ b/x11/ipc/client/ocopclient.cpp | |||
@@ -100,5 +100,5 @@ OCOPPacket OCOPClient::packet() const{ | |||
100 | read(m_socket, &head, sizeof(head) ); | 100 | read(m_socket, &head, sizeof(head) ); |
101 | if ( head.magic == 47 ) { | 101 | if ( head.magic == 47 ) { |
102 | qWarning("Client:Magic Match"); | 102 | // qWarning("Client:Magic Match"); |
103 | chan = QCString( head.chlen+1); | 103 | chan = QCString( head.chlen+1); |
104 | func = QCString( head.funclen+1 ); | 104 | func = QCString( head.funclen+1 ); |
@@ -107,5 +107,5 @@ OCOPPacket OCOPClient::packet() const{ | |||
107 | read(m_socket, func.data(), head.funclen ); | 107 | read(m_socket, func.data(), head.funclen ); |
108 | read(m_socket, ar.data(), head.datalen ); | 108 | read(m_socket, ar.data(), head.datalen ); |
109 | qWarning("Client:%d %s",head.chlen,chan.data() ); | 109 | //qWarning("Client:%d %s",head.chlen,chan.data() ); |
110 | } | 110 | } |
111 | OCOPPacket pack(head.type, chan, func, ar ); | 111 | OCOPPacket pack(head.type, chan, func, ar ); |
@@ -118,5 +118,5 @@ OCOPPacket OCOPClient::packet() const{ | |||
118 | */ | 118 | */ |
119 | bool OCOPClient::isRegistered( const QCString& chan ) const{ | 119 | bool OCOPClient::isRegistered( const QCString& chan ) const{ |
120 | qWarning("OCopClient::isRegistered %s", chan.data() ); | 120 | // qWarning("OCopClient::isRegistered %s", chan.data() ); |
121 | /* should I disconnect the socket notfier? */ | 121 | /* should I disconnect the socket notfier? */ |
122 | OCOPPacket packe(OCOPPacket::IsRegistered, chan ); | 122 | OCOPPacket packe(OCOPPacket::IsRegistered, chan ); |
@@ -138,5 +138,5 @@ bool OCOPClient::isRegistered( const QCString& chan ) const{ | |||
138 | }; | 138 | }; |
139 | void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArray& arr ) { | 139 | void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArray& arr ) { |
140 | qWarning("ClientSending %s %s", chan.data(), fu.data() ); | 140 | // qWarning("ClientSending %s %s", chan.data(), fu.data() ); |
141 | OCOPPacket pack(OCOPPacket::Call, chan, fu, arr ); | 141 | OCOPPacket pack(OCOPPacket::Call, chan, fu, arr ); |
142 | call( pack ); | 142 | call( pack ); |
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 | |||
@@ -32,5 +32,5 @@ void OCopServer::init() { | |||
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 | ||
@@ -122,5 +122,5 @@ void OCopServer::newOnServer() { | |||
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 | ||
@@ -195,6 +195,6 @@ void OCopServer::newOnClient( int 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 | } |
@@ -210,5 +210,5 @@ void OCopServer::registerClient( int 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 ) { |
@@ -230,5 +230,5 @@ void OCopServer::deregisterClient(int fd ) { | |||
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"); |
@@ -239,5 +239,5 @@ void OCopServer::deregisterClient(int fd ) { | |||
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 ); |
@@ -251,5 +251,5 @@ void OCopServer::deregisterClient(int fd ) { | |||
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 ); |
@@ -264,6 +264,6 @@ void OCopServer::deregisterClient(int 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 |
@@ -271,5 +271,5 @@ void OCopServer::deregisterClient(int fd ) { | |||
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: |
@@ -301,5 +301,5 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { | |||
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; |
@@ -334,5 +334,5 @@ void OCopServer::addChannel( const QCString& channel, | |||
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 { |
@@ -344,5 +344,5 @@ 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; |
@@ -362,9 +362,9 @@ void OCopServer::delChannel( const QCString& channel, | |||
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); |
@@ -380,8 +380,8 @@ void OCopServer::isRegistered( const QCString& channel, int fd) { | |||
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 | ||
@@ -404,5 +404,5 @@ void OCopServer::call( const OCOPPacket& p, int ) { | |||
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! */ |