Implement Network-wide Configuration Interface for Multicast File Transfer

3 files changed, 87 insertions, 0 deletions

diff --git a/src/net/mcast/McastConfiguration.h b/src/net/mcast/McastConfiguration.h
index 6884036..53f7a54 100644
--- a/src/net/mcast/McastConfiguration.h
+++ b/src/net/mcast/McastConfiguration.h
@@ -166,6 +166,23 @@ public:
 		emit changed();
 	}
 
+	McastConfiguration& operator=(McastConfiguration const& source)
+	{
+		if(this != &source)
+		{
+			_multicastInterface = source._multicastInterface;
+			_multicastAddress = source._multicastAddress;
+			_multicastRate = source._multicastRate;
+			_multicastSPort = source._multicastSPort;
+			_multicastDPort = source._multicastDPort;
+			_multicastWinSize = source._multicastWinSize;
+			_multicastMTU = source._multicastMTU;
+			_multicastUDPPortBase = source._multicastUDPPortBase;
+			_multicastUseUDP = source._multicastUseUDP;
+		}
+		return *this;
+	}
+
 	void loadFrom(QSettings* settings, char const* group = 0);
 	void writeTo(QSettings* settings, char const* group = 0) const;
 
diff --git a/src/net/pvsListenServer.cpp b/src/net/pvsListenServer.cpp
index f21303e..1c1387b 100644
--- a/src/net/pvsListenServer.cpp
+++ b/src/net/pvsListenServer.cpp
@@ -21,9 +21,13 @@
 #include "pvsClientConnection.h"
 #include "src/util/consoleLogger.h"
 #include <QtNetwork/QSslSocket>
+#include <QBuffer>
+#include <QByteArray>
+#include <QSettings>
 #include "SslServer.h"
 #include <cassert>
 //#define verbose
+#include "mcast/McastConfiguration.h"
 
 // Create listener
 PVSListenServer::PVSListenServer(int port, int clients)
@@ -36,6 +40,7 @@ PVSListenServer::PVSListenServer(int port, int clients)
     else
         _clientsMax = clients;
     _port = port;
+    _mcastConfig = 0;
     init();
 
 }
@@ -178,6 +183,7 @@ void PVSListenServer::onClientConnected(PVSClientConnection* connected)
 {
     connected->setServerID(_id);
     connected->setID(generateID());
+    connected->push_back_send(mcastConfigMessage());
 }
 
 void PVSListenServer::onClientDisconnected(PVSClientConnection* disconnected)
@@ -227,6 +233,11 @@ PVSClientConnection* PVSListenServer::getConnectionFromID(int id)
 // Initialize listening socket
 bool PVSListenServer::init()
 {
+	if (_mcastConfig)
+		delete _mcastConfig;
+	_mcastConfig = new McastConfiguration(this);
+	loadMcastConfig();
+
     if (_listenSocket != NULL)
         shutdown();
 
@@ -306,3 +317,52 @@ bool PVSListenServer::isListening()
 {
     return _listenSocket != NULL && _listenSocket->isListening();
 }
+
+void PVSListenServer::loadMcastConfig()
+{
+	QSettings settings;
+	_mcastConfig->loadFrom(&settings, "multicast-filetransfer");
+}
+
+void PVSListenServer::saveMcastConfig()
+{
+	QSettings settings;
+	_mcastConfig->writeTo(&settings, "multicast-filetransfer");
+	settings.sync();
+}
+
+PVSMsg PVSListenServer::mcastConfigMessage()
+{
+	// If anything is changed here, do not forget to
+	// 1. assign a new version number
+	// 2. adapt PVS::onCommand(PVSMsg) in pvs.cpp
+	QByteArray ba;
+	QDataStream strm(&ba, QIODevice::WriteOnly);
+	strm << (quint16)1 // version
+			<< _mcastConfig->multicastAddress()
+			<< _mcastConfig->multicastUDPPortBase()
+			<< _mcastConfig->multicastDPort()
+			<< _mcastConfig->multicastSPort()
+			<< _mcastConfig->multicastMTU()
+			<< _mcastConfig->multicastWinSize()
+			<< _mcastConfig->multicastRate()
+			<< _mcastConfig->multicastUseUDP();
+
+	QByteArray b64 = ba.toBase64();
+	QString message = QString::fromAscii(b64.constData(), b64.length());
+	PVSMsg msg(PVSCOMMAND, "MCASTFTCONFIG", message);
+	return msg;
+}
+
+void PVSListenServer::multicastReconfigure(McastConfiguration const* source)
+{
+	_mcastConfig->multicastAddress(source->multicastAddress());
+	*_mcastConfig = *source;
+	saveMcastConfig();
+	sendToAll(mcastConfigMessage());
+}
+
+McastConfiguration const* PVSListenServer::getMulticastConfiguration()
+{
+	return _mcastConfig;
+}
diff --git a/src/net/pvsListenServer.h b/src/net/pvsListenServer.h
index ab021c7..90d2a77 100644
--- a/src/net/pvsListenServer.h
+++ b/src/net/pvsListenServer.h
@@ -10,6 +10,7 @@ class SslServer;
 
 class PVSClientConnection;
 class PVSMsg;
+class McastConfiguration;
 
 class PVSListenServer : public QObject
 {
@@ -40,6 +41,12 @@ private:
     bool init();
     unsigned int generateID();
 
+    McastConfiguration*	_mcastConfig;
+
+    void loadMcastConfig();
+    void saveMcastConfig();
+    PVSMsg mcastConfigMessage();
+
 protected:
     void timerEvent(QTimerEvent *event);
 
@@ -60,6 +67,9 @@ public:
     bool disconnectClient(PVSClientConnection* delinquent);
     void onConnectionRemoved(PVSClientConnection* delinquent);
 
+    void multicastReconfigure(McastConfiguration const* source);
+    McastConfiguration const* getMulticastConfiguration();
+
     std::list<PVSClientConnection*>* getClientListPtr()
     {
         return &_clients;