Fixed fork() detection

[guacd.git] / src / daemon.c

diff --git a/src/daemon.c b/src/daemon.c
index cd4257b..c99e345 100644 (file)
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -30,14 +30,37 @@
 #include <netinet/in.h>
 #endif
 
-#ifdef __HAVE_PTHREAD_H__
+#ifdef HAVE_LIBPTHREAD
 #include <pthread.h>
+#elif defined(__MINGW32__)
+#include <windows.h>
+#include <process.h>
 #endif
 
 #include <errno.h>
 
 #include <guacamole/client.h>
-#include <guacamole/guaclog.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 #%i", GetLastError());
+    return error;
+#else
+    return strerror(errno);
+#endif
+}
+
 
 typedef struct client_thread_data {
 
@@ -66,8 +89,8 @@ void* start_client_thread(void* data) {
     guac_free_client(client);
 
     /* Close socket */
-    if (close(thread_data->fd) < 0) {
-        GUAC_LOG_ERROR("Error closing connection: %s", strerror(errno));
+    if (CLOSE_SOCKET(thread_data->fd) < 0) {
+        GUAC_LOG_ERROR("Error closing connection: %s", lasterror());
         free(data);
         return NULL;
     }
@@ -97,6 +120,11 @@ 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:")) != -1) {
         if (opt == 'l') {
@@ -118,31 +146,39 @@ 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", strerror(errno));
+        fprintf(stderr, "Error opening socket: %s\n", lasterror());
         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", strerror(errno));
+        fprintf(stderr, "Warning: Unable to set socket options for reuse: %s\n", lasterror());
     }
 
     /* Bind socket to address */
     if (bind(socket_fd, (struct sockaddr*) &server_addr,
                 sizeof(server_addr)) < 0) {
-        fprintf(stderr, "Error binding socket: %s\n", strerror(errno));
+        fprintf(stderr, "Error binding socket: %s\n", lasterror());
         exit(EXIT_FAILURE);
     } 
 
     /* Fork into background */
-#ifdef fork
+#ifdef HAVE_FORK
     daemon_pid = fork();
 
     /* If error, fail */
     if (daemon_pid == -1) {
-        fprintf(stderr, "Error forking daemon process: %s\n", strerror(errno));
+        fprintf(stderr, "Error forking daemon process: %s\n", lasterror());
         exit(EXIT_FAILURE);
     }
 
@@ -161,14 +197,14 @@ int main(int argc, char* argv[]) {
     /* Daemon loop */
     for (;;) {
 
-#ifdef pthread_t
+#ifdef HAVE_LIBPTHREAD
         pthread_t thread;
 #endif
         client_thread_data* data;
 
         /* Listen for connections */
         if (listen(socket_fd, 5) < 0) {
-            GUAC_LOG_ERROR("Could not listen on socket: %s", strerror(errno));
+            GUAC_LOG_ERROR("Could not listen on socket: %s", lasterror());
             return 3;
         }
 
@@ -176,20 +212,26 @@ 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", strerror(errno));
+            GUAC_LOG_ERROR("Could not accept client connection: %s", lasterror());
             return 3;
         }
 
         data = malloc(sizeof(client_thread_data));
         data->fd = connected_socket_fd;
 
-#ifdef pthread_t
+#ifdef HAVE_LIBPTHREAD
         if (pthread_create(&thread, NULL, start_client_thread, (void*) data)) {
-            GUAC_LOG_ERROR("Could not create client thread: %s", strerror(errno));
+            GUAC_LOG_ERROR("Could not create client thread: %s", lasterror());
+            return 3;
+        }
+#elif __MINGW32__
+        if (_beginthread(start_client_thread, 0, (void*) data) == -1L) { 
+            GUAC_LOG_ERROR("Could not create client thread: %s", lasterror());
             return 3;
         }
 #else
-        GUAC_LOG_INFO("POSIX threads support not present at compile time.");
+#warning THREAD SUPPORT NOT FOUND! guacd will only be able to handle one connection at a time.
+        GUAC_LOG_INFO("Thread support not present at compile time.");
         GUAC_LOG_INFO("guacd handling one connection at a time.");
         start_client_thread(data);
 #endif
@@ -197,8 +239,8 @@ int main(int argc, char* argv[]) {
     }
 
     /* Close socket */
-    if (close(socket_fd) < 0) {
-        GUAC_LOG_ERROR("Could not close socket: %s", strerror(errno));
+    if (CLOSE_SOCKET(socket_fd) < 0) {
+        GUAC_LOG_ERROR("Could not close socket: %s", lasterror());
         return 3;
     }