#ifdef __MINGW32__
#include <winsock2.h>
+typedef int socklen_t;
+typedef char* sockopt_p;
#else
#include <sys/socket.h>
#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_LIBPTHREAD
-#include <pthread.h>
-#elif defined(__MINGW32__)
-#include <windows.h>
-#include <process.h>
+typedef void* sockopt_p;
#endif
#include <errno.h>
#include <guacamole/client.h>
+#include <guacamole/thread.h>
#include <guacamole/log.h>
/* Windows / MINGW32 handles closing sockets differently */
char error[65536];
char* lasterror() {
#ifdef __MINGW32__
- snprintf(error, sizeof(error)-1, "ERROR #%i", GetLastError());
+ snprintf(error, sizeof(error)-1, "ERROR #%li", GetLastError());
return error;
#else
return strerror(errno);
#endif
}
-
typedef struct client_thread_data {
int fd;
guac_client* client;
client_thread_data* thread_data = (client_thread_data*) data;
- GUAC_LOG_INFO("Spawning client");
+ guac_log_info("Spawning client");
/* Load and start client */
client = guac_get_client(thread_data->fd);
if (client == NULL) {
- GUAC_LOG_ERROR("Client retrieval failed");
+ guac_log_error("Client retrieval failed");
+ free(data);
return NULL;
}
/* Close socket */
if (CLOSE_SOCKET(thread_data->fd) < 0) {
- GUAC_LOG_ERROR("Error closing connection: %s", lasterror());
+ guac_log_error("Error closing connection: %s", lasterror());
free(data);
return NULL;
}
- GUAC_LOG_INFO("Client finished");
+ guac_log_info("Client finished");
free(data);
return NULL;
/* Client */
struct sockaddr_in client_addr;
- unsigned int client_addr_len;
+ socklen_t client_addr_len;
int connected_socket_fd;
/* Arguments */
exit(EXIT_FAILURE);
}
- if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, &opt_on, sizeof(opt_on))) {
+ if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, (sockopt_p) &opt_on, sizeof(opt_on))) {
fprintf(stderr, "Warning: Unable to set socket options for reuse: %s\n", lasterror());
}
exit(EXIT_SUCCESS);
}
#else
- GUAC_LOG_INFO("fork() not defined at compile time.");
- GUAC_LOG_INFO("guacd running in foreground only.");
+ daemon_pid = getpid();
+ guac_log_info("fork() not defined at compile time.");
+ guac_log_info("guacd running in foreground only.");
#endif
/* Otherwise, this is the daemon */
- GUAC_LOG_INFO("Started, listening on port %i", listen_port);
+ 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 will cause termination of the daemon.");
+ guac_log_error("Could not set handler for SIGPIPE to ignore. SIGPIPE may cause termination of the daemon.");
}
+ /* Ignore SIGCHLD (force automatic removal of children) */
+ 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 (;;) {
-#ifdef HAVE_LIBPTHREAD
- pthread_t thread;
+#ifdef HAVE_FORK
+ pid_t child_pid;
+#else
+ guac_thread_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", lasterror());
+ guac_log_error("Could not listen on socket: %s", lasterror());
return 3;
}
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", lasterror());
return 3;
}
data = malloc(sizeof(client_thread_data));
data->fd = connected_socket_fd;
-#ifdef HAVE_LIBPTHREAD
- if (pthread_create(&thread, NULL, start_client_thread, (void*) data)) {
- GUAC_LOG_ERROR("Could not create client thread: %s", lasterror());
- return 3;
- }
+ /*
+ * Once connection is accepted, send child into background, whether through
+ * fork() or through creating a thread. If thead support is not present on
+ * the platform, guacd will still work, but will only be able to handle one
+ * connection at a time.
+ */
- pthread_detach(thread);
-#elif __MINGW32__
- if (_beginthread(start_client_thread, 0, (void*) data) == -1L) {
- GUAC_LOG_ERROR("Could not create client thread: %s", lasterror());
- return 3;
+#ifdef HAVE_FORK
+
+ /*** FORK ***/
+
+ /*
+ * Note that we prefer fork() over threads for connection-handling
+ * processes as they give each connection its own memory area, and
+ * isolate the main daemon and other connections from errors in any
+ * particular client plugin.
+ */
+
+ child_pid = fork();
+
+ /* If error, log */
+ if (child_pid == -1)
+ guac_log_error("Error forking child process: %s\n", lasterror());
+
+ /* If child, start client, and exit when finished */
+ else if (child_pid == 0) {
+ start_client_thread(data);
+ return 0;
}
+
#else
-#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);
+
+ if (guac_thread_create(&thread, start_client_thread, (void*) data))
+ guac_log_error("Could not create client thread: %s", lasterror());
+
#endif
}
/* Close socket */
if (CLOSE_SOCKET(socket_fd) < 0) {
- GUAC_LOG_ERROR("Could not close socket: %s", lasterror());
+ guac_log_error("Could not close socket: %s", lasterror());
return 3;
}
projects / guacd.git / blobdiff