X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=mcs.c;h=c7f1cebfd064861c9645688766c89154e7df05f8;hp=7d70e7568a80123ae690bbb3d033ad9f8aa3303f;hb=cab129c4c404f2b6f45c895bb18c8d5f936a636f;hpb=0828aaaf6baf87035c646a410a88d1f296290c99

diff --git a/mcs.c b/mcs.c
index 7d70e75..c7f1ceb 100644
--- a/mcs.c
+++ b/mcs.c
@@ -89,6 +89,13 @@ ber_out_integer(STREAM s, int value)
 	out_uint16_be(s, value);
 }
 
+static void
+ber_out_uint8(STREAM s, uint8 value)
+{
+	ber_out_header(s, BER_TAG_INTEGER, 1);
+	out_uint8(s, value);
+}
+
 static void
 ber_in_integer(STREAM s, int *value)
 {
@@ -101,15 +108,18 @@ ber_in_integer(STREAM s, int *value)
 static void
 mcs_out_domain_params(STREAM s, int max_channels, int max_users, int max_tokens, int max_pdusize)
 {
-	ber_out_header(s, MCS_TAG_DOMAIN_PARAMS, 32);
-	ber_out_integer(s, max_channels);
-	ber_out_integer(s, max_users);
-	ber_out_integer(s, max_tokens);
-	ber_out_integer(s, 1);	/* num_priorities */
-	ber_out_integer(s, 0);	/* min_throughput */
-	ber_out_integer(s, 1);	/* max_height */
-	ber_out_integer(s, max_pdusize);
-	ber_out_integer(s, 2);	/* ver_protocol */
+	ber_out_header(s, MCS_TAG_DOMAIN_PARAMS, 26);
+	ber_out_uint8(s, 34); // max_channels
+	ber_out_uint8(s, 3);  // max_users
+	ber_out_uint8(s, 0);  // max_tokens
+	ber_out_uint8(s, 1);  // num_priorities 
+	ber_out_uint8(s, 0);  // min_throughput
+	ber_out_uint8(s, 1);  // max_height
+	ber_out_header(s, BER_TAG_INTEGER, 3); // pdu size
+	out_uint8(s, 0x00);
+	out_uint8(s, 0xff);
+	out_uint8(s, 0xf8);
+	ber_out_uint8(s, 2);  // ver_protocol
 }
 
 /* Parse a DOMAIN_PARAMS structure (ASN.1 BER) */
@@ -189,32 +199,66 @@ mcs_send_connect_response()
 	STREAM s;
 	int i;
 
-	s = iso_init(92);
+	s = iso_init(97);
+	printf("INITLEN: %u\n", s->p - s->iso_hdr);
 
-	ber_out_header(s, MCS_CONNECT_RESPONSE, 80);
+	ber_out_header(s, MCS_CONNECT_RESPONSE, 94);
 	ber_out_header(s, BER_TAG_RESULT, 1);
 	out_uint8(s, 0);
 
 	ber_out_header(s, BER_TAG_INTEGER, 1);
-	out_uint8(s, 1);  // connect id
+	out_uint8(s, 0);  // connect id
 	
 	mcs_out_domain_params(s, 34, 2, 0, 0xffff);  // dumdidum?
 
-	ber_out_header(s, BER_TAG_OCTET_STRING, 40);
-
-	out_uint8s(s, 21);   // ick
-	out_uint8(s, 0);
+	ber_out_header(s, BER_TAG_OCTET_STRING, 58);
+
+	// some unknown header of sorts
+	out_uint8(s, 0x00);
+	out_uint8(s, 0x05);
+	out_uint8(s, 0x00);
+	out_uint8(s, 0x14);
+	out_uint8(s, 0x7c);
+	out_uint8(s, 0x00);
+	out_uint8(s, 0x01);
+	out_uint8(s, 0x2a);
+	out_uint8(s, 0x14);
+	out_uint8(s, 0x76);
+	out_uint8(s, 0x0a); 
+	out_uint8(s, 0x01);
+	out_uint8(s, 0x01);
+	out_uint8(s, 0x00);
+	out_uint8(s, 0x01);
+	out_uint8(s, 0xc0);
+	out_uint8(s, 0x00);
+	out_uint8(s, 0x4d);
+	out_uint8(s, 0x63);
+	out_uint8(s, 0x44);
+	out_uint8(s, 0x6e);
+	
+	out_uint8(s, 36);  // one byte length
 
-	// server info -- we claim to support RDP1
+	// server info -- we claim to support RDP5
 	out_uint16_le(s, SEC_TAG_SRV_INFO);
-	out_uint16_le(s, 6);  // length
-	out_uint16_le(s, 1);
-
+	out_uint16_le(s, 8);  // length
+	out_uint16_le(s, 4);  // version
+	out_uint16_le(s, 8);  // unknown
+
+	// channel info -- open a few channels
+	out_uint16_le(s, SEC_TAG_SRV_CHANNELS);
+	out_uint16_le(s, 16); // length
+	out_uint16_le(s, 1003);
+	out_uint16_le(s, 3);
+	out_uint16_le(s, 1004);
+	out_uint16_le(s, 1005);
+	out_uint16_le(s, 1006);
+	out_uint16_le(s, 0);
+	
 	// crypto info
 	out_uint16_le(s, SEC_TAG_SRV_CRYPT);
 	out_uint16_le(s, 12); // length
 	out_uint32_le(s, 1); // 40-bit
-	out_uint32_le(s, 0); // no encryption
+	out_uint32_le(s, 0); // no encryption 
 	
 	s_mark_end(s);
 	printf("LEN: %u\n", s->p - s->iso_hdr);
@@ -262,7 +306,7 @@ mcs_send_aucf(uint16 mcs_userid)
 
 	out_uint8(s, (MCS_AUCF << 2) | 2);  // | 2 = send user ID
 	out_uint8(s, 0);  // success
-	out_uint16_be(s, 0);
+	out_uint16_be(s, 6);
 	
 	s_mark_end(s);
 	iso_send(s);
@@ -292,11 +336,12 @@ mcs_send_cjcf(uint16 userid, uint16 chanid)
 {
 	STREAM s;
 
-	s = iso_init(5);
+	s = iso_init(8);
 
-	out_uint8(s, (MCS_CJCF << 2));
+	out_uint8(s, (MCS_CJCF << 2) | 2);
 	out_uint8(s, 0); // success
-	out_uint16_be(s, g_mcs_userid);
+	out_uint16_be(s, 6);
+	out_uint16_be(s, chanid);
 	out_uint16_be(s, chanid);
 
 	s_mark_end(s);
@@ -366,6 +411,7 @@ mcs_recv(uint16 * channel)
 
 		return s;
 	case MCS_DPUM:
+		printf("Received DPUM (?)\n");
 		return NULL;
 	case MCS_EDRQ:
 		// Erect Domain (ignore)