VncClientThread *t = (VncClientThread*)rfbClientGetClientData(cl, 0);
Q_ASSERT(t);
- t->passwordRequest();
t->m_passwordError = true;
+ t->passwordRequest();
return strdup(t->password().toLocal8Bit());
}
+void VncClientThread::setPassword(const QString &password)
+{
+ if(password.isNull()) //cancelled, don't retry
+ m_passwordError = false;
+
+ m_password = password;
+}
+
void VncClientThread::outputHandler(const char *format, ...)
{
va_list args;
void VncClientThread::stop()
{
- QMutexLocker locker(&mutex);
+ if(m_stopped)
+ return;
- m_stopped = true;
+ //also abort listening for connections, should be safe without locking
+ if(listen_port)
+ cl->listenSpecified = false;
+
+ QMutexLocker locker(&mutex);
+ m_stopped = true;
}
void VncClientThread::run()
{
QMutexLocker locker(&mutex);
- bool clean = false;
int passwd_failures = 0;
while (!m_stopped) { // try to connect as long as the server allows
m_passwordError = false;
+ outputErrorMessageString.clear(); //don't deliver error messages of old instances...
rfbClientLog = outputHandler;
rfbClientErr = outputHandler;
- cl = rfbGetClient(8, 3, 4);
+ cl = rfbGetClient(8, 3, 4); // bitsPerSample, samplesPerPixel, bytesPerPixel
cl->MallocFrameBuffer = newclient;
cl->canHandleNewFBSize = true;
cl->GetPassword = passwdHandler;
m_port += 5900;
cl->serverPort = m_port;
+ cl->listenSpecified = rfbBool(listen_port > 0);
+ cl->listenPort = listen_port;
+
kDebug(5011) << "--------------------- trying init ---------------------";
- if(listen_port) { //listen for incoming connections
- int argc = 2;
- char* argv[2] = { "x", "-listen" }; //this isn't exactly elegant..
- cl->listenPort = listen_port;
- if (rfbInitClient(cl, &argc, argv))
- break;
- } else { //connect to host
- if (rfbInitClient(cl, 0, 0))
- break;
- }
+ if (rfbInitClient(cl, 0, 0))
+ break;
+ //init failed...
if (m_passwordError) {
passwd_failures++;
- if(passwd_failures > 2) {
- m_stopped = true;
- clean = true; //rfbInitClient cleans up after itself upon failure
- }
- continue;
+ if(passwd_failures < 3)
+ continue; //that's ok, try again
}
- return;
+ //stop connecting
+ m_stopped = true;
+ return; //no cleanup necessary, cl was free()d by rfbInitClient()
}
locker.unlock();
// Cleanup allocated resources
locker.relock();
- if(!clean)
- rfbClientCleanup(cl);
+ rfbClientCleanup(cl);
m_stopped = true;
}