Moved library/protocol loading and argument parsing into libguac for future connect message. Proxy no longer uses command-line specified protocol and connection info.

guacamole/libguac/configure.in

@@ -10,6 +10,7 @@ AC_PROG_CC
 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.

guacamole/libguac/include/client.h

@@ -75,6 +75,11 @@ struct guac_client {
      */
     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
@@ -192,18 +197,14 @@ struct guac_client {
 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.

guacamole/libguac/src/client.c

@@ -23,6 +23,8 @@
 
 #include <syslog.h>
 
+#include <dlfcn.h>
+
 #include "guacio.h"
 #include "protocol.h"
 #include "client.h"
@@ -68,32 +70,49 @@ guac_client* __guac_alloc_client(GUACIO* io) {
 }
 
 
-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;
 
 }
@@ -108,6 +127,11 @@ void guac_free_client(guac_client* 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);
 }