some debug output

+ bugfix
besides some problems with the server IPC is working on X11
too

3 files changed, 9 insertions, 6 deletions

diff --git a/x11/ipc/client/ocopclient.cpp b/x11/ipc/client/ocopclient.cpp
index ac6e4a3..c1def73 100644
--- a/x11/ipc/client/ocopclient.cpp
+++ b/x11/ipc/client/ocopclient.cpp
@@ -104,13 +104,13 @@ OCOPPacket OCOPClient::packet() const{
  */
 bool OCOPClient::isRegistered( const QCString& chan ) const{
     /* 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();
 
     /* connect here again */
     if ( pack.channel() == chan ) {
         QCString func = pack.header();
@@ -141,10 +141,10 @@ void OCOPClient::call( const OCOPPacket& pack ) {
 }
 void OCOPClient::startUP() {
     qWarning("Start me up");
     pid_t pi = fork();
     if ( pi == 0 ) {
         setsid();
-        execlp("opie-ipc", "opie-ipc", NULL );
+        execlp("ocopserver", "ocopserver", NULL );
         _exit(1);
     }
 }
diff --git a/x11/ipc/server/ocopserver.cpp b/x11/ipc/server/ocopserver.cpp
index e76657e..421e49c 100644
--- a/x11/ipc/server/ocopserver.cpp
+++ b/x11/ipc/server/ocopserver.cpp
@@ -131,14 +131,12 @@ int OCopServer::accept() {
      * accept it
      * the socket is currently blocking IIRC
      */
     return ::accept( m_serverfd,  (struct sockaddr*)&m_address, &m_adrlaenge );
 }
 void OCopServer::newOnClient( int fd ) {
-    int bug[4096];
-    //qWarning("new stuff for client on fd %d", fd );
     errno = 0;
     OCOPHead head;
     memset(&head, 0, sizeof(head) );
     int rea = ::read(fd, &head, sizeof(head) );
     //qWarning("read %d %d", rea,  errno);
     /*
@@ -150,13 +148,13 @@ void OCopServer::newOnClient( int fd ) {
         deregisterClient( fd );
         return;
     }
     /*
      * OCOPHead
      */
-    qWarning("data %s %d", bug, rea );
+    //qWarning("data %s %d", &bug, rea );
 
     /*
      * Check the magic
      * if chcked read till EOF if magic does not match
      * otherwise do read
      *  channel
@@ -171,15 +169,17 @@ void OCopServer::newOnClient( int fd ) {
         QCString func( head.funclen+1 );
         QByteArray data ( head.datalen );
 
         /*
          * 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 */
 
@@ -282,12 +282,13 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) {
     case OCOPPacket::Return:
         break;
         /* not implemented :( */
     case OCOPPacket::Signal:
         break;
     case OCOPPacket::IsRegistered:
+        qWarning("IsRegistered");
         isRegistered( packet.channel(), sourceFD );
         break;
     };
 }
 void OCopServer::errorOnServer() {
     /*
@@ -337,12 +338,13 @@ void OCopServer::delChannel( const QCString& channel,
             ints.remove( fd );
             m_channels.replace( it.key(), ints );
         }
     }
 }
 void OCopServer::isRegistered( const QCString& channel, int fd) {
+    qWarning("isRegistered");
     OCOPHead head;
     QCString func(2);
 
     memset(&head, 0, sizeof(head ) );
     head.magic = 47;
     head.type = OCOPPacket::IsRegistered;
@@ -366,13 +368,13 @@ void OCopServer::isRegistered( const QCString& channel, int fd) {
     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 fd ) {
+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 ) {
         write( (*it), &head, sizeof(head ) );
diff --git a/x11/ipc/server/ocopserver.pro b/x11/ipc/server/ocopserver.pro
index 1776063..e0a928c 100644
--- a/x11/ipc/server/ocopserver.pro
+++ b/x11/ipc/server/ocopserver.pro
@@ -1,7 +1,8 @@
 TEMPLATE	= app
+DESTDIR         = $(OPIEDIR)/bin
 CONFIG		= qt warn_on debug
 #CONFIG		= qt warn_on release
 HEADERS		= ../common/ocoppacket.h ocopclient.h ocopserver.h
 SOURCES		= ../common/ocoppacket.cpp main.cpp ocopserver.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include