AC_PROG_LIBTOOL
# Checks for libraries.
+AC_CHECK_LIB([dl], [dlopen],, AC_MSG_ERROR("libdl is required for loading client plugins"))
AC_CHECK_LIB([png], [png_write_png])
# Checks for header files.
GUACIO* io;
/**
+ * Reference to dlopen'd client plugin.
+ */
+ void* client_plugin_handle;
+
+ /**
* Arbitrary reference to proxy client-specific data. Implementors of a
* Guacamole proxy client can store any data they want here, which can then
* be retrieved as necessary in the message handlers.
typedef int guac_client_init_handler(guac_client* client, int argc, char** argv);
/**
- * Initialize and return a new guac_client using the specified client init handler (guac_client_init_handler).
- * This will normally be the guac_client_init function as provided by any of the pluggable proxy clients.
+ * Initialize and return a new guac_client. The pluggable client will be chosen based on
+ * the first connect message received on the given file descriptor.
*
* @param client_fd The file descriptor associated with the socket associated with the connection to the
* web-client tunnel.
- * @param client_init Function pointer to the client init handler which will initialize the new guac_client
- * when called. The given hostname and port will be passed to this handler.
- * @param argc The number of arguments being passed to this client.
- * @param argv The arguments being passed to this client.
- * @return A pointer to the newly initialized (or found) client.
+ * @return A pointer to the newly initialized client.
*/
-guac_client* guac_get_client(int client_fd, guac_client_init_handler* client_init, int argc, char** argv);
+guac_client* guac_get_client(int client_fd);
/**
* Enter the main network message handling loop for the given client.
#include <syslog.h>
+#include <dlfcn.h>
+
#include "guacio.h"
#include "protocol.h"
#include "client.h"
}
-guac_client* guac_get_client(int client_fd, guac_client_init_handler* client_init, int argc, char** argv) {
+guac_client* guac_get_client(int client_fd) {
guac_client* client;
GUACIO* io = guac_open(client_fd);
- /* Make copies of arguments */
- char** safe_argv = malloc(argc * sizeof(char*));
- char** scratch_argv = malloc(argc * sizeof(char*));
+ /* Pluggable client */
+ char* protocol;
+ char protocol_lib[256] = "libguac_client_";
+
+ union {
+ guac_client_init_handler* client_init;
+ void* obj;
+ } alias;
+
+ char* error;
+
+ strcat(protocol_lib, protocol);
+ strcat(protocol_lib, ".so");
+
+ /* Load client plugin */
+ client->client_plugin_handle = dlopen(protocol_lib, RTLD_LAZY);
+ if (!(client->client_plugin_handle)) {
+ fprintf(stderr, "Could not open client plugin for protocol \"%s\": %s\n", protocol, dlerror());
+ exit(EXIT_FAILURE);
+ }
+
+ dlerror(); /* Clear errors */
+
+ /* Get init function */
+ alias.obj = dlsym(client->client_plugin_handle, "guac_client_init");
+
+ if ((error = dlerror()) != NULL) {
+ fprintf(stderr, "Could not get guac_client_init in plugin: %s\n", error);
+ exit(EXIT_FAILURE);
+ }
- int i;
- for (i=0; i<argc; i++)
- scratch_argv[i] = safe_argv[i] = strdup(argv[i]);
/* Create new client */
client = __guac_alloc_client(io);
- if (client_init(client, argc, scratch_argv) != 0)
+ if (alias.client_init(client, argc, argv) != 0)
return NULL;
- /* Free memory used for arg copy */
- for (i=0; i<argc; i++)
- free(safe_argv[i]);
-
- free(safe_argv);
- free(scratch_argv);
-
return client;
}
guac_close(client->io);
+ /* Unload client plugin */
+ if (dlclose(client->client_plugin_handle)) {
+ syslog(LOG_ERR, "Could not close client plugin while unloading client: %s", dlerror());
+ }
+
free(client);
}
AC_PROG_CC
# Checks for libraries.
-AC_CHECK_LIB([dl], [dlopen],, AC_MSG_ERROR("libdl is required for loading client plugins"))
AC_CHECK_LIB([guac], [guac_get_client],, AC_MSG_ERROR("libguac must be installed first"))
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR("POSIX threads (libpthread) must be installed"))
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <dlfcn.h>
#include <pthread.h>
#include <errno.h>
typedef struct client_thread_data {
int fd;
- guac_client_init_handler* client_init;
-
- int argc;
- char** argv;
} client_thread_data;
syslog(LOG_INFO, "Spawning client");
/* Load and start client */
- client = guac_get_client(thread_data->fd, thread_data->client_init, thread_data->argc, thread_data->argv);
+ client = guac_get_client(thread_data->fd);
if (client == NULL) {
syslog(LOG_ERR, "Client retrieval failed");
int main(int argc, char* argv[]) {
- /* Pluggable client */
- void* client_plugin_handle;
-
- union {
- guac_client_init_handler* client_init;
- void* obj;
- } alias;
-
- char* error;
-
/* Server */
int socket_fd;
struct sockaddr_in server_addr;
unsigned int client_addr_len;
int connected_socket_fd;
+ /* Arguments */
int listen_port = -1;
- char* protocol = NULL;
-
- int client_argc;
- char** client_argv;
-
- char protocol_lib[256] = "libguac_client_";
-
int opt;
/* Parse arguments */
- while ((opt = getopt(argc, argv, "l:p:")) != -1) {
+ while ((opt = getopt(argc, argv, "l:")) != -1) {
if (opt == 'l') {
listen_port = atoi(optarg);
if (listen_port <= 0) {
exit(EXIT_FAILURE);
}
}
- else if (opt == 'p') {
- protocol = optarg;
- break;
- }
else {
- fprintf(stderr, "USAGE: %s [-l LISTENPORT] [-p PROTOCOL [PROTOCOL OPTIONS ...]]\n", argv[0]);
+ fprintf(stderr, "USAGE: %s -l LISTENPORT\n", argv[0]);
exit(EXIT_FAILURE);
}
}
/* Validate arguments */
-
if (listen_port < 0) {
fprintf(stderr, "The port to listen on must be specified.\n");
exit(EXIT_FAILURE);
}
- if (protocol == NULL) {
- fprintf(stderr, "The protocol must be specified.\n");
- exit(EXIT_FAILURE);
- }
-
- strcat(protocol_lib, protocol);
- strcat(protocol_lib, ".so");
-
- client_argc = argc - optind;
- client_argv = &(argv[optind]);
-
/* Get binding address */
memset(&server_addr, 0, sizeof(server_addr)); /* Zero struct */
server_addr.sin_family = AF_INET;
exit(EXIT_FAILURE);
}
- /* Load client plugin */
- client_plugin_handle = dlopen(protocol_lib, RTLD_LAZY);
- if (!client_plugin_handle) {
- fprintf(stderr, "Could not open client plugin for protocol \"%s\": %s\n", protocol, dlerror());
- exit(EXIT_FAILURE);
- }
-
- dlerror(); /* Clear errors */
-
- /* Get init function */
- alias.obj = dlsym(client_plugin_handle, "guac_client_init");
-
- if ((error = dlerror()) != NULL) {
- fprintf(stderr, "Could not get guac_client_init in plugin: %s\n", error);
- exit(EXIT_FAILURE);
- }
-
-
syslog(LOG_INFO, "Started, listening on port %i", listen_port);
}
data = malloc(sizeof(client_thread_data));
-
data->fd = connected_socket_fd;
- data->client_init = alias.client_init;
- data->argc = client_argc;
- data->argv = client_argv;
if (pthread_create(&thread, NULL, start_client_thread, (void*) data)) {
syslog(LOG_ERR, "Could not create client thread: %s", strerror(errno));
return 3;
}
- /* Load client plugin */
- if (dlclose(client_plugin_handle)) {
- syslog(LOG_ERR, "Could not close client plugin: %s", dlerror());
- return 2;
- }
-
-
return 0;
}
projects / guacamole.git / commitdiff