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..

4 files changed, 39 insertions, 13 deletions

diff --git a/x11/ipc/client/ocopclient.cpp b/x11/ipc/client/ocopclient.cpp
index 6085481..91827e7 100644
--- a/x11/ipc/client/ocopclient.cpp
+++ b/x11/ipc/client/ocopclient.cpp
@@ -78,79 +78,87 @@ void OCOPClient::newData() {
     case OCOPPacket::Register:
     case OCOPPacket::Unregister:
     case OCOPPacket::Method:
     case OCOPPacket::RegisterChannel:
     case OCOPPacket::UnregisterChannel:
     case OCOPPacket::Return:
     case OCOPPacket::Signal:
         /* is Registered should be handled sync */
     case OCOPPacket::IsRegistered:
         break;
         /* emit the signal */
     case OCOPPacket::Call:
         emit called( pack.channel(), pack.header(), pack.content() );
         break;
     }
 }
 OCOPPacket OCOPClient::packet() const{
     QCString chan;
     QCString func;
     QByteArray ar;
     OCOPHead head;
     memset(&head, 0, sizeof(head) );
     read(m_socket, &head, sizeof(head) );
     if ( head.magic == 47 ) {
+        qWarning("Client:Magic Match");
+        chan = QCString( head.chlen+1);
+        func = QCString( head.funclen+1 );
+        ar = QByteArray( head.datalen);
         read(m_socket, chan.data(), head.chlen );
         read(m_socket, func.data(), head.funclen );
         read(m_socket, ar.data(), head.datalen );
+	qWarning("Client:%d %s",head.chlen,chan.data() );
     }
     OCOPPacket pack(head.type, chan,  func, ar );
     return pack;
 }
 /*
  * we've blocking IO here on these sockets
  * so we send and go on read
  * this will be blocked
  */
 bool OCOPClient::isRegistered( const QCString& chan ) const{
+    qWarning("OCopClient::isRegistered %s", chan.data() );
     /* should I disconnect the socket notfier? */
     OCOPPacket packe(OCOPPacket::IsRegistered, chan );
     OCOPHead head = packe.head();
     write(m_socket, &head, sizeof(head) );
     write(m_socket, chan.data(), chan.size() );
     /* block */
     OCOPPacket pack = packet();
+    qWarning("unblock %s %s", pack.channel().data(), chan.data() );
 
     /* connect here again */
     if ( pack.channel() == chan ) {
         QCString func = pack.header();
         if (func[0] == 1 )
             return true;
     }
 
     return false;
 };
 void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArray& arr ) {
+    qWarning("ClientSending %s %s", chan.data(), fu.data() );
     OCOPPacket pack(OCOPPacket::Call, chan, fu, arr );
     call( pack );
 }
 void OCOPClient::addChannel(const QCString& channel) {
     OCOPPacket pack(OCOPPacket::RegisterChannel, channel );
     call( pack );
 }
 void OCOPClient::delChannel(const QCString& chan ) {
     OCOPPacket pack(OCOPPacket::UnregisterChannel, chan );
     call( pack );
 }
 void OCOPClient::call( const OCOPPacket& pack ) {
     OCOPHead head = pack.head();
     write(m_socket, &head, sizeof(head) );
     write(m_socket, pack.channel().data(), pack.channel().size() );
     write(m_socket, pack.header().data(), pack.header().size() );
     write(m_socket, pack.content().data(), pack.content().size() );
 }
 void OCOPClient::startUP() {
     qWarning("Start me up");
     pid_t pi = fork();
     if ( pi == 0 ) {
         setsid();
         execlp("ocopserver", "ocopserver", NULL );
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 ) {
      */
     if ( rea <= 0 ) {
         deregisterClient( fd );
         return;
     }
     /*
      * OCOPHead
      */
     //qWarning("data %s %d", &bug, rea );
 
     /*
      * Check the magic
      * if chcked read till EOF if magic does not match
      * otherwise do read
      *  channel
      * func
      * data into mem
      * and then send the OCOPPacket
      *
      */
     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 );
         s = read(fd, func.data(), head.funclen );
         s = read(fd, data.data(), head.datalen );
 //        qWarning("read");
 
         /* debug output */
 //        qWarning("channel %s %d", channel.data(), head.chlen );
 //        qWarning("func %s %d", func.data(), head.funclen );
         /* debug end */
 
         /*
          * now that we got the complete body
          * we need to make a package
          * and then we need to send it to clients
          * making a package is done here
          * dispatching it not
          */
         OCOPPacket packet( head.type, channel, func, data );
         dispatch( packet, fd );
@@ -279,49 +279,49 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) {
         deregisterClient(sourceFD );
         break;
     case OCOPPacket::Call:
         call( packet, sourceFD );
         break;
         /* not implemented */
     case OCOPPacket::Method:
         break;
         /* nit implemented */
     case OCOPPacket::Reply:
         break;
     case OCOPPacket::RegisterChannel:
         addChannel( packet.channel() , sourceFD );
         break;
     case OCOPPacket::UnregisterChannel:
         delChannel( packet.channel(), sourceFD );
         break;
         /* not implemented */
     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() {
     /*
      * something is wrong on the server socket?
      * what should we do?
      * FIXME
      */
 }
 QStringList OCopServer::channels() {
     QStringList list;
     {
         QMap<QCString, QValueList<int> >::Iterator it;
         for (it = m_channels.begin(); it != m_channels.end(); ++it ) {
             list << it.key();
         };
     }
     return list;
 }
 bool OCopServer::isChannelRegistered( const QCString& chan ) const{
     return m_channels.contains( chan );
 }
@@ -344,67 +344,70 @@ void OCopServer::addChannel( const QCString& channel,
 void OCopServer::delChannel( const QCString& channel,
                              int fd ) {
     qWarning("remove %s, %d", channel.data(), fd );
     if (!m_channels.contains( channel ) )
         return;
 
     QMap<QCString, QValueList<int> >::Iterator it;
     it = m_channels.find( channel );
 
     if ( it.data().contains(fd) ) {
         QValueList<int> ints = it.data();
         if ( ints.count() == 1  )
             m_channels.remove( channel );
         else{
             QValueList<int> ints = it.data();
             QValueList<int>::Iterator rem = ints.find( fd );
             rem = ints.remove( rem );
             QCString str = it.key().copy();
             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;
     head.chlen = channel.size();
     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
      */
     write(fd, &head, sizeof(head) );
     write(fd, channel.data(), channel.size() );
     write(fd, func.data(), func.size() );
 }
 QValueList<int> OCopServer::clients( const QCString& channel ) {
     return m_channels[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() );
     };
 }
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.cpp b/x11/libqpe-x11/qt/qcopchannel_qws.cpp
index e90f056..1cea80c 100644
--- a/x11/libqpe-x11/qt/qcopchannel_qws.cpp
+++ b/x11/libqpe-x11/qt/qcopchannel_qws.cpp
@@ -1,63 +1,76 @@
 
 #include "../../ipc/client/ocopclient.h"
 
 #include <qcopchannel_qws.h>
 
 QList<QCopChannel>* QCopChannel::m_list = 0;
+QMap<QCString, int> QCopChannel::m_refCount;
 
 QCopChannel::QCopChannel( const QCString& channel, QObject* parent,
                           const char* name )
     : QObject( parent, name ),m_chan(channel) {
-    init();
     if (!m_list ) {
         m_list = new QList<QCopChannel>;
+        /* only connect once */
+        connect(OCOPClient::self(), SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ),
+                this, SLOT(rev(const QCString&, const QCString&, const QByteArray&) ) );
     }
+    /* first registration  or ref count is 0 for m_chan*/
+    if (!m_refCount.contains( m_chan ) || !m_refCount[m_chan]  ) {
+        m_refCount[m_chan] = 1;
+        OCOPClient::self()->addChannel( m_chan );
+    }else
+        m_refCount[m_chan]++;
+
     m_list->append(this);
 }
 void QCopChannel::receive( const QCString& msg, const QByteArray& ar ) {
     emit received( msg, ar );
 }
 QCopChannel::~QCopChannel() {
+    if (m_refCount[m_chan] == 1 ) {
+        OCOPClient::self()->delChannel( m_chan );
+        m_refCount[m_chan] = 0;
+    }else
+        m_refCount[m_chan]--;
+
+
     m_list->remove(this);
     if (m_list->count() == 0 ) {
         delete m_list;
         m_list = 0;
     }
-    OCOPClient::self()->delChannel( m_chan );
-}
-void QCopChannel::init() {
-    OCOPClient::self()->addChannel( m_chan );
-    connect(OCOPClient::self(), SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ),
-            this, SLOT(rev(const QCString&, const QCString&, const QByteArray&) ) );
+
 }
 QCString QCopChannel::channel()const {
     return m_chan;
 }
 bool QCopChannel::isRegistered( const QCString& chan) {;
     return OCOPClient::self()->isRegistered( chan );
 }
 bool QCopChannel::send( const QCString& chan, const QCString& msg ) {
     QByteArray ar;
     return send(chan, msg, ar );
 }
 bool QCopChannel::send( const QCString& chan, const QCString& msg,
                      const QByteArray& ar ) {
     OCOPClient::self()->send( chan, msg, ar );
     return true;
 }
 bool QCopChannel::sendLocally( const QCString& chann, const QCString& msg,
                                const QByteArray& ar ) {
+    qWarning("Client:sendLocally %s %s", chann.data(), msg.data() );
     if (!m_list )
         return true;
     QCopChannel* chan;
+
     for ( chan = m_list->first(); chan; chan = m_list->next() ) {
         if ( chan->channel() == chann )
             chan->receive( msg, ar );
     }
 
     return true;
 }
 void QCopChannel::rev( const QCString& chan, const QCString& msg, const QByteArray& ar ) {
-    if (chan == m_chan )
-        emit received(msg, ar );
+    sendLocally( chan, msg, ar );
 }
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.h b/x11/libqpe-x11/qt/qcopchannel_qws.h
index 94b199e..c1220cb 100644
--- a/x11/libqpe-x11/qt/qcopchannel_qws.h
+++ b/x11/libqpe-x11/qt/qcopchannel_qws.h
@@ -1,42 +1,44 @@
 #ifndef OPIE_QCOP_CHANNEL_QWS_H
 #define OPIE_QCOP_CHANNEL_QWS_H
 
 #include <qobject.h>
 #include <qcstring.h>
 #include <qlist.h>
+#include <qmap.h>
 
 class OCOPClient;
 class QCopChannel : public QObject {
     Q_OBJECT
 public:
     QCopChannel( const QCString& channel, QObject* parent = 0,
                  const char* name = 0);
     virtual ~QCopChannel();
 
     QCString channel()const;
 
     static bool isRegistered( const QCString& channel );
     static bool send( const QCString& channel, const QCString& msg );
     static bool send( const QCString& channel, const QCString& msg,
                       const QByteArray& );
     static bool sendLocally( const QCString& chan, const QCString& msg,
                              const QByteArray& data );
     void receive( const QCString& msg, const QByteArray& ar );
 
 signals:
     void received( const QCString& msg, const QByteArray& );
 
 private slots:
     void rev( const QCString& chan, const QCString&, const QByteArray& );
 
 private:
-    void init();
+    bool isRegisteredLocally( const QCString& str);
     static QList<QCopChannel> *m_list;
+    static QMap<QCString, int> m_refCount;
     /* the channel */
     QCString m_chan;
     class Private;
     Private *d;
 
 };
 
 #endif