Migrated to new function defs with timeouts.

[guacd.git] / src / daemon.c

diff --git a/src/daemon.c b/src/daemon.c
index 9f16e8a..a8abecb 100644 (file)
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -42,13 +42,8 @@
 #include <signal.h>
 #include <sys/types.h>
 
-#ifdef __MINGW32__
-#include <winsock2.h>
-typedef int socklen_t;
-#else
 #include <sys/socket.h>
 #include <netinet/in.h>
-#endif
 
 #include <errno.h>
 
@@ -56,24 +51,7 @@ typedef int socklen_t;
 #include <guacamole/thread.h>
 #include <guacamole/log.h>
 
-/* Windows / MINGW32 handles closing sockets differently */ 
-#ifdef __MINGW32__
-#define CLOSE_SOCKET(socket) closesocket(socket)
-#else
-#define CLOSE_SOCKET(socket) close(socket)
-#endif
-
-
-/* Cross-platform strerror()/errno clone */
-char error[65536];
-char* lasterror() {
-#ifdef __MINGW32__
-    snprintf(error, sizeof(error)-1, "ERROR #%li", GetLastError());
-    return error;
-#else
-    return strerror(errno);
-#endif
-}
+#include "client.h"
 
 typedef struct client_thread_data {
 
@@ -90,7 +68,7 @@ void* start_client_thread(void* data) {
     guac_log_info("Spawning client");
 
     /* Load and start client */
-    client = guac_get_client(thread_data->fd); 
+    client = guac_get_client(thread_data->fd, GUAC_USEC_TIMEOUT); 
 
     if (client == NULL) {
         guac_log_error("Client retrieval failed");
@@ -102,8 +80,8 @@ void* start_client_thread(void* data) {
     guac_free_client(client);
 
     /* Close socket */
-    if (CLOSE_SOCKET(thread_data->fd) < 0) {
-        guac_log_error("Error closing connection: %s", lasterror());
+    if (close(thread_data->fd) < 0) {
+        guac_log_error("Error closing connection: %s", strerror(errno));
         free(data);
         return NULL;
     }
@@ -119,7 +97,7 @@ int main(int argc, char* argv[]) {
     /* Server */
     int socket_fd;
     struct sockaddr_in server_addr;
-    const char opt_on[] = {1};
+    int opt_on = 1;
 
     /* Client */
     struct sockaddr_in client_addr;
@@ -135,11 +113,6 @@ int main(int argc, char* argv[]) {
     /* Daemon Process */
     pid_t daemon_pid;
 
-#ifdef __MINGW32__
-    /* Structure for holding winsock version info */
-    WSADATA wsadata;
-#endif
-
     /* Parse arguments */
     while ((opt = getopt(argc, argv, "l:p:")) != -1) {
         if (opt == 'l') {
@@ -164,29 +137,21 @@ int main(int argc, char* argv[]) {
     server_addr.sin_addr.s_addr = INADDR_ANY;
     server_addr.sin_port = htons(listen_port);
 
-#ifdef __MINGW32__
-    /* If compiling for Windows, init winsock. */
-    if (WSAStartup(MAKEWORD(1,1), &wsadata) == SOCKET_ERROR) {
-        fprintf(stderr, "Error creating socket.");
-        exit(EXIT_FAILURE);
-    }
-#endif
-
     /* Get socket */
     socket_fd = socket(AF_INET, SOCK_STREAM, 0);
     if (socket_fd < 0) {
-        fprintf(stderr, "Error opening socket: %s\n", lasterror());
+        fprintf(stderr, "Error opening socket: %s\n", strerror(errno));
         exit(EXIT_FAILURE);
     }
 
-    if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, opt_on, sizeof(opt_on))) {
-        fprintf(stderr, "Warning: Unable to set socket options for reuse: %s\n", lasterror());
+    if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, (void*) &opt_on, sizeof(opt_on))) {
+        fprintf(stderr, "Warning: Unable to set socket options for reuse: %s\n", strerror(errno));
     }
 
     /* Bind socket to address */
     if (bind(socket_fd, (struct sockaddr*) &server_addr,
                 sizeof(server_addr)) < 0) {
-        fprintf(stderr, "Error binding socket: %s\n", lasterror());
+        fprintf(stderr, "Error binding socket: %s\n", strerror(errno));
         exit(EXIT_FAILURE);
     } 
 
@@ -196,7 +161,7 @@ int main(int argc, char* argv[]) {
 
     /* If error, fail */
     if (daemon_pid == -1) {
-        fprintf(stderr, "Error forking daemon process: %s\n", lasterror());
+        fprintf(stderr, "Error forking daemon process: %s\n", strerror(errno));
         exit(EXIT_FAILURE);
     }
 
@@ -214,7 +179,7 @@ int main(int argc, char* argv[]) {
 
             /* Warn on failure */
             else {
-                fprintf(stderr, "WARNING: Could not write PID file: %s\n", lasterror());
+                fprintf(stderr, "WARNING: Could not write PID file: %s\n", strerror(errno));
                 exit(EXIT_FAILURE);
             }
 
@@ -231,7 +196,6 @@ int main(int argc, char* argv[]) {
     /* Otherwise, this is the daemon */
     guac_log_info("Started, listening on port %i", listen_port);
 
-#ifndef __MINGW32__
     /* Ignore SIGPIPE */
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
         guac_log_error("Could not set handler for SIGPIPE to ignore. SIGPIPE may cause termination of the daemon.");
@@ -241,7 +205,6 @@ int main(int argc, char* argv[]) {
     if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) {
         guac_log_error("Could not set handler for SIGCHLD to ignore. Child processes may pile up in the process table.");
     }
-#endif
 
     /* Daemon loop */
     for (;;) {
@@ -255,7 +218,7 @@ int main(int argc, char* argv[]) {
 
         /* Listen for connections */
         if (listen(socket_fd, 5) < 0) {
-            guac_log_error("Could not listen on socket: %s", lasterror());
+            guac_log_error("Could not listen on socket: %s", strerror(errno));
             return 3;
         }
 
@@ -263,7 +226,7 @@ int main(int argc, char* argv[]) {
         client_addr_len = sizeof(client_addr);
         connected_socket_fd = accept(socket_fd, (struct sockaddr*) &client_addr, &client_addr_len);
         if (connected_socket_fd < 0) {
-            guac_log_error("Could not accept client connection: %s", lasterror());
+            guac_log_error("Could not accept client connection: %s", strerror(errno));
             return 3;
         }
 
@@ -292,7 +255,7 @@ int main(int argc, char* argv[]) {
 
         /* If error, log */
         if (child_pid == -1)
-            guac_log_error("Error forking child process: %s\n", lasterror());
+            guac_log_error("Error forking child process: %s\n", strerror(errno));
 
         /* If child, start client, and exit when finished */
         else if (child_pid == 0) {
@@ -300,18 +263,23 @@ int main(int argc, char* argv[]) {
             return 0;
         }
 
+        /* If parent, close reference to child's descriptor */
+        else if (close(connected_socket_fd) < 0) {
+            guac_log_error("Error closing daemon reference to child descriptor: %s", strerror(errno));
+        }
+
 #else
 
         if (guac_thread_create(&thread, start_client_thread, (void*) data))
-            guac_log_error("Could not create client thread: %s", lasterror());
+            guac_log_error("Could not create client thread: %s", strerror(errno));
 
 #endif
 
     }
 
     /* Close socket */
-    if (CLOSE_SOCKET(socket_fd) < 0) {
-        guac_log_error("Could not close socket: %s", lasterror());
+    if (close(socket_fd) < 0) {
+        guac_log_error("Could not close socket: %s", strerror(errno));
         return 3;
     }