author | zecke <zecke> | 2003-02-05 08:54:58 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-05 08:54:58 (UTC) |
commit | bbb3690f12191763a407e6a0edd521113b3c25ac (patch) (unidiff) | |
tree | 39f90d71c7f085f5722382db4a5577bbda2e1618 /x11/ipc/client | |
parent | 97b96e141fca844317e59ca5b99c1bf5fa52b1f0 (diff) | |
download | opie-bbb3690f12191763a407e6a0edd521113b3c25ac.zip opie-bbb3690f12191763a407e6a0edd521113b3c25ac.tar.gz opie-bbb3690f12191763a407e6a0edd521113b3c25ac.tar.bz2 |
Fix the IPC server and client
registering channel is done locally with refcounts
if the channel is already registered globally
Fix some sizes to allow proper communication..
-rw-r--r-- | x11/ipc/client/ocopclient.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/x11/ipc/client/ocopclient.cpp b/x11/ipc/client/ocopclient.cpp index 6085481..91827e7 100644 --- a/x11/ipc/client/ocopclient.cpp +++ b/x11/ipc/client/ocopclient.cpp | |||
@@ -98,11 +98,16 @@ OCOPPacket OCOPClient::packet() const{ | |||
98 | OCOPHead head; | 98 | OCOPHead head; |
99 | memset(&head, 0, sizeof(head) ); | 99 | memset(&head, 0, sizeof(head) ); |
100 | read(m_socket, &head, sizeof(head) ); | 100 | read(m_socket, &head, sizeof(head) ); |
101 | if ( head.magic == 47 ) { | 101 | if ( head.magic == 47 ) { |
102 | qWarning("Client:Magic Match"); | ||
103 | chan = QCString( head.chlen+1); | ||
104 | func = QCString( head.funclen+1 ); | ||
105 | ar = QByteArray( head.datalen); | ||
102 | read(m_socket, chan.data(), head.chlen ); | 106 | read(m_socket, chan.data(), head.chlen ); |
103 | read(m_socket, func.data(), head.funclen ); | 107 | read(m_socket, func.data(), head.funclen ); |
104 | read(m_socket, ar.data(), head.datalen ); | 108 | read(m_socket, ar.data(), head.datalen ); |
109 | qWarning("Client:%d %s",head.chlen,chan.data() ); | ||
105 | } | 110 | } |
106 | OCOPPacket pack(head.type, chan, func, ar ); | 111 | OCOPPacket pack(head.type, chan, func, ar ); |
107 | return pack; | 112 | return pack; |
108 | } | 113 | } |
@@ -111,15 +116,17 @@ OCOPPacket OCOPClient::packet() const{ | |||
111 | * so we send and go on read | 116 | * so we send and go on read |
112 | * this will be blocked | 117 | * this will be blocked |
113 | */ | 118 | */ |
114 | bool OCOPClient::isRegistered( const QCString& chan ) const{ | 119 | bool OCOPClient::isRegistered( const QCString& chan ) const{ |
120 | qWarning("OCopClient::isRegistered %s", chan.data() ); | ||
115 | /* should I disconnect the socket notfier? */ | 121 | /* should I disconnect the socket notfier? */ |
116 | OCOPPacket packe(OCOPPacket::IsRegistered, chan ); | 122 | OCOPPacket packe(OCOPPacket::IsRegistered, chan ); |
117 | OCOPHead head = packe.head(); | 123 | OCOPHead head = packe.head(); |
118 | write(m_socket, &head, sizeof(head) ); | 124 | write(m_socket, &head, sizeof(head) ); |
119 | write(m_socket, chan.data(), chan.size() ); | 125 | write(m_socket, chan.data(), chan.size() ); |
120 | /* block */ | 126 | /* block */ |
121 | OCOPPacket pack = packet(); | 127 | OCOPPacket pack = packet(); |
128 | qWarning("unblock %s %s", pack.channel().data(), chan.data() ); | ||
122 | 129 | ||
123 | /* connect here again */ | 130 | /* connect here again */ |
124 | if ( pack.channel() == chan ) { | 131 | if ( pack.channel() == chan ) { |
125 | QCString func = pack.header(); | 132 | QCString func = pack.header(); |
@@ -129,8 +136,9 @@ bool OCOPClient::isRegistered( const QCString& chan ) const{ | |||
129 | 136 | ||
130 | return false; | 137 | return false; |
131 | }; | 138 | }; |
132 | void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArray& arr ) { | 139 | void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArray& arr ) { |
140 | qWarning("ClientSending %s %s", chan.data(), fu.data() ); | ||
133 | OCOPPacket pack(OCOPPacket::Call, chan, fu, arr ); | 141 | OCOPPacket pack(OCOPPacket::Call, chan, fu, arr ); |
134 | call( pack ); | 142 | call( pack ); |
135 | } | 143 | } |
136 | void OCOPClient::addChannel(const QCString& channel) { | 144 | void OCOPClient::addChannel(const QCString& channel) { |