summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--x11/ipc/client/ocopclient.cpp4
-rw-r--r--x11/ipc/server/ocopserver.cpp10
-rw-r--r--x11/ipc/server/ocopserver.pro1
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
@@ -107,7 +107,7 @@ bool OCOPClient::isRegistered( const QCString& chan ) const{
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();
@@ -144,7 +144,7 @@ void OCOPClient::startUP() {
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
@@ -134,8 +134,6 @@ 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) );
@@ -153,7 +151,7 @@ void OCopServer::newOnClient( int fd ) {
/*
* OCOPHead
*/
- qWarning("data %s %d", bug, rea );
+ //qWarning("data %s %d", &bug, rea );
/*
* Check the magic
@@ -174,9 +172,11 @@ 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 );
@@ -285,6 +285,7 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) {
case OCOPPacket::Signal:
break;
case OCOPPacket::IsRegistered:
+ qWarning("IsRegistered");
isRegistered( packet.channel(), sourceFD );
break;
};
@@ -340,6 +341,7 @@ void OCopServer::delChannel( const QCString& channel,
}
}
void OCopServer::isRegistered( const QCString& channel, int fd) {
+ qWarning("isRegistered");
OCOPHead head;
QCString func(2);
@@ -369,7 +371,7 @@ 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;
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,4 +1,5 @@
TEMPLATE = app
+DESTDIR = $(OPIEDIR)/bin
CONFIG = qt warn_on debug
#CONFIG = qt warn_on release
HEADERS = ../common/ocoppacket.h ocopclient.h ocopserver.h