backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-08 14:41:57 +08:00
Code Issues Projects Releases Wiki Activity

increased ipc message length.

Browse Source
This commit is contained in:
Nick Bolton
2012-07-03 17:33:19 +00:00
parent 7d5fbde71d
commit 0537bbdfad
6 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/src/IpcClient.cpp
View File

@@ -44,14 +44,15 @@ void IpcClient::read()
switch (codeBuf[0]) {
case kIpcLogLine: {
char lenBuf[1];
stream.readRawData(lenBuf, 1);
// TODO: qt must have a built in way of converting bytes to int.
char lenBuf[2];
stream.readRawData(lenBuf, 2);
int len = (lenBuf[0] << 8) + lenBuf[1];
char* data = new char[lenBuf[0] + 1];
stream.readRawData(data, lenBuf[0]);
data[(int)lenBuf[0]] = 0;
QString s(data);
char* data = new char[len];
stream.readRawData(data, len);
QString s = QString::fromUtf8(data, len);
readLogLine(s);
}
break;
@@ -60,7 +61,7 @@ void IpcClient::read()
void IpcClient::error(QAbstractSocket::SocketError error)
{
errorMessage("ERROR: Could not connect to background service.");
errorMessage(QString("ERROR: could not connect to background service, code=%1").arg(error));
}
void IpcClient::write(unsigned char code, unsigned char length, const char* data)
@@ -73,9 +74,12 @@ void IpcClient::write(unsigned char code, unsigned char length, const char* data
switch (code) {
case kIpcCommand: {
char lenBuf[1];
lenBuf[0] = length;
stream.writeRawData(lenBuf, 1);
// TODO: qt must have a built in way of converting int to bytes.
char lenBuf[2];
lenBuf[0] = (length >> 8) & 0xff;
lenBuf[1] = length & 0xff;
stream.writeRawData(lenBuf, 2);
stream.writeRawData(data, length);
}
break;

2
src/gui/src/MainWindow.cpp
View File

@@ -93,7 +93,7 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
connect(&m_IpcClient, SIGNAL(readLogLine(const QString&)), this, SLOT(appendLog(const QString&)));
connect(&m_IpcClient, SIGNAL(errorMessage(const QString&)), this, SLOT(appendLog(const QString&)));
m_IpcClient.connectToHost();
appendLog("INFO: Connecting to background service...");
appendLog("INFO: connecting to background service...");
}
}