-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 @@ -108,5 +108,5 @@ bool OCOPClient::isRegistered( const QCString& chan ) const{ OCOPHead head = packe.head(); write(m_socket, &head, sizeof(head) ); - + write(m_socket, chan.data(), chan.size() ); /* block */ OCOPPacket pack = packet(); @@ -145,5 +145,5 @@ void OCOPClient::startUP() { 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 @@ -135,6 +135,4 @@ int OCopServer::accept() { } void OCopServer::newOnClient( int fd ) { - int bug[4096]; - //qWarning("new stuff for client on fd %d", fd ); errno = 0; OCOPHead head; @@ -154,5 +152,5 @@ void OCopServer::newOnClient( int fd ) { * OCOPHead */ - qWarning("data %s %d", bug, rea ); + //qWarning("data %s %d", &bug, rea ); /* @@ -175,7 +173,9 @@ 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 */ @@ -286,4 +286,5 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { break; case OCOPPacket::IsRegistered: + qWarning("IsRegistered"); isRegistered( packet.channel(), sourceFD ); break; @@ -341,4 +342,5 @@ void OCopServer::delChannel( const QCString& channel, } void OCopServer::isRegistered( const QCString& channel, int fd) { + qWarning("isRegistered"); OCOPHead head; QCString func(2); @@ -370,5 +372,5 @@ 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; 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,3 +1,4 @@ TEMPLATE = app +DESTDIR = $(OPIEDIR)/bin CONFIG = qt warn_on debug #CONFIG = qt warn_on release |