summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteven_carr <steven_carr>2006-06-05 18:04:44 +0000
committersteven_carr <steven_carr>2006-06-05 18:04:44 +0000
commit6bd995ec77d68f21d58d72e286ffaac080978930 (patch)
treeae21161403bb0ade2725891b8cfd3f103085b660
parenta75a576e138e75a522140bb6f2e7345cf8863b15 (diff)
downloadlibtdevnc-6bd995ec.tar.gz
libtdevnc-6bd995ec.zip
Better support for RFB >= 3.8 protocols
-rwxr-xr-xlibvncserver/auth.c65
1 files changed, 43 insertions, 22 deletions
diff --git a/libvncserver/auth.c b/libvncserver/auth.c
index 45b3a8e..642cca6 100755
--- a/libvncserver/auth.c
+++ b/libvncserver/auth.c
@@ -119,6 +119,28 @@ rfbVncAuthSendChallenge(rfbClientPtr cl)
cl->state = RFB_AUTHENTICATION;
}
+/*
+ * Send the NO AUTHENTICATION. SCARR
+ */
+
+static void
+rfbVncAuthNone(rfbClientPtr cl)
+{
+ uint32_t authResult;
+
+ if (cl->protocolMajorVersion==3 && cl->protocolMinorVersion > 7) {
+ rfbLog("rfbProcessClientSecurityType: returning securityResult for client rfb versin >= 3.8\n");
+ authResult = Swap32IfLE(rfbVncAuthOK);
+ if (rfbWriteExact(cl, (char *)&authResult, 4) < 0) {
+ rfbLogPerror("rfbAuthProcessClientMessage: write");
+ rfbCloseClient(cl);
+ return;
+ }
+ }
+ cl->state = RFB_INITIALISATION;
+ return;
+}
+
/*
* Advertise the supported security types (protocol 3.7). Here before sending
@@ -129,11 +151,17 @@ rfbVncAuthSendChallenge(rfbClientPtr cl)
* Different security types will be added by applications using this library.
*/
-static rfbSecurityHandler primaryVncSecurityHandler = {
- 1,
+static rfbSecurityHandler VncSecurityHandlerVncAuth = {
+ rfbSecTypeVncAuth,
rfbVncAuthSendChallenge,
NULL
};
+
+static rfbSecurityHandler VncSecurityHandlerNone = {
+ rfbSecTypeNone,
+ rfbVncAuthNone,
+ NULL
+};
static void
@@ -146,10 +174,15 @@ rfbSendSecurityTypeList(rfbClientPtr cl, int primaryType)
#define MAX_SECURITY_TYPES 255
uint8_t buffer[MAX_SECURITY_TYPES+1];
- /* Fill in the list of security types in the client structure. */
- if (primaryType != rfbSecTypeInvalid) {
- primaryVncSecurityHandler.type = primaryType;
- rfbRegisterSecurityHandler(&primaryVncSecurityHandler);
+
+ /* Fill in the list of security types in the client structure. (NOTE: Not really in the client structure) */
+ switch (primaryType) {
+ case rfbSecTypeNone:
+ rfbRegisterSecurityHandler(&VncSecurityHandlerNone);
+ break;
+ case rfbSecTypeVncAuth:
+ rfbRegisterSecurityHandler(&VncSecurityHandlerVncAuth);
+ break;
}
for (handler = securityHandlers;
@@ -265,7 +298,6 @@ rfbProcessClientSecurityType(rfbClientPtr cl)
int n;
uint8_t chosenType;
rfbSecurityHandler* handler;
- uint32_t authResult;
/* Read the security type. */
n = rfbReadExact(cl, (char *)&chosenType, 1);
@@ -281,24 +313,13 @@ rfbProcessClientSecurityType(rfbClientPtr cl)
/* Make sure it was present in the list sent by the server. */
for (handler = securityHandlers; handler; handler = handler->next) {
if (chosenType == handler->type) {
- if (chosenType == rfbSecTypeNone) {
- authResult = Swap32IfLE(rfbVncAuthOK);
-
- if (rfbWriteExact(cl, (char *)&authResult, 4) < 0) {
- rfbLogPerror("rfbAuthProcessClientMessage: write");
- rfbCloseClient(cl);
- return;
- }
- cl->state = RFB_INITIALISATION;
- return;
- } else {
- handler->handler(cl);
- return;
- }
+ rfbLog("rfbProcessClientSecurityType: executing handler for type %d\n", chosenType);
+ handler->handler(cl);
+ return;
}
}
- rfbLog("rfbProcessClientSecurityType: wrong security type requested\n");
+ rfbLog("rfbProcessClientSecurityType: wrong security type (%d) requested\n", chosenType);
rfbCloseClient(cl);
}