safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed use of registry, etc. from proxy.

Browse Source
This commit is contained in:
Michael Jumper
2010-09-24 03:06:14 -07:00
parent b3c1017b8e
commit 329981ed40
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
guacamole/proxy/src/daemon.c
View File

@@ -36,7 +36,6 @@ typedef struct client_thread_data {
int fd; int fd;
guac_client_init_handler* client_init; guac_client_init_handler* client_init;
guac_client_registry* registry;
int argc; int argc;
char** argv; char** argv;
@@ -52,7 +51,7 @@ void* start_client_thread(void* data) {
syslog(LOG_INFO, "Spawning client"); syslog(LOG_INFO, "Spawning client");
/* Load and start client */ /* Load and start client */
client = guac_get_client(thread_data->fd, thread_data->registry, thread_data->client_init, thread_data->argc, thread_data->argv); client = guac_get_client(thread_data->fd, thread_data->client_init, thread_data->argc, thread_data->argv);
if (client == NULL) { if (client == NULL) {
syslog(LOG_ERR, "Client retrieval failed"); syslog(LOG_ERR, "Client retrieval failed");
@@ -61,10 +60,7 @@ void* start_client_thread(void* data) {
guac_start_client(client); guac_start_client(client);
/* FIXME: Need to free client, but only if the client is not guac_free_client(client);
* being used. This line will be reached if handoff occurs
*/
guac_free_client(client, thread_data->registry);
/* Close socket */ /* Close socket */
if (close(thread_data->fd) < 0) { if (close(thread_data->fd) < 0) {
@@ -81,9 +77,6 @@ void* start_client_thread(void* data) {
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
/* Client registry */
guac_client_registry* registry;
/* Pluggable client */ /* Pluggable client */
void* client_plugin_handle; void* client_plugin_handle;
@@ -165,9 +158,6 @@ int main(int argc, char* argv[]) {
syslog(LOG_INFO, "Listening on port %i", listen_port); syslog(LOG_INFO, "Listening on port %i", listen_port);
/* Allocate registry */
registry = guac_create_client_registry();
/* Daemon loop */ /* Daemon loop */
for (;;) { for (;;) {
@@ -192,7 +182,6 @@ int main(int argc, char* argv[]) {
data->fd = connected_socket_fd; data->fd = connected_socket_fd;
data->client_init = alias.client_init; data->client_init = alias.client_init;
data->registry = registry;
data->argc = client_argc; data->argc = client_argc;
data->argv = client_argv; data->argv = client_argv;
@@ -203,8 +192,6 @@ int main(int argc, char* argv[]) {
} }
/* FIXME: Cleanup client registry (and all other objects) on exit */
/* Close socket */ /* Close socket */
if (close(socket_fd) < 0) { if (close(socket_fd) < 0) {
syslog(LOG_ERR, "Could not close socket: %s", strerror(errno)); syslog(LOG_ERR, "Could not close socket: %s", strerror(errno));