From 601254727f169476f6b449841d823dac6ee09d47 Mon Sep 17 00:00:00 2001
From: Vic Lee <llyzs@163.com>
Date: Fri, 19 Aug 2011 09:54:43 +0800
Subject: [PATCH] server: move nego process to connection module.

---
 libfreerdp-core/connection.c | 42 +++++++++++++++++++++++++++++++++++
 libfreerdp-core/connection.h |  2 ++
 libfreerdp-core/peer.c       | 52 +++++---------------------------------------
 libfreerdp-core/peer.h       |  1 -
 libfreerdp-core/rdp.h        |  1 +
 5 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/libfreerdp-core/connection.c b/libfreerdp-core/connection.c
index 75c0477..fa8dacf 100644
--- a/libfreerdp-core/connection.c
+++ b/libfreerdp-core/connection.c
@@ -108,3 +108,45 @@ boolean rdp_client_connect(rdpRdp* rdp)
 	return True;
 }
 
+boolean rdp_server_accept_nego(rdpRdp* rdp, STREAM* s)
+{
+	if (!nego_recv_request(rdp->nego, s))
+		return False;
+	if (rdp->nego->requested_protocols == PROTOCOL_RDP)
+	{
+		printf("Standard RDP encryption is not supported.\n");
+		return False;
+	}
+
+	printf("Requested protocols:");
+	if ((rdp->nego->requested_protocols | PROTOCOL_TLS))
+	{
+		printf(" TLS");
+		if (rdp->settings->tls_security)
+		{
+			printf("(Y)");
+			rdp->nego->selected_protocol |= PROTOCOL_TLS;
+		}
+		else
+			printf("(n)");
+	}
+	if ((rdp->nego->requested_protocols | PROTOCOL_NLA))
+	{
+		printf(" NLA");
+		if (rdp->settings->nla_security)
+		{
+			printf("(Y)");
+			rdp->nego->selected_protocol |= PROTOCOL_NLA;
+		}
+		else
+			printf("(n)");
+	}
+	printf("\n");
+
+	nego_send_negotiation_response(rdp->nego);
+
+	rdp->state = CONNECTION_STATE_NEGO;
+
+	return True;
+}
+
diff --git a/libfreerdp-core/connection.h b/libfreerdp-core/connection.h
index 10b7289..4265a2b 100644
--- a/libfreerdp-core/connection.h
+++ b/libfreerdp-core/connection.h
@@ -39,4 +39,6 @@ enum CONNECTION_STATE
 
 boolean rdp_client_connect(rdpRdp* rdp);
 
+boolean rdp_server_accept_nego(rdpRdp* rdp, STREAM* s);
+
 #endif /* __CONNECTION_H */
diff --git a/libfreerdp-core/peer.c b/libfreerdp-core/peer.c
index d5624cd..628448c 100644
--- a/libfreerdp-core/peer.c
+++ b/libfreerdp-core/peer.c
@@ -23,7 +23,7 @@ static boolean freerdp_peer_initialize(freerdp_peer* client)
 {
 	rdpPeer* peer = (rdpPeer*)client->peer;
 
-	peer->state = CONNECTION_STATE_INITIAL;
+	peer->rdp->state = CONNECTION_STATE_INITIAL;
 
 	return True;
 }
@@ -53,59 +53,19 @@ static boolean freerdp_peer_check_fds(freerdp_peer* client)
 	return True;
 }
 
-static int peer_process_connection_nego(rdpPeer* peer, STREAM* s)
-{
-	if (!nego_recv_request(peer->rdp->nego, s))
-		return -1;
-	if (peer->rdp->nego->requested_protocols == PROTOCOL_RDP)
-	{
-		printf("Standard RDP encryption is not supported.\n");
-		return -1;
-	}
-
-	printf("Requested protocols:");
-	if ((peer->rdp->nego->requested_protocols | PROTOCOL_TLS))
-	{
-		printf(" TLS");
-		if (peer->rdp->settings->tls_security)
-		{
-			printf("(Y)");
-			peer->rdp->nego->selected_protocol |= PROTOCOL_TLS;
-		}
-		else
-			printf("(n)");
-	}
-	if ((peer->rdp->nego->requested_protocols | PROTOCOL_NLA))
-	{
-		printf(" NLA");
-		if (peer->rdp->settings->nla_security)
-		{
-			printf("(Y)");
-			peer->rdp->nego->selected_protocol |= PROTOCOL_NLA;
-		}
-		else
-			printf("(n)");
-	}
-	printf("\n");
-
-	nego_send_negotiation_response(peer->rdp->nego);
-
-	peer->state = CONNECTION_STATE_NEGO;
-
-	return 1;
-}
-
 static int peer_recv_callback(rdpTransport* transport, STREAM* s, void* extra)
 {
 	rdpPeer* peer = (rdpPeer*)extra;
 
-	switch (peer->state)
+	switch (peer->rdp->state)
 	{
 		case CONNECTION_STATE_INITIAL:
-			return peer_process_connection_nego(peer, s);
+			if (!rdp_server_accept_nego(peer->rdp, s))
+				return -1;
+			break;
 
 		default:
-			printf("Invalid state %d\n", peer->state);
+			printf("Invalid state %d\n", peer->rdp->state);
 			return -1;
 	}
 
diff --git a/libfreerdp-core/peer.h b/libfreerdp-core/peer.h
index b18e97c..29b528e 100644
--- a/libfreerdp-core/peer.h
+++ b/libfreerdp-core/peer.h
@@ -30,7 +30,6 @@ struct rdp_peer
 	freerdp_peer* client;
 
 	rdpRdp* rdp;
-	int state;
 };
 
 #endif /* __PEER */
diff --git a/libfreerdp-core/rdp.h b/libfreerdp-core/rdp.h
index 2a4776f..eff7e02 100644
--- a/libfreerdp-core/rdp.h
+++ b/libfreerdp-core/rdp.h
@@ -115,6 +115,7 @@ struct rdp_rdp
 {
 	boolean licensed;
 	boolean activated;
+	int state;
 	struct rdp_mcs* mcs;
 	struct rdp_nego* nego;
 	struct rdp_input* input;
-- 
2.7.4