author | zecke <zecke> | 2002-10-16 16:53:43 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-16 16:53:43 (UTC) |
commit | ef5700ad4eda47e98b76467fa80dd6cd838c6391 (patch) (unidiff) | |
tree | dcd5d051824689cab42f036895959483fb5e690b /x11/ipc/server/ocopserver.cpp | |
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
Diffstat (limited to 'x11/ipc/server/ocopserver.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | x11/ipc/server/ocopserver.cpp | 10 |
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 | |||
@@ -134,8 +134,6 @@ int OCopServer::accept() { | |||
134 | return ::accept( m_serverfd, (struct sockaddr*)&m_address, &m_adrlaenge ); | 134 | return ::accept( m_serverfd, (struct sockaddr*)&m_address, &m_adrlaenge ); |
135 | } | 135 | } |
136 | void OCopServer::newOnClient( int fd ) { | 136 | void OCopServer::newOnClient( int fd ) { |
137 | int bug[4096]; | ||
138 | //qWarning("new stuff for client on fd %d", fd ); | ||
139 | errno = 0; | 137 | errno = 0; |
140 | OCOPHead head; | 138 | OCOPHead head; |
141 | memset(&head, 0, sizeof(head) ); | 139 | memset(&head, 0, sizeof(head) ); |
@@ -153,7 +151,7 @@ void OCopServer::newOnClient( int fd ) { | |||
153 | /* | 151 | /* |
154 | * OCOPHead | 152 | * OCOPHead |
155 | */ | 153 | */ |
156 | qWarning("data %s %d", bug, rea ); | 154 | //qWarning("data %s %d", &bug, rea ); |
157 | 155 | ||
158 | /* | 156 | /* |
159 | * Check the magic | 157 | * Check the magic |
@@ -174,9 +172,11 @@ void OCopServer::newOnClient( int fd ) { | |||
174 | /* | 172 | /* |
175 | * we do not check for errors | 173 | * we do not check for errors |
176 | */ | 174 | */ |
175 | qWarning("read "); | ||
177 | int s = read(fd, channel.data(), head.chlen ); | 176 | int s = read(fd, channel.data(), head.chlen ); |
178 | s = read(fd, func.data(), head.funclen ); | 177 | s = read(fd, func.data(), head.funclen ); |
179 | s = read(fd, data.data(), head.datalen ); | 178 | s = read(fd, data.data(), head.datalen ); |
179 | qWarning("read"); | ||
180 | 180 | ||
181 | /* debug output */ | 181 | /* debug output */ |
182 | qWarning("channel %s %d", channel.data(), head.chlen ); | 182 | qWarning("channel %s %d", channel.data(), head.chlen ); |
@@ -285,6 +285,7 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { | |||
285 | case OCOPPacket::Signal: | 285 | case OCOPPacket::Signal: |
286 | break; | 286 | break; |
287 | case OCOPPacket::IsRegistered: | 287 | case OCOPPacket::IsRegistered: |
288 | qWarning("IsRegistered"); | ||
288 | isRegistered( packet.channel(), sourceFD ); | 289 | isRegistered( packet.channel(), sourceFD ); |
289 | break; | 290 | break; |
290 | }; | 291 | }; |
@@ -340,6 +341,7 @@ void OCopServer::delChannel( const QCString& channel, | |||
340 | } | 341 | } |
341 | } | 342 | } |
342 | void OCopServer::isRegistered( const QCString& channel, int fd) { | 343 | void OCopServer::isRegistered( const QCString& channel, int fd) { |
344 | qWarning("isRegistered"); | ||
343 | OCOPHead head; | 345 | OCOPHead head; |
344 | QCString func(2); | 346 | QCString func(2); |
345 | 347 | ||
@@ -369,7 +371,7 @@ void OCopServer::isRegistered( const QCString& channel, int fd) { | |||
369 | QValueList<int> OCopServer::clients( const QCString& channel ) { | 371 | QValueList<int> OCopServer::clients( const QCString& channel ) { |
370 | return m_channels[channel]; | 372 | return m_channels[channel]; |
371 | } | 373 | } |
372 | void OCopServer::call( const OCOPPacket& p, int fd ) { | 374 | void OCopServer::call( const OCOPPacket& p, int ) { |
373 | QValueList<int> cli = clients( p.channel() ); | 375 | QValueList<int> cli = clients( p.channel() ); |
374 | QValueList<int>::Iterator it; | 376 | QValueList<int>::Iterator it; |
375 | 377 | ||