tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure we don't broadcast more than once at the same time.

Browse source 
Race conditions might happen because two links will be created.
This commit is contained in:
Albert Vaca 2016-06-02 12:18:51 +02:00
parent 778d0d3d2e
commit 7a0bb09353
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/backends/lan/lanlinkprovider.cpp
View file

@ -48,6 +48,10 @@ LanLinkProvider::LanLinkProvider(bool testMode)
{
mTcpPort = 0;
combineBroadcastsTimer.setInterval(0); // increase this if waiting a single event-loop iteration is not enough
combineBroadcastsTimer.setSingleShot(true);
connect(&combineBroadcastsTimer, SIGNAL(timeout()), this, SLOT(broadcastToNetwork()));
connect(&mUdpSocket, SIGNAL(readyRead()), this, SLOT(newUdpConnection()));
mServer = new Server(this);
@ -56,6 +60,7 @@ LanLinkProvider::LanLinkProvider(bool testMode)
//Detect when a network interface changes status, so we announce ourelves in the new network
QNetworkConfigurationManager* networkManager = new QNetworkConfigurationManager(this);
connect(networkManager, &QNetworkConfigurationManager::configurationChanged, this, &LanLinkProvider::onNetworkConfigurationChanged);
}
void LanLinkProvider::onNetworkConfigurationChanged(const QNetworkConfiguration &config)
@ -99,9 +104,20 @@ void LanLinkProvider::onStop()
mServer->close();
}
//I'm in a new network, let's be polite and introduce myself
void LanLinkProvider::onNetworkChange()
{
if (combineBroadcastsTimer.isActive()) {
qCDebug(KDECONNECT_CORE()) << "Preventing duplicate broadcasts";
return;
}
combineBroadcastsTimer.start();
}
//I'm in a new network, let's be polite and introduce myself
void LanLinkProvider::broadcastToNetwork()
{
if (!mServer->isListening()) {
//Not started
return;

2
core/backends/lan/lanlinkprovider.h
View file

@ -63,6 +63,7 @@ private Q_SLOTS:
void deviceLinkDestroyed(QObject* destroyedDeviceLink);
void sslErrors(const QList<QSslError>& errors);
void sslErrorsLogButIgnore(const QList<QSslError>& errors);
void broadcastToNetwork();
private:
static void configureSocket(QSslSocket* socket);
@ -86,6 +87,7 @@ private:
QMap<QSslSocket*, PendingConnect> receivedIdentityPackages;
QNetworkConfiguration m_lastConfig;
const bool mTestMode;
QTimer combineBroadcastsTimer;
};
#endif