diff options
| -rw-r--r-- | src/client/connectwindow/connectwindow.cpp | 26 | ||||
| -rw-r--r-- | src/client/net/serverdiscovery.cpp | 10 | ||||
| -rw-r--r-- | src/client/toolbar/toolbar.cpp | 22 | ||||
| -rw-r--r-- | src/client/vnc/vncserver.cpp | 24 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 66 | ||||
| -rw-r--r-- | src/server/net/client.cpp | 16 | ||||
| -rw-r--r-- | src/server/net/discoverylistener.cpp | 10 |
7 files changed, 80 insertions, 94 deletions
diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp index 1f6d549..a9f0996 100644 --- a/src/client/connectwindow/connectwindow.cpp +++ b/src/client/connectwindow/connectwindow.cpp @@ -17,7 +17,7 @@ #define UDPBUFSIZ 9000 #define SALT_LEN 18 -/***************************************************************************//** +/** * Initialize Connection Window. * @param parent */ @@ -57,14 +57,14 @@ ConnectWindow::ConnectWindow(QWidget *parent) : QWidget(parent) this->updateUserInterface(); } -/***************************************************************************//** +/** * @brief ConnectWindow::~ConnectWindow */ ConnectWindow::~ConnectWindow() {} -/***************************************************************************//** +/** * Handle changes in state and update window. * Also changing TextLabel which shows the user what the program is doing. */ @@ -123,7 +123,7 @@ void ConnectWindow::updateUserInterface() * Overrides */ -/***************************************************************************//** +/** * Called when a Qt timer fires; used for server discovery and * auto-hiding the connect dialog. */ @@ -139,7 +139,7 @@ void ConnectWindow::timerEvent(QTimerEvent* event) killTimer(event->timerId()); } -/***************************************************************************//** +/** * Handle incoming closeEvent and hide window. * @param e */ @@ -160,7 +160,7 @@ void ConnectWindow::doShow() raise(); } -/***************************************************************************//** +/** * Gives the keyboard input focus to the input line. * @param event */ @@ -171,7 +171,7 @@ void ConnectWindow::showEvent(QShowEvent* /* event */ ) _ui->lineEditName->setFocus(); } -/***************************************************************************//** +/** * Public function connect to session. * Check if currently connected to server, * if not --> connect to given sessionName. @@ -223,7 +223,7 @@ void ConnectWindow::DoDisconnect() } -/***************************************************************************//** +/** * Handle click on Connect/Disconnect button. * If already connected --> Stop/disconnect. * Else scanning for given sessionId. @@ -259,7 +259,7 @@ void ConnectWindow::setAvailableRooms(QList<Room> m) /* also add a pseudo-room "manual choice" */ _ui->comboBox_rooms->addItem(tr("Session Name..."), "manual_connection"); } -/***************************************************************************//** +/** * Handle click on Cancel/Hide Button. * Just hide the window. */ @@ -284,7 +284,7 @@ void ConnectWindow::onRoomSelection(int index) } } -/***************************************************************************//** +/** * @brief ConnectWindow::onServerDetected * @param host * @param port @@ -300,7 +300,7 @@ void ConnectWindow::onServerDetected(const QString& host, const quint16 port, co } -/***************************************************************************//** +/** * Handle connection state changes and update member variables describing state. * @param state */ @@ -326,7 +326,7 @@ void ConnectWindow::onConnectionStateChange(ConnectWindow::ConnectionState state } -/***************************************************************************//** +/** * If connection is closed set _pendingConnection = nullptr. * @param connection */ @@ -335,7 +335,7 @@ void ConnectWindow::onConnectionClosed(QObject* /* connection */ ) _pendingConnection = nullptr; } -/***************************************************************************//** +/** * @brief ConnectWindow::onConnectionDisconnected */ void ConnectWindow::onConnectionDisconnected(ServerConnection*) diff --git a/src/client/net/serverdiscovery.cpp b/src/client/net/serverdiscovery.cpp index 1b29398..b2d7605 100644 --- a/src/client/net/serverdiscovery.cpp +++ b/src/client/net/serverdiscovery.cpp @@ -7,7 +7,7 @@ #include <assert.h> -/***************************************************************************//** +/** * Ctor */ ServerDiscovery::ServerDiscovery(QObject *parent) @@ -37,14 +37,14 @@ ServerDiscovery::ServerDiscovery(QObject *parent) connect(&_discoveryTimer, SIGNAL(timeout()), this, SLOT(doDiscovery())); } -/***************************************************************************//** +/** * Dtor */ ServerDiscovery::~ServerDiscovery() { } -/***************************************************************************//** +/** * @brief start */ void ServerDiscovery::start(const QByteArray& sessionName, QString mgrIP) @@ -71,7 +71,7 @@ void ServerDiscovery::start(const QByteArray& sessionName, QString mgrIP) _discoveryTimer.start(); } -/***************************************************************************//** +/** * @brief stop */ void ServerDiscovery::stop() @@ -134,7 +134,7 @@ void ServerDiscovery::doDiscovery() } -/***************************************************************************//** +/** * Handle incoming service discovery packets. */ void ServerDiscovery::onUdpReadyRead() diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index a8e50e9..ddb55f1 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -18,7 +18,7 @@ #include "toolbar.h" #include "ui_toolbar.h" -/***************************************************************************//** +/** * @brief * * Does exact teh same as Toolbar::Toolbar(QWidget *parent) but additionally @@ -37,7 +37,7 @@ Toolbar::Toolbar(const QByteArray sessionName, QWidget *parent) clientApp->connectWindow()->connectToSession(sessionName, ""); } -/***************************************************************************//** +/** * @brief Constructor of the Toolbar. * * Does exact the same as Toolbar::Toolbar(QWidget *parent) but additionally @@ -62,7 +62,7 @@ Toolbar::Toolbar(const bool autoConnect, QWidget *parent) } } -/***************************************************************************//** +/** * @brief Constructor of the Toolbar. * * Constructs a widget which is a child of parent. @@ -208,7 +208,7 @@ void Toolbar::updateButtonVisibility() } } -/***************************************************************************//** +/** * Destructor of the Toolbar. Destroys the widget. All this widget's children * are deleted first. */ @@ -223,7 +223,7 @@ Toolbar::~Toolbar() * Override */ -/***************************************************************************//** +/** * This event is reimplemented to receive widget enter events. When the mouse * cursor enters the widget, the timer which, when timed out, hides * the Toolbar, gets stopped. @@ -310,7 +310,7 @@ QString Toolbar::identifyMgrIP() * Slots */ -/***************************************************************************//** +/** * A slot for changing the camera icon. This slot should be called permanently * if the vnc server is recording the screen. */ @@ -326,7 +326,7 @@ void Toolbar::cameraBlink() } } -/***************************************************************************//** +/** * A slot for the VncServerIsRunning signal. This slot will change the UI * according to the state fo the VncServer. * @param[in] port Indicates the state of the VncServer. @@ -347,7 +347,7 @@ void Toolbar::onVncServerIsRunning(int port) } } -/***************************************************************************//** +/** * A slot for the onDisconnected signal of the ConnectWindow. This slot will * change the UI according to the state fo the connection. */ @@ -367,7 +367,7 @@ void Toolbar::onDisconnected(ServerConnection* connection) QTimer::singleShot(1, this, SLOT(updateButtonVisibility())); } -/***************************************************************************//** +/** * A slot for the onConnected signal of the ConnectWindow. This slot will * change the UI according to the state of the connection and connect the * relevant signals and slots. @@ -393,7 +393,7 @@ void Toolbar::onConnected(ServerConnection* connection) connect(_vnc, SIGNAL(running(const bool, const int)), connection, SLOT(onVncViewerStartStop(const bool, const int))); } -/***************************************************************************//** +/** * */ void Toolbar::onDoDisconnect() @@ -459,7 +459,7 @@ void Toolbar::delayedShowBar() } } -/***************************************************************************//** +/** * @brief Toolbar::showAboutDialog */ void Toolbar::showAboutDialog() diff --git a/src/client/vnc/vncserver.cpp b/src/client/vnc/vncserver.cpp index a016f08..d819668 100644 --- a/src/client/vnc/vncserver.cpp +++ b/src/client/vnc/vncserver.cpp @@ -14,7 +14,7 @@ VncServer* VncServer::me = nullptr; -/***************************************************************************//** +/** * @brief VncServer::instance * @return */ @@ -25,7 +25,7 @@ VncServer* VncServer::instance() return me; } -/***************************************************************************//** +/** * @brief makePassword * @param len * @return @@ -38,19 +38,19 @@ static QString makePassword(int len = 10) return ret; } -/***************************************************************************//** +/** * @brief Ugly hack to get an el-cheapo platform independent sleep */ struct Sleeper : public QThread { static void msleep(unsigned long msecs) { QThread::msleep(msecs); } }; -/***************************************************************************//** +/** * @brief VncServer::VncServer */ VncServer::VncServer() : _process(nullptr), _port(0), _timerId(0) {} -/***************************************************************************//** +/** * @brief VncServer::~VncServer */ VncServer::~VncServer() {} @@ -67,7 +67,7 @@ QSharedPointer<QFile> VncServer::createPwFile(const QDir& dir) return file; } -/***************************************************************************//** +/** * @brief VncServer::start */ void VncServer::start() @@ -129,7 +129,7 @@ void VncServer::start() _process->start("x11vnc", args, QIODevice::ReadOnly); } -/***************************************************************************//** +/** * @brief VncServer::stop */ void VncServer::stop() @@ -162,7 +162,7 @@ void VncServer::stop() */ -/***************************************************************************//** +/** * @brief Timer event, currently only used to assume VNC server setup failed * after 3 seconds... * @param event @@ -180,7 +180,7 @@ void VncServer::timerEvent(QTimerEvent * /* event */ ) */ -/***************************************************************************//** +/** * @brief VncServer::onStdOut */ void VncServer::onStdOut() @@ -206,7 +206,7 @@ void VncServer::onStdOut() } } -/***************************************************************************//** +/** * @brief VncServer::onStdErr */ void VncServer::onStdErr() @@ -218,7 +218,7 @@ void VncServer::onStdErr() QByteArray data(_process->readAllStandardError()); } -/***************************************************************************//** +/** * @brief VncServer::onError * @param error */ @@ -228,7 +228,7 @@ void VncServer::onError(QProcess::ProcessError /* error */ ) emit started(0, _ropass, _rwpass); } -/***************************************************************************//** +/** * @brief VncServer::onFinished * @param exitCode */ diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 9a28a55..f59d040 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -57,7 +57,7 @@ using std::vector; using std::cout; using std::endl; -/***************************************************************************//** +/** * Initialize MainWindow and ListenServer. * @param ipListUrl * @param parent @@ -234,7 +234,7 @@ int distance(QPointF a, QPointF b) return int(sum); } -/***************************************************************************//** +/** * \brief: find the closest available frame. * * Closest: smallest Euclidean distance from center to center @@ -324,7 +324,7 @@ void MainWindow::placeFrameInFreeSlot(ConnectionFrame* frame, QPoint preferredPi frame->setGridPosition(bestPosition); } -/***************************************************************************//** +/** * Create new Frame. * Create new frame and add to current available frame list. * Also connect signals frameMoved() and clicked() with slots. @@ -346,7 +346,7 @@ ConnectionFrame* MainWindow::createFrame(const QString &computerId, const QPoint return cf; } -/***************************************************************************//** +/** * Tells the new client the current situation in class room. * Set the specific parameters like projection source or lock screen. * @param client @@ -365,7 +365,7 @@ void MainWindow::tellClientCurrentSituation(Client* client) } } -/***************************************************************************//** +/** * Returns connected client which belongs to given id. * Iterating over ConnectionFrames and comparing id to given id. * @param id @@ -382,7 +382,7 @@ Client* MainWindow::getClientFromId(int id) return nullptr; } -/***************************************************************************//** +/** * Return the Frame, which is currently beeing Tutor. * Iterating over all ConnectionFrames, and looking for flag _isTutor. * @return Frame with flag _isTutor = true, @@ -397,7 +397,7 @@ ConnectionFrame* MainWindow::getTutorFrame() return nullptr; } -/***************************************************************************//** +/** * Return the Frame, which is currently selected by user. * Iterating over all ConnectionFrame and looking for flag _isSelected. * @return Frame with flag _isSelected = true, @@ -416,7 +416,7 @@ ConnectionFrame* MainWindow::getSelectedFrame() * Overridden methods */ -/***************************************************************************//** +/** * Handle closeEvent. * If user calls closing MainWindow, close, else ignore. * @param e @@ -432,7 +432,7 @@ void MainWindow::closeEvent(QCloseEvent* e) } } -/***************************************************************************//** +/** * Change Event. * @param e */ @@ -463,7 +463,7 @@ AspectStatus checkAspectRatio(const QSize& frameSize, const QSize& gridSize) } -/***************************************************************************//** +/** * Resize event. * @param e */ @@ -553,7 +553,7 @@ void MainWindow::updateContextButtonStates() ui->action_TutorToAll->setEnabled(tutorOnline); } -/***************************************************************************//** +/** * Handle Mouse Release Event. * Check if click was inside the frame and if that is the case, set the selection of each connected * client to false. @@ -576,7 +576,7 @@ void MainWindow::mouseReleaseEvent(QMouseEvent* e) } } -/***************************************************************************//** +/** * @brief reset */ void MainWindow::reset(bool lock) @@ -603,7 +603,7 @@ void MainWindow::reset(bool lock) */ -/***************************************************************************//** +/** * Place frame to from user specified position. Should be called when a * connectionFrame is dropped during the "drag-n-drop". */ @@ -616,7 +616,7 @@ void MainWindow::onPlaceFrame(ConnectionFrame* connectionFrame) //resizeEvent(nullptr); } -/***************************************************************************//** +/** * Mark given frame after it was clicked on. * @param frame */ @@ -636,7 +636,7 @@ void MainWindow::onFrameClicked(ConnectionFrame* frame) updateContextButtonStates(); } -/***************************************************************************//** +/** * Show session name, after it was clicked on. */ void MainWindow::onSessionNameClick() @@ -644,7 +644,7 @@ void MainWindow::onSessionNameClick() _sessionNameWindow->show((serverApp->sessionName())); } -/***************************************************************************//** +/** * Update session name. */ void MainWindow::onSessionNameUpdate() @@ -678,7 +678,7 @@ void MainWindow::onSessionNameUpdate() } } -/***************************************************************************//** +/** * @brief MainWindow::startVncServerIfNecessary * @param from */ @@ -829,7 +829,7 @@ QRect MainWindow::calcFrameGeometry(ConnectionFrame* frame) const return QRect(pos.x() * w, pos.y() * h, w * clientSize.width(), h * clientSize.height()); } -/***************************************************************************//** +/** * Display popup which explains possible actions about the buttons. */ void MainWindow::onButtonHelp() @@ -837,7 +837,7 @@ void MainWindow::onButtonHelp() _helpWindow->show(); } -/***************************************************************************//** +/** * Handle projection from tutor to all. * Get the client who is tutor and set the projectionSource of all * clients, except the tutor ones, to false. @@ -870,7 +870,7 @@ void MainWindow::onButtonTutorToAll() } } -/***************************************************************************//** +/** * Handle the projection from Tutor to specific student. * Set the client who is tutor as from and the selected client as to. */ @@ -908,7 +908,7 @@ void MainWindow::onButtonTutorToStudent() } } -/***************************************************************************//** +/** * Handle projection from one student to tutor. */ void MainWindow::onButtonStudentToTutor() @@ -917,7 +917,7 @@ void MainWindow::onButtonStudentToTutor() } -/***************************************************************************//** +/** * Handle projection from one student to tutor, lock everyone else. */ void MainWindow::onButtonStudentToTutorExclusive() @@ -974,7 +974,7 @@ void MainWindow::vncOneOnOne(bool exclusive) } } -/***************************************************************************//** +/** * Handle Button StopProjection. * Set ProjectionSource of each client to false, stop the active VNC Server * and the active VNC Client(s) and unlock all screens. @@ -985,7 +985,7 @@ void MainWindow::onButtonStopProjection() reset(); } -/***************************************************************************//** +/** * Handle button to lock or unlock screens of client(s). * If already locked, do nothing, else lock or unlock the clients, except the * tutor and the manager running machine. @@ -1026,7 +1026,7 @@ void MainWindow::onButtonLockSingle() } } -/***************************************************************************//** +/** * On button exit, close application. */ void MainWindow::onButtonExit() @@ -1034,7 +1034,7 @@ void MainWindow::onButtonExit() this->close(); } -/***************************************************************************//** +/** * Handle button to set specific client as tutor. * Unset active tutor and set selected client, if not inactive, as new tutor. */ @@ -1063,7 +1063,7 @@ void MainWindow::onButtonSetAsTutor() updateContextButtonStates(); } -/***************************************************************************//** +/** * Handle from ListenServer signaled new client connection. * @param client */ @@ -1073,7 +1073,7 @@ void MainWindow::onClientConnected(Client* client) connect(client, SIGNAL(authenticated(Client*)), this, SLOT(onClientAuthenticated(Client*))); } -/***************************************************************************//** +/** * Authenticate new Client client. * Check if incoming client ip already exists, * if yes --> return. @@ -1119,7 +1119,7 @@ void MainWindow::onClientAuthenticating(Client* client, ClientLogin* request) request->name = check; } -/***************************************************************************//** +/** * New client was authenticated, make several checks. * Check if new clients ip already exists, * if yes --> not necessary to create new clientFrame. @@ -1155,7 +1155,7 @@ void MainWindow::onClientAuthenticated(Client* client) clientCountChanged(); } -/***************************************************************************//** +/** * Handle if VNC Server State has changed. * Check if VNC server has been started/stopped on some client and start VNC server/reset pending * VNC projection information. @@ -1206,7 +1206,7 @@ void MainWindow::onVncServerStateChange(Client* client) } } -/***************************************************************************//** +/** * Handle VNC client state change. * Check if any vnc client is in use, and if that is not the case, stop VNC Server. * @param client @@ -1247,7 +1247,7 @@ void MainWindow::onVncClientStateChange(Client* client) } } -/***************************************************************************//** +/** * DisableButtons. */ void MainWindow::disableButtons() @@ -1258,7 +1258,7 @@ void MainWindow::disableButtons() } } -/***************************************************************************//** +/** * EnableButtons. */ void MainWindow::enableButtons() diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index ad101a1..e11a3e7 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -16,7 +16,6 @@ #define CHALLENGE_LEN 20 int Client::_clientIdCounter = 0; -/******************************************************************************/ Client::Client(QTcpSocket* socket) : _socket(socket) { assert(socket != nullptr); @@ -56,14 +55,12 @@ Client::Client(QTcpSocket* socket) : _socket(socket) _pingTimeout = QDateTime::currentMSecsSinceEpoch() + PING_TIMEOUT_MS; } -/******************************************************************************/ Client::~Client() { qDebug() << "*** Client" << _host << " destroyed."; _socket->deleteLater(); } -/******************************************************************************/ void Client::timerEvent(QTimerEvent* event) { if (event->timerId() == _timerPingTimeout) { @@ -81,7 +78,6 @@ void Client::timerEvent(QTimerEvent* event) killTimer(event->timerId()); } -/******************************************************************************/ void Client::sendMessage(NetworkMessage& message) { if (_socket->state() != QAbstractSocket::ConnectedState) @@ -92,7 +88,6 @@ void Client::sendMessage(NetworkMessage& message) } } -/******************************************************************************/ void Client::removeAttentionInternal() { NetworkMessage msg; @@ -103,7 +98,6 @@ void Client::removeAttentionInternal() emit stateChanged(); } -/******************************************************************************/ void Client::requestThumb(const QSize& size) { if (_socket->state() != QAbstractSocket::ConnectedState) { @@ -117,7 +111,6 @@ void Client::requestThumb(const QSize& size) msgTmb.writeMessage(_socket); } -/******************************************************************************/ void Client::onDataArrival() { // @@ -141,7 +134,6 @@ void Client::onDataArrival() } } -/******************************************************************************/ void Client::handleMsg() { _pingTimeout = QDateTime::currentMSecsSinceEpoch() + PING_TIMEOUT_MS; @@ -263,7 +255,6 @@ void Client::handleMsg() } -/******************************************************************************/ void Client::startVncServer() { NetworkMessage msg; @@ -272,7 +263,6 @@ void Client::startVncServer() sendMessage(msg); } -/******************************************************************************/ void Client::stopVncServer() { NetworkMessage msg; @@ -281,7 +271,6 @@ void Client::stopVncServer() sendMessage(msg); } -/******************************************************************************/ void Client::startVncClient(const Client * const to) { if (_projectionSource == to->_id) @@ -299,7 +288,6 @@ void Client::startVncClient(const Client * const to) sendMessage(msg); } -/******************************************************************************/ void Client::stopVncClient() { if (_isActiveVncClient) { @@ -310,7 +298,7 @@ void Client::stopVncClient() _desiredSource = NO_SOURCE; } -/***************************************************************************//** +/** * Checks if client and manager runs on same machine. * @return Return true, if pvsmanager is running on client. */ @@ -323,7 +311,6 @@ bool Client::isManagerMachine() return false; } -/******************************************************************************/ void Client::lockScreen(bool lock) { if (_isTutor || isManagerMachine()) { @@ -339,7 +326,6 @@ void Client::lockScreen(bool lock) emit stateChanged(); } -/******************************************************************************/ void Client::disconnect() { qDebug("*** Client %s disconnected.", qPrintable(_socket->peerAddress().toString())); diff --git a/src/server/net/discoverylistener.cpp b/src/server/net/discoverylistener.cpp index cfeef82..76c0f52 100644 --- a/src/server/net/discoverylistener.cpp +++ b/src/server/net/discoverylistener.cpp @@ -26,7 +26,7 @@ // +++ static ++++ hash ip address +++ -/***************************************************************************//** +/** * @brief DiscoveryListener::DiscoveryListener */ DiscoveryListener::DiscoveryListener() : @@ -40,14 +40,14 @@ DiscoveryListener::DiscoveryListener() : startTimer((SPAM_MODERATE_AT_ONCE * SPAM_MODERATE_INTERVAL) / SD_PACKET_TABLE_SIZE + 1); } -/***************************************************************************//** +/** * @brief DiscoveryListener::~DiscoveryListener */ DiscoveryListener::~DiscoveryListener() { } -/***************************************************************************//** +/** * @brief hash * @param host * @return @@ -95,7 +95,7 @@ static quint16 hash(const QHostAddress& host) * Overrides */ -/***************************************************************************//** +/** * @brief Decrease packet counters per source IP in our "spam protection" table. * @param event */ @@ -116,7 +116,7 @@ void DiscoveryListener::timerEvent(QTimerEvent* /* event */ ) * Slots */ -/***************************************************************************//** +/** * @brief Incoming UDP packet on service discovery port - handle. */ void DiscoveryListener::onReadyRead() |