From c4734b6c231c644e914f15865b0692d1f755ab00 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Fri, 25 Mar 2011 23:48:39 -0700
Subject: [PATCH] Error handler, actual connection

---
 protocols/rdp/src/rdp_client.c | 58 +++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/protocols/rdp/src/rdp_client.c b/protocols/rdp/src/rdp_client.c
index 9b8930cf..8ce83246 100644
--- a/protocols/rdp/src/rdp_client.c
+++ b/protocols/rdp/src/rdp_client.c
@@ -67,6 +67,9 @@ int rdp_guac_client_free_handler(guac_client* client) {
 
     rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;
 
+    /* Disconnect client */
+    guac_client_data->rdp_inst->rdp_disconnect(guac_client_data->rdp_inst);
+
     /* Free RDP client */
     freerdp_free(guac_client_data->rdp_inst);
     freerdp_chanman_free(guac_client_data->chanman);
@@ -79,6 +82,16 @@ int rdp_guac_client_free_handler(guac_client* client) {
 
 }
 
+void guac_rdp_ui_error(rdpInst* inst, char* text) {
+
+    guac_client* client = (guac_client*) inst->param1;
+    GUACIO* io = client->io;
+
+    guac_send_error(io, text);
+    guac_flush(io);
+
+}
+
 int guac_client_init(guac_client* client, int argc, char** argv) {
 
     rdp_guac_client_data* guac_client_data;
@@ -102,12 +115,17 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
 
     hostname = argv[0];
 
+    /* Allocate client data */
+    guac_client_data = malloc(sizeof(rdp_guac_client_data));
+
     /* Get channel manager */
     chanman = freerdp_chanman_new();
+    guac_client_data->chanman = chanman;
 
     /* INIT SETTINGS */
     settings = malloc(sizeof(rdpSet));
 	memset(settings, 0, sizeof(rdpSet));
+    guac_client_data->settings = settings;
 
     /* Set hostname */
     strncpy(settings->hostname, hostname, sizeof(settings->hostname) - 1);
@@ -132,8 +150,6 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
 	settings->new_cursors = 1;
 	settings->rdp_version = 5;
 
-    /* Init chanman here? */
-
     /* Init client */
     rdp_inst = freerdp_new(settings);
     if (rdp_inst == NULL) {
@@ -141,18 +157,36 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
         guac_flush(client->io);
         return 1;
     }
-
-    /* freerdp_chanman_pre_connect ? */
-    /* rdp_inst->rdp_connect(rdp_inst) */
-    /* rdp_inst->rdp_disconnect(rdp_inst) */
-    /* freerdp_chanman_post_connect ? */
-
-    /* Init client data */
-    guac_client_data = malloc(sizeof(rdp_guac_client_data));
-    guac_client_data->settings = settings;
-    guac_client_data->chanman = chanman;
     guac_client_data->rdp_inst = rdp_inst;
 
+    /* Store client data */
+    rdp_inst->param1 = client;
+    client->data = guac_client_data;
+
+    /* RDP handlers */
+    rdp_inst->ui_error = guac_rdp_ui_error;
+
+    /* Init chanman (pre-connect) */
+    if (freerdp_chanman_pre_connect(chanman, rdp_inst)) {
+        guac_send_error(client->io, "Error initializing RDP client channel manager");
+        guac_flush(client->io);
+        return 1;
+    }
+
+    /* Connect to RDP server */
+    if (rdp_inst->rdp_connect(rdp_inst)) {
+        guac_send_error(client->io, "Error connection to RDP server");
+        guac_flush(client->io);
+        return 1;
+    }
+
+    /* Init chanman (post-connect) */
+    if (freerdp_chanman_post_connect(chanman, rdp_inst)) {
+        guac_send_error(client->io, "Error initializing RDP client channel manager");
+        guac_flush(client->io);
+        return 1;
+    }
+
     /* Client handlers */
     client->free_handler = rdp_guac_client_free_handler;