X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=mcs.c;h=5f4fe2001b0e176ac62743185c203a3b428cea41;hp=460e0d4b6610957900c42c8dc2514807b5265583;hb=534175407a8327510507c89ea4080059e747e169;hpb=b6ea72f2e99bc93a105c5120573762c162985160

diff --git a/mcs.c b/mcs.c
index 460e0d4..5f4fe20 100644
--- a/mcs.c
+++ b/mcs.c
@@ -89,6 +89,14 @@ ber_out_integer(STREAM s, int value)
 	out_uint16_be(s, value);
 }
 
+static void
+ber_in_integer(STREAM s, int *value)
+{
+	int length;
+	ber_parse_header(s, BER_TAG_INTEGER, &length);
+	in_uint16_be(s, *value);
+}
+
 /* Output a DOMAIN_PARAMS structure (ASN.1 BER) */
 static void
 mcs_out_domain_params(STREAM s, int max_channels, int max_users, int max_tokens, int max_pdusize)
@@ -109,10 +117,34 @@ static BOOL
 mcs_parse_domain_params(STREAM s)
 {
 	int length;
+	int max_channels, max_users, max_tokens, max_pdusize;
+	int num_priorities, min_throughput, max_height;
+	int ver_protocol;
 
 	ber_parse_header(s, MCS_TAG_DOMAIN_PARAMS, &length);
-	in_uint8s(s, length);
-
+	printf("MCS_TAG_DOMAIN_PARAMS, len %u (expected 32)\n", length);
+	if (length == 32) {
+		ber_in_integer(s, &max_channels);
+		ber_in_integer(s, &max_users);
+		ber_in_integer(s, &max_tokens);
+		ber_in_integer(s, &num_priorities);
+		ber_in_integer(s, &min_throughput);
+		ber_in_integer(s, &max_height);
+		ber_in_integer(s, &max_pdusize);
+		ber_in_integer(s, &ver_protocol);
+
+		printf("max_channels=%u\n", max_channels);
+		printf("max_users=%u\n", max_users);
+		printf("max_tokens=%u\n", max_tokens);
+		printf("num_priorities=%u\n", num_priorities);
+		printf("min_throughput=%u\n", min_throughput);
+		printf("max_pdusize=%u\n", max_pdusize);
+		printf("ver_protocol=%u\n", ver_protocol);
+	} else {
+		hexdump(s->p, length);
+		in_uint8s(s, length);
+	}
+	
 	return s_check(s);
 }
 
@@ -155,8 +187,9 @@ void
 mcs_send_connect_response()
 {
 	STREAM s;
+	int i;
 
-	s = iso_init(80);  // FIXME
+	s = iso_init(92);
 
 	ber_out_header(s, MCS_CONNECT_RESPONSE, 80);
 	ber_out_header(s, BER_TAG_RESULT, 1);
@@ -167,7 +200,7 @@ mcs_send_connect_response()
 	
 	mcs_out_domain_params(s, 34, 2, 0, 0xffff);  // dumdidum?
 
-	ber_out_header(s, BER_TAG_OCTET_STRING, 28);
+	ber_out_header(s, BER_TAG_OCTET_STRING, 40);
 
 	out_uint8s(s, 21);   // ick
 	out_uint8(s, 0);
@@ -177,7 +210,11 @@ mcs_send_connect_response()
 	out_uint16_le(s, 6);  // length
 	out_uint16_le(s, 5);
 
-	// aiee, no crypto info yet! :-)
+	// 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
 	
 	s_mark_end(s);
 	printf("LEN: %u\n", s->p - s->iso_hdr);
@@ -250,35 +287,20 @@ mcs_send_cjrq(uint16 chanid)
 }
 
 /* Expect a CJcf message (ASN.1 PER) */
-static BOOL
-mcs_recv_cjcf(void)
+static void
+mcs_send_cjcf(uint16 userid, uint16 chanid)
 {
-	uint8 opcode, result;
 	STREAM s;
 
-	s = iso_recv();
-	if (s == NULL)
-		return False;
-
-	in_uint8(s, opcode);
-	if ((opcode >> 2) != MCS_CJCF)
-	{
-		error("expected CJcf, got %d\n", opcode);
-		return False;
-	}
-
-	in_uint8(s, result);
-	if (result != 0)
-	{
-		error("CJrq: %d\n", result);
-		return False;
-	}
+	s = iso_init(5);
 
-	in_uint8s(s, 4);	/* mcs_userid, req_chanid */
-	if (opcode & 2)
-		in_uint8s(s, 2);	/* join_chanid */
+	out_uint8(s, (MCS_CJCF << 2));
+	out_uint8(s, 0); // success
+	out_uint16_be(s, g_mcs_userid);
+	out_uint16_be(s, chanid);
 
-	return s_check_end(s);
+	s_mark_end(s);
+	iso_send(s);
 }
 
 /* Initialise an MCS transport data packet */
@@ -303,7 +325,7 @@ mcs_send_to_channel(STREAM s, uint16 channel)
 	length = s->end - s->p - 8;
 	length |= 0x8000;
 
-	out_uint8(s, (MCS_SDRQ << 2));
+	out_uint8(s, (MCS_SDIN << 2));
 	out_uint16_be(s, g_mcs_userid);
 	out_uint16_be(s, channel);
 	out_uint8(s, 0x70);	/* flags */
@@ -323,7 +345,7 @@ mcs_send(STREAM s)
 STREAM
 mcs_recv(uint16 * channel)
 {
-	uint8 opcode, appid, length;
+	uint8 opcode, appid, length, userid;
 	STREAM s;
 
 	s = iso_recv();
@@ -334,7 +356,7 @@ mcs_recv(uint16 * channel)
 	appid = opcode >> 2;
 
 	switch (appid) {
-	case MCS_SDIN:
+	case MCS_SDRQ:
 		in_uint8s(s, 2);	/* userid */
 		in_uint16_be(s, *channel);
 		in_uint8s(s, 1);	/* flags */
@@ -354,6 +376,13 @@ mcs_recv(uint16 * channel)
 		printf("Received AUrq, sending AUcf\n");
 		mcs_send_aucf(0);
 		return NULL;
+	case MCS_CJRQ:
+		// Channel Join Request, respond with CJcf (Channel Join Confirm);
+		in_uint16_be(s, userid);
+		in_uint16_be(s, *channel);
+		printf("Received CJrq for channel %hu, sending CJcf\n", *channel);
+		mcs_send_cjcf(userid, *channel);
+		return NULL;
 	default:
 		error("expected data, got %d\n", opcode);
 		return NULL;