openstack/deb-novnc
Code Issues Proposed changes

Issue #15 - rfb.js: wait for security type list.

Browse Source 
Apparently the virtualbox VNC server send the size and then the
security type list in separate frames so we need to wait for the full
list.
This commit is contained in:
Joel Martin 2010-08-31 22:22:22 -05:00
parent 42ad5e0782
commit 446ef9a1b9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/rfb.js
View File

@ -678,6 +678,11 @@ init_msg = function() {
case 'Security' :
if (rfb_version >= 3.7) {
num_types = rQ[rQi++];
if (rQlen() < num_types) {
rQi--;
Util.Debug(" waiting for security types");
return;
}
if (num_types === 0) {
strlen = rQshift32();
reason = rQshiftStr(strlen);
@ -702,7 +707,7 @@ init_msg = function() {
send_array([rfb_auth_scheme]);
} else {
if (rQlen() < 4) {
updateState('failed', "Invalid security frame");
Util.Debug(" waiting for security scheme bytes");
return;
}
rfb_auth_scheme = rQshift32();
@ -717,7 +722,7 @@ init_msg = function() {
switch (rfb_auth_scheme) {
case 0: // connection failed
if (rQlen() < 4) {
//Util.Debug(" waiting for auth reason bytes");
Util.Debug(" waiting for auth reason bytes");
return;
}
strlen = rQshift32();
@ -734,7 +739,7 @@ init_msg = function() {
return;
}
if (rQlen() < 16) {
//Util.Debug(" waiting for auth challenge bytes");
Util.Debug(" waiting for auth challenge bytes");
return;
}
challenge = rQshiftBytes(16);