Fix the IPC server and client

registering channel is done locally with refcounts
if the channel is already registered globally
Fix some sizes to allow proper communication..

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
@@ -164,13 +164,13 @@ void OCopServer::newOnClient( int fd ) {
      *
      */
     if (head.magic == 47 ) {
 //        qWarning("magic match");
         QCString channel( head.chlen+1 );
         QCString func( head.funclen+1 );
-        QByteArray data ( head.datalen );
+        QByteArray data ( head.datalen+1 );
 
         /*
          * we do not check for errors
          */
 //        qWarning("read ");
         int s = read(fd, channel.data(), head.chlen );
@@ -297,13 +297,13 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) {
     case OCOPPacket::Return:
         break;
         /* not implemented :( */
     case OCOPPacket::Signal:
         break;
     case OCOPPacket::IsRegistered:
-        qWarning("IsRegistered");
+        qWarning("Server:IsRegistered %s", packet.channel().data() );
         isRegistered( packet.channel(), sourceFD );
         break;
     };
 }
 void OCopServer::errorOnServer() {
     /*
@@ -362,13 +362,13 @@ void OCopServer::delChannel( const QCString& channel,
             m_channels.replace( str, ints );
         }
         qWarning(" channel count is now %d", ints.count() );
     }
 }
 void OCopServer::isRegistered( const QCString& channel, int fd) {
-//    qWarning("isRegistered");
+    qWarning("Server:isRegistered %s", channel.data() );
     OCOPHead head;
     QCString func(2);
 
     memset(&head, 0, sizeof(head ) );
     head.magic = 47;
     head.type = OCOPPacket::IsRegistered;
@@ -376,14 +376,16 @@ void OCopServer::isRegistered( const QCString& channel, int fd) {
     head.funclen = func.size();
     head.datalen = 0;
 
     if ( isChannelRegistered( channel ) ) {
         //is registered
         func[0] = 1;
+        qWarning("Server:Channel is Registered %d", head.chlen);
     }else{
         func[0] = 0;
+        qWarning("Server:Channel is NotRegistered");
     }
 
     /**
      * write the head
      * and then channel
      * success/failure inside func
@@ -398,12 +400,13 @@ QValueList<int> OCopServer::clients( const QCString& channel ) {
 void OCopServer::call( const OCOPPacket& p, int ) {
     QValueList<int> cli = clients( p.channel() );
     QValueList<int>::Iterator it;
 
     OCOPHead head = p.head();
     for (it = cli.begin(); it != cli.end(); ++it ) {
+        qWarning("Server:calling %d %s %s", (*it), p.channel().data(), p.header().data() );
         write( (*it), &head, sizeof(head ) );
         /* expl. shared! */
         write( (*it), p.channel().data(), p.channel().size() );
         write( (*it), p.header().data(), p.header().size() );
         write( (*it), p.content().data(), p.content().size() );
     };