From 04931d80789a860c912358fd8c706585bb82a613 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Tue, 20 May 2014 16:05:02 +0200
Subject: Make vnc credentials completely private to client. Make VNCConnect
 work client-internally only. Drop Client::computerID() (equivalent to
 Client::ip() XD )

---
 src/server/net/client.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/server/net/client.cpp')

diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 9422e81..9bee319 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -298,7 +298,6 @@ void Client::handleMsg()
 /******************************************************************************/
 void Client::startVncServer()
 {
-	_vncPort = 0;
 	NetworkMessage msg;
 	msg.setField(_ID, _VNCSERVER);
 	msg.setField(_ENABLE, __TRUE);
@@ -315,25 +314,23 @@ void Client::stopVncServer()
 }
 
 /******************************************************************************/
-void Client::stopVncClient()
+void Client::startVncClient(const Client * const to)
 {
-	_activeVncClient = false;
 	NetworkMessage msg;
 	msg.setField(_ID, _VNCCLIENT);
+	msg.setField("HOST", to->_host);
+	msg.setField("PORT", QString::number(to->_vncPort));
+	msg.setField("ROPASS", to->_vncRoPass);
+	msg.setField("CLIENTID", QString::number(to->_id));
+	msg.setField("CAPTION", to->_name + " @ " + to->_host);
 	sendMessage(msg);
 }
 
 /******************************************************************************/
-void Client::startVncClient(QString host, int port, QString pass, int id, QString caption)
+void Client::stopVncClient()
 {
-	_activeVncClient = false;
 	NetworkMessage msg;
 	msg.setField(_ID, _VNCCLIENT);
-	msg.setField("HOST", host);
-	msg.setField("PORT", QString::number(port));
-	msg.setField("ROPASS", pass);
-	msg.setField("CLIENTID", QString::number(id));
-	msg.setField("CAPTION", caption);
 	sendMessage(msg);
 }
 
-- 
cgit v1.2.3-55-g7522