Corrected includes

[guacd.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index 6570f96..3f7ea1b 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -36,14 +36,26 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
+#include <time.h>
 
-#include <guacamole/guacio.h>
+#include <guacamole/socket.h>
 #include <guacamole/client.h>
-#include <guacamole/log.h>
+#include <guacamole/error.h>
 
 #include "client.h"
 #include "thread.h"
 
+void __guacd_sleep(int millis) {
+
+    struct timespec sleep_period;
+
+    sleep_period.tv_sec =   millis / 1000;
+    sleep_period.tv_nsec = (millis % 1000) * 1000000L;
+
+    nanosleep(&sleep_period, NULL);
+
+}
+
 void guac_client_stop(guac_client* client) {
     client->state = STOPPING;
 }
@@ -51,24 +63,34 @@ void guac_client_stop(guac_client* client) {
 void* __guac_client_output_thread(void* data) {
 
     guac_client* client = (guac_client*) data;
-    GUACIO* io = client->io;
+    guac_socket* socket = client->socket;
 
-    guac_timestamp last_ping_timestamp = guac_current_timestamp();
+    guac_timestamp last_ping_timestamp = guac_protocol_get_timestamp();
 
     /* Guacamole client output loop */
     while (client->state == RUNNING) {
 
         /* Occasionally ping client with repeat of last sync */
-        guac_timestamp timestamp = guac_current_timestamp();
+        guac_timestamp timestamp = guac_protocol_get_timestamp();
         if (timestamp - last_ping_timestamp > GUAC_SYNC_FREQUENCY) {
+
+            /* Record time of last synnc */
             last_ping_timestamp = timestamp;
-            if (
-                   guac_send_sync(io, client->last_sent_timestamp)
-                || guac_flush(io)
-               ) {
+
+            /* Send sync */
+            if (guac_protocol_send_sync(socket, client->last_sent_timestamp)) {
+                guac_client_log_error(client, "Error sending \"sync\" instruction: %s", guac_status_string(guac_error));
+                guac_client_stop(client);
+                return NULL;
+            }
+
+            /* Flush */
+            if (guac_socket_flush(socket)) {
+                guac_client_log_error(client, "Error flushing output: %s", guac_status_string(guac_error));
                 guac_client_stop(client);
                 return NULL;
             }
+
         }
 
         /* Handle server messages */
@@ -80,22 +102,24 @@ void* __guac_client_output_thread(void* data) {
 
                 int retval = client->handle_messages(client);
                 if (retval) {
-                    guac_log_error("Error handling server messages");
+                    guac_client_log_error(client, "Error handling server messages: %s", guac_status_string(guac_error));
                     guac_client_stop(client);
                     return NULL;
                 }
 
                 /* Sleep as necessary */
-                guac_sleep(GUAC_SERVER_MESSAGE_HANDLE_FREQUENCY);
+                __guacd_sleep(GUAC_SERVER_MESSAGE_HANDLE_FREQUENCY);
 
                 /* Send sync instruction */
-                client->last_sent_timestamp = guac_current_timestamp();
-                if (guac_send_sync(io, client->last_sent_timestamp)) {
+                client->last_sent_timestamp = guac_protocol_get_timestamp();
+                if (guac_protocol_send_sync(socket, client->last_sent_timestamp)) {
+                    guac_client_log_error(client, "Error sending \"sync\" instruction: %s", guac_status_string(guac_error));
                     guac_client_stop(client);
                     return NULL;
                 }
 
-                if (guac_flush(io)) {
+                if (guac_socket_flush(socket)) {
+                    guac_client_log_error(client, "Error flushing output: %s", guac_status_string(guac_error));
                     guac_client_stop(client);
                     return NULL;
                 }
@@ -104,13 +128,13 @@ void* __guac_client_output_thread(void* data) {
 
             /* If sync threshold exceeded, don't spin waiting for resync */
             else
-                guac_sleep(GUAC_SERVER_MESSAGE_HANDLE_FREQUENCY);
+                __guacd_sleep(GUAC_SERVER_MESSAGE_HANDLE_FREQUENCY);
 
         }
 
         /* If no message handler, just sleep until next sync ping */
         else
-            guac_sleep(GUAC_SYNC_FREQUENCY);
+            __guacd_sleep(GUAC_SYNC_FREQUENCY);
 
     } /* End of output loop */
 
@@ -122,30 +146,32 @@ void* __guac_client_output_thread(void* data) {
 void* __guac_client_input_thread(void* data) {
 
     guac_client* client = (guac_client*) data;
-    GUACIO* io = client->io;
+    guac_socket* socket = client->socket;
 
     /* Guacamole client input loop */
     while (client->state == RUNNING) {
 
         /* Read instruction */
         guac_instruction* instruction =
-            guac_read_instruction(io, GUAC_USEC_TIMEOUT);
+            guac_protocol_read_instruction(socket, GUAC_USEC_TIMEOUT);
 
         /* Stop on error */
         if (instruction == NULL) {
+            guac_client_log_error(client, "Error reading instruction: %s", guac_status_string(guac_error));
             guac_client_stop(client);
             return NULL;
         }
 
         /* Call handler, stop on error */
         if (guac_client_handle_instruction(client, instruction) < 0) {
-            guac_free_instruction(instruction);
+            guac_client_log_error(client, "Error in client \"%s\" instruction handler: %s", instruction->opcode, guac_status_string(guac_error));
+            guac_instruction_free(instruction);
             guac_client_stop(client);
             return NULL;
         }
 
         /* Free allocated instruction */
-        guac_free_instruction(instruction);
+        guac_instruction_free(instruction);
 
     }