X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=mcs.c;h=e3690516e9fb75ec8a4cb244c9f25d8a5d7a97ac;hp=a9fb3d261bd2955635e1f5bf3bf783fc57217fe7;hb=f7c77f1d801d69794ea81a97060f260a0af51e51;hpb=48580be79f1c97788f7f3a92b9791056b9773058

diff --git a/mcs.c b/mcs.c
index a9fb3d2..e369051 100644
--- a/mcs.c
+++ b/mcs.c
@@ -116,36 +116,6 @@ mcs_parse_domain_params(STREAM s)
 	return s_check(s);
 }
 
-/* Send an MCS_CONNECT_INITIAL message (ASN.1 BER) */
-static void
-mcs_send_connect_initial(STREAM mcs_data)
-{
-	int datalen = mcs_data->end - mcs_data->data;
-	int length = 9 + 3 * 34 + 4 + datalen;
-	STREAM s;
-
-	s = iso_init(length + 5);
-
-	ber_out_header(s, MCS_CONNECT_INITIAL, length);
-	ber_out_header(s, BER_TAG_OCTET_STRING, 1);	/* calling domain */
-	out_uint8(s, 1);
-	ber_out_header(s, BER_TAG_OCTET_STRING, 1);	/* called domain */
-	out_uint8(s, 1);
-
-	ber_out_header(s, BER_TAG_BOOLEAN, 1);
-	out_uint8(s, 0xff);	/* upward flag */
-
-	mcs_out_domain_params(s, 34, 2, 0, 0xffff);	/* target params */
-	mcs_out_domain_params(s, 1, 1, 1, 0x420);	/* min params */
-	mcs_out_domain_params(s, 0xffff, 0xfc17, 0xffff, 0xffff);	/* max params */
-
-	ber_out_header(s, BER_TAG_OCTET_STRING, datalen);
-	out_uint8p(s, mcs_data->data, datalen);
-
-	s_mark_end(s);
-	iso_send(s);
-}
-
 /* Expect a MCS_CONNECT_RESPONSE message (ASN.1 BER) */
 BOOL
 mcs_recv_connect_initial()
@@ -181,6 +151,40 @@ mcs_recv_connect_initial()
 	return s_check_end(s);
 }
 
+void
+mcs_send_connect_response()
+{
+	STREAM s;
+
+	s = iso_init(80);  // FIXME
+
+	ber_out_header(s, MCS_CONNECT_RESPONSE, 80);
+	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
+	
+	mcs_out_domain_params(s, 34, 2, 0, 0xffff);  // dumdidum?
+
+	ber_out_header(s, BER_TAG_OCTET_STRING, 28);
+
+	out_uint8s(s, 21);   // ick
+	out_uint8(s, 0);
+
+	// 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, 5);
+
+	// aiee, no crypto info yet! :-)
+	
+	s_mark_end(s);
+	printf("LEN: %u\n", s->p - s->iso_hdr);
+	iso_send(s);
+
+}
+
 /* Send an EDrq message (ASN.1 PER) */
 static void
 mcs_send_edrq(void)
@@ -211,35 +215,20 @@ mcs_send_aurq(void)
 	iso_send(s);
 }
 
-/* Expect a AUcf message (ASN.1 PER) */
-static BOOL
-mcs_recv_aucf(uint16 * mcs_userid)
+/* Send a AUcf message (ASN.1 PER) */
+static void
+mcs_send_aucf(uint16 mcs_userid)
 {
-	uint8 opcode, result;
 	STREAM s;
 
-	s = iso_recv();
-	if (s == NULL)
-		return False;
-
-	in_uint8(s, opcode);
-	if ((opcode >> 2) != MCS_AUCF)
-	{
-		error("expected AUcf, got %d\n", opcode);
-		return False;
-	}
-
-	in_uint8(s, result);
-	if (result != 0)
-	{
-		error("AUrq: %d\n", result);
-		return False;
-	}
-
-	if (opcode & 2)
-		in_uint16_be(s, *mcs_userid);
+	s = iso_init(5);
 
-	return s_check_end(s);
+	out_uint8(s, (MCS_AUCF << 2) | 2);  // | 2 = send user ID
+	out_uint8(s, 0);  // success
+	out_uint16_be(s, 0);
+	
+	s_mark_end(s);
+	iso_send(s);
 }
 
 /* Send a CJrq message (ASN.1 PER) */
@@ -261,35 +250,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 */
@@ -334,7 +308,7 @@ mcs_send(STREAM s)
 STREAM
 mcs_recv(uint16 * channel)
 {
-	uint8 opcode, appid, length;
+	uint8 opcode, appid, length, userid;
 	STREAM s;
 
 	s = iso_recv();
@@ -343,23 +317,40 @@ mcs_recv(uint16 * channel)
 
 	in_uint8(s, opcode);
 	appid = opcode >> 2;
-	if (appid != MCS_SDIN)
-	{
-		if (appid != MCS_DPUM)
-		{
-			error("expected data, got %d\n", opcode);
-		}
+
+	switch (appid) {
+	case MCS_SDRQ:
+		in_uint8s(s, 2);	/* userid */
+		in_uint16_be(s, *channel);
+		in_uint8s(s, 1);	/* flags */
+		in_uint8(s, length);
+		if (length & 0x80)
+			in_uint8s(s, 1);	/* second byte of length */
+
+		return s;
+	case MCS_DPUM:
+		return NULL;
+	case MCS_EDRQ:
+		// Erect Domain (ignore)
+		printf("Received EDrq\n");
+		return NULL;
+	case MCS_AURQ:
+		// Attach User Request, respond with AUcf (Attach User Confirm)
+		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;
 	}
 
-	in_uint8s(s, 2);	/* userid */
-	in_uint16_be(s, *channel);
-	in_uint8s(s, 1);	/* flags */
-	in_uint8(s, length);
-	if (length & 0x80)
-		in_uint8s(s, 1);	/* second byte of length */
-
-	return s;
 }
 
 /* Disconnect from the MCS layer */