[Rdesktop-commits] SF.net SVN: rdesktop:[1757] rdesktop/trunk

[<he...@us...>]

Revision: 1757
          http://sourceforge.net/p/rdesktop/code/1757
Author:   hean01
Date:     2013-11-26 08:21:06 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
Added handling of enhanced security redirect PDU.
Part of the rework of server redirection.

Modified Paths:
--------------
    rdesktop/trunk/constants.h
    rdesktop/trunk/rdp.c

Modified: rdesktop/trunk/constants.h
===================================================================
--- rdesktop/trunk/constants.h	2013-11-26 07:56:04 UTC (rev 1756)
+++ rdesktop/trunk/constants.h	2013-11-26 08:21:06 UTC (rev 1757)
@@ -136,9 +136,10 @@
 {
 	RDP_PDU_DEMAND_ACTIVE = 1,
 	RDP_PDU_CONFIRM_ACTIVE = 3,
-	RDP_PDU_REDIRECT = 4,	/* MS Server 2003 Session Redirect */
+	RDP_PDU_REDIRECT = 4,	/* Standard Server Redirect */
 	RDP_PDU_DEACTIVATE = 6,
-	RDP_PDU_DATA = 7
+	RDP_PDU_DATA = 7,
+	RDP_PDU_ENHANCED_REDIRECT = 10	/* Enhanced Server Redirect */
 };
 
 enum RDP_DATA_PDU_TYPE

Modified: rdesktop/trunk/rdp.c
===================================================================
--- rdesktop/trunk/rdp.c	2013-11-26 07:56:04 UTC (rev 1756)
+++ rdesktop/trunk/rdp.c	2013-11-26 08:21:06 UTC (rev 1757)
@@ -1616,6 +1616,11 @@
 			case RDP_PDU_REDIRECT:
 				return process_redirect_pdu(s);
 				break;
+			case RDP_PDU_ENHANCED_REDIRECT:
+				in_uint8s(s, 6);	/* skip shareControlHeader */
+				in_uint8s(s, 2);	/* skip pad2Octets */
+				return process_redirect_pdu(s);
+				break;
 			case RDP_PDU_DATA:
 				process_data_pdu(s, ext_disc_reason);
 				break;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.