author | zecke <zecke> | 2002-10-16 16:53:43 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-16 16:53:43 (UTC) |
commit | ef5700ad4eda47e98b76467fa80dd6cd838c6391 (patch) (side-by-side diff) | |
tree | dcd5d051824689cab42f036895959483fb5e690b | |
parent | ea11ae7dc31e23578d13f30315a3697cbce99c05 (diff) | |
download | opie-ef5700ad4eda47e98b76467fa80dd6cd838c6391.zip opie-ef5700ad4eda47e98b76467fa80dd6cd838c6391.tar.gz opie-ef5700ad4eda47e98b76467fa80dd6cd838c6391.tar.bz2 |
some debug output
+ bugfix
besides some problems with the server IPC is working on X11
too
-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 @@ -109,3 +109,3 @@ bool OCOPClient::isRegistered( const QCString& chan ) const{ write(m_socket, &head, sizeof(head) ); - + write(m_socket, chan.data(), chan.size() ); /* block */ @@ -146,3 +146,3 @@ void OCOPClient::startUP() { 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 @@ -136,4 +136,2 @@ int OCopServer::accept() { void OCopServer::newOnClient( int fd ) { - int bug[4096]; - //qWarning("new stuff for client on fd %d", fd ); errno = 0; @@ -155,3 +153,3 @@ void OCopServer::newOnClient( int fd ) { */ - qWarning("data %s %d", bug, rea ); + //qWarning("data %s %d", &bug, rea ); @@ -176,2 +174,3 @@ void OCopServer::newOnClient( int fd ) { */ + qWarning("read "); int s = read(fd, channel.data(), head.chlen ); @@ -179,2 +178,3 @@ void OCopServer::newOnClient( int fd ) { s = read(fd, data.data(), head.datalen ); + qWarning("read"); @@ -287,2 +287,3 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { case OCOPPacket::IsRegistered: + qWarning("IsRegistered"); isRegistered( packet.channel(), sourceFD ); @@ -342,2 +343,3 @@ void OCopServer::delChannel( const QCString& channel, void OCopServer::isRegistered( const QCString& channel, int fd) { + qWarning("isRegistered"); OCOPHead head; @@ -371,3 +373,3 @@ QValueList<int> OCopServer::clients( const QCString& channel ) { } -void OCopServer::call( const OCOPPacket& p, int fd ) { +void OCopServer::call( const OCOPPacket& p, int ) { QValueList<int> cli = clients( p.channel() ); 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,2 +1,3 @@ TEMPLATE = app +DESTDIR = $(OPIEDIR)/bin CONFIG = qt warn_on debug |