Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added security methods to prevent SIGPIPE termination.

Browse Source
This commit is contained in:
Andreas 2013-01-28 14:21:04 +01:00
parent 4ed516ad1f
commit a40aa6fb8d
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/networkremote/remoteclient.cpp
View File

@ -23,6 +23,8 @@
#include <QDataStream>
#include <QSettings>
#include <signal.h>
RemoteClient::RemoteClient(Application* app, QTcpSocket* client)
: app_(app),
client_(client)
@ -34,6 +36,11 @@ RemoteClient::RemoteClient(Application* app, QTcpSocket* client)
// Connect to the slot IncomingData when receiving data
connect(client, SIGNAL(readyRead()), this, SLOT(IncomingData()));
connect(client, SIGNAL(disconnected()), this, SLOT(Disconnected()));
connect(client, SIGNAL(error(QAbstractSocket::SocketError)),
this, SLOT(Error(QAbstractSocket::SocketError)));
signal(SIGPIPE, SIG_IGN);
// Check if we use auth code
QSettings s;
@ -110,14 +117,27 @@ void RemoteClient::SendData(pb::remote::Message *msg) {
std::string data = msg->SerializeAsString();
// write the length of the data first
QDataStream s(client_);
s << qint32(data.length());
s.writeRawData(data.data(), data.length());
if (client_->isWritable()) {
QDataStream s(client_);
s << qint32(data.length());
s.writeRawData(data.data(), data.length());
// Flush data
client_->flush();
// Flush data
client_->flush();
} else {
client_->close();
}
}
QAbstractSocket::SocketState RemoteClient::State() {
return client_->state();
}
void RemoteClient::Disconnected() {
qLog(Info) << "Client Disconnected";
}
void RemoteClient::Error(QAbstractSocket::SocketError socket_error) {
qLog(Info) << "Client Error:" << socket_error;
client_->close();
}

2
src/networkremote/remoteclient.h
View File

@ -26,6 +26,8 @@ signals:
private:
void ParseMessage(const QByteArray& data);
void DisconnectClient();
void Disconnected();
void Error(QAbstractSocket::SocketError);
Application* app_;