3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-06-19 03:01:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

moved stream into synergy namespace (to prevent naming collision in win libs)

Browse source 
implemented ipc "hello" message (to identify client type)
integ tests working for hello message, but use of ipc in main program has problem with events.
This commit is contained in:
Nick Bolton 2012-07-05 18:05:35 +00:00
parent 4e268760b3
commit 3d6551f708
57 changed files with 367 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/lib/ipc/CIpcServerProxy.cpp
View file

@ -25,19 +25,21 @@
CEvent::Type CIpcServerProxy::s_messageReceivedEvent = CEvent::kUnknown;
CIpcServerProxy::CIpcServerProxy(IStream& stream) :
CIpcServerProxy::CIpcServerProxy(synergy::IStream& stream) :
m_stream(stream)
{
EVENTQUEUE->adoptHandler(m_stream.getInputReadyEvent(),
stream.getEventTarget(),
new TMethodEventJob<CIpcServerProxy>(
this, &CIpcServerProxy::handleData, nullptr));
this, &CIpcServerProxy::handleData));
}
CIpcServerProxy::~CIpcServerProxy()
{
EVENTQUEUE->removeHandler(m_stream.getInputReadyEvent(),
m_stream.getEventTarget());
m_stream.close();
}
void
@ -48,13 +50,17 @@ CIpcServerProxy::handleData(const CEvent&, void*)
while (n != 0) {
CIpcMessage* m = new CIpcMessage();
m->m_type = code[1];
m->m_type = code[0];
LOG((CLOG_DEBUG "ipc server proxy read: %d", code[0]));
switch (code[0]) {
LOG((CLOG_DEBUG "ipc server proxy read: %d", m->m_type));
switch (m->m_type) {
case kIpcLogLine:
m->m_data = parseLogLine();
break;
case kIpcShutdown:
// no data.
break;
default:
delete m;
@ -79,17 +85,21 @@ CIpcServerProxy::send(const CIpcMessage& message)
m_stream.write(code, 1);
switch (message.m_type) {
case kIpcCommand: {
CString* s = (CString*)message.m_data;
const char* data = s->c_str();
int len = strlen(data);
CProtocolUtil::writef(&m_stream, "%2i", len);
m_stream.write(data, len);
}
case kIpcHello:
m_stream.write(message.m_data, 1);
break;
case kIpcCommand: {
CString* s = (CString*)message.m_data;
const char* data = s->c_str();
int len = strlen(data);
CProtocolUtil::writef(&m_stream, "%2i", len);
m_stream.write(data, len);
break;
}
default:
LOG((CLOG_ERR "message not supported: %d", message.m_type));
break;