| -rw-r--r-- | x11/ipc/client/ocopclient.cpp | 4 | ||||
| -rw-r--r-- | x11/ipc/server/ocopserver.cpp | 10 | ||||
| -rw-r--r-- | x11/ipc/server/ocopserver.pro | 1 |
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 @@ -106,9 +106,9 @@ 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 */ @@ -143,8 +143,8 @@ 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 @@ -133,10 +133,8 @@ int OCopServer::accept() { */ 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) ); @@ -152,9 +150,9 @@ void OCopServer::newOnClient( int fd ) { } /* * 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 @@ -173,11 +171,13 @@ void OCopServer::newOnClient( int fd ) { /* * 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 ); @@ -284,8 +284,9 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { /* not implemented :( */ case OCOPPacket::Signal: break; case OCOPPacket::IsRegistered: + qWarning("IsRegistered"); isRegistered( packet.channel(), sourceFD ); break; }; } @@ -339,8 +340,9 @@ void OCopServer::delChannel( const QCString& channel, } } } void OCopServer::isRegistered( const QCString& channel, int fd) { + qWarning("isRegistered"); OCOPHead head; QCString func(2); memset(&head, 0, sizeof(head ) ); @@ -368,9 +370,9 @@ void OCopServer::isRegistered( const QCString& channel, int fd) { } 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(); 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,5 +1,6 @@ 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 |