summaryrefslogtreecommitdiff
path: root/x11/ipc/server/ocopserver.cpp
Side-by-side diff
Diffstat (limited to 'x11/ipc/server/ocopserver.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--x11/ipc/server/ocopserver.cpp10
1 files changed, 6 insertions, 4 deletions
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 ) );