maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/libguac into unstable

Browse Source
This commit is contained in:
Michael Jumper 2011-02-11 23:17:05 -08:00
commit 903104af20
7 changed files with 78 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libguac/Makefile.am
View File

@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -Werror -Wall -Iinclude AM_CFLAGS = -Werror -Wall -Iinclude
libguacincdir = $(includedir)/guacamole libguacincdir = $(includedir)/guacamole
libguacinc_HEADERS = include/client.h include/guacio.h include/protocol.h libguacinc_HEADERS = include/client.h include/guacio.h include/protocol.h include/log.h
lib_LTLIBRARIES = libguac.la lib_LTLIBRARIES = libguac.la

3
libguac/configure.in
View File

@ -12,9 +12,10 @@ AC_PROG_LIBTOOL
# Checks for libraries. # Checks for libraries.
AC_CHECK_LIB([dl], [dlopen],, AC_MSG_ERROR("libdl is required for loading client plugins")) AC_CHECK_LIB([dl], [dlopen],, AC_MSG_ERROR("libdl is required for loading client plugins"))
AC_CHECK_LIB([png], [png_write_png],, AC_MSG_ERROR("libpng is required for writing png messages")) AC_CHECK_LIB([png], [png_write_png],, AC_MSG_ERROR("libpng is required for writing png messages"))
AC_CHECK_LIB([wsock32], [main])
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h]) AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h pngstruct.h])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T AC_TYPE_SIZE_T

7
libguac/include/guacio.h
View File

@ -79,13 +79,6 @@ typedef struct GUACIO {
*/ */
char* instructionbuf; char* instructionbuf;
/**
* The transfer limit, in kilobytes per second. If 0, there is no
* transfer limit. If non-zero, sleep calls are used at the end of
* a write to ensure output never exceeds the specified limit.
*/
unsigned int transfer_limit; /* KB/sec */
} GUACIO; } GUACIO;
/** /**

38
libguac/include/log.h Normal file
View File

@ -0,0 +1,38 @@
/*
* Guacamole - Clientless Remote Desktop
* Copyright (C) 2010 Michael Jumper
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LOG_H
#define _LOG_H
#ifdef HAVE_SYSLOG_H
/* Logging for UNIX */
#include <syslog.h>
#define GUAC_LOG_ERROR(...) syslog(LOG_ERR, __VA_ARGS__)
#define GUAC_LOG_INFO(...) syslog(LOG_INFO, __VA_ARGS__)
#else
/* Logging for W32 */
#define GUAC_LOG_ERROR(...) fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n")
#define GUAC_LOG_INFO(...) fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n")
#endif
#endif

34
libguac/src/client.c
View File

@ -20,11 +20,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <syslog.h>
#include <dlfcn.h> #include <dlfcn.h>
#include "log.h"
#include "guacio.h" #include "guacio.h"
#include "protocol.h" #include "protocol.h"
#include "client.h" #include "client.h"
@ -100,7 +98,7 @@ guac_client* guac_get_client(int client_fd) {
int result = guac_read_instruction(io, &instruction); int result = guac_read_instruction(io, &instruction);
if (result < 0) { if (result < 0) {
syslog(LOG_ERR, "Error reading instruction while waiting for select"); GUAC_LOG_ERROR("Error reading instruction while waiting for select");
guac_close(io); guac_close(io);
return NULL; return NULL;
} }
@ -122,7 +120,7 @@ guac_client* guac_get_client(int client_fd) {
/* Load client plugin */ /* Load client plugin */
client->client_plugin_handle = dlopen(protocol_lib, RTLD_LAZY); client->client_plugin_handle = dlopen(protocol_lib, RTLD_LAZY);
if (!(client->client_plugin_handle)) { if (!(client->client_plugin_handle)) {
syslog(LOG_ERR, "Could not open client plugin for protocol \"%s\": %s\n", protocol, dlerror()); GUAC_LOG_ERROR("Could not open client plugin for protocol \"%s\": %s\n", protocol, dlerror());
guac_send_error(io, "Could not load server-side client plugin."); guac_send_error(io, "Could not load server-side client plugin.");
guac_flush(io); guac_flush(io);
guac_close(io); guac_close(io);
@ -136,7 +134,7 @@ guac_client* guac_get_client(int client_fd) {
alias.obj = dlsym(client->client_plugin_handle, "guac_client_init"); alias.obj = dlsym(client->client_plugin_handle, "guac_client_init");
if ((error = dlerror()) != NULL) { if ((error = dlerror()) != NULL) {
syslog(LOG_ERR, "Could not get guac_client_init in plugin: %s\n", error); GUAC_LOG_ERROR("Could not get guac_client_init in plugin: %s\n", error);
guac_send_error(io, "Invalid server-side client plugin."); guac_send_error(io, "Invalid server-side client plugin.");
guac_flush(io); guac_flush(io);
guac_close(io); guac_close(io);
@ -148,7 +146,7 @@ guac_client* guac_get_client(int client_fd) {
client_args = (const char**) dlsym(client->client_plugin_handle, "GUAC_CLIENT_ARGS"); client_args = (const char**) dlsym(client->client_plugin_handle, "GUAC_CLIENT_ARGS");
if ((error = dlerror()) != NULL) { if ((error = dlerror()) != NULL) {
syslog(LOG_ERR, "Could not get GUAC_CLIENT_ in plugin: %s\n", error); GUAC_LOG_ERROR("Could not get GUAC_CLIENT_ in plugin: %s\n", error);
guac_send_error(io, "Invalid server-side client plugin."); guac_send_error(io, "Invalid server-side client plugin.");
guac_flush(io); guac_flush(io);
guac_close(io); guac_close(io);
@ -175,7 +173,7 @@ guac_client* guac_get_client(int client_fd) {
int result = guac_read_instruction(io, &instruction); int result = guac_read_instruction(io, &instruction);
if (result < 0) { if (result < 0) {
syslog(LOG_ERR, "Error reading instruction while waiting for connect"); GUAC_LOG_ERROR("Error reading instruction while waiting for connect");
guac_close(io); guac_close(io);
return NULL; return NULL;
} }
@ -213,14 +211,14 @@ void guac_free_client(guac_client* client) {
if (client->free_handler) { if (client->free_handler) {
if (client->free_handler(client)) if (client->free_handler(client))
syslog(LOG_ERR, "Error calling client free handler"); GUAC_LOG_ERROR("Error calling client free handler");
} }
guac_close(client->io); guac_close(client->io);
/* Unload client plugin */ /* Unload client plugin */
if (dlclose(client->client_plugin_handle)) { if (dlclose(client->client_plugin_handle)) {
syslog(LOG_ERR, "Could not close client plugin while unloading client: %s", dlerror()); GUAC_LOG_ERROR("Could not close client plugin while unloading client: %s", dlerror());
} }
free(client); free(client);
@ -241,7 +239,7 @@ void guac_start_client(guac_client* client) {
int retval = client->handle_messages(client); int retval = client->handle_messages(client);
if (retval) { if (retval) {
syslog(LOG_ERR, "Error handling server messages"); GUAC_LOG_ERROR("Error handling server messages");
return; return;
} }
@ -270,7 +268,7 @@ void guac_start_client(guac_client* client) {
) )
) { ) {
syslog(LOG_ERR, "Error handling mouse instruction"); GUAC_LOG_ERROR("Error handling mouse instruction");
guac_free_instruction_data(&instruction); guac_free_instruction_data(&instruction);
return; return;
@ -287,7 +285,7 @@ void guac_start_client(guac_client* client) {
) )
) { ) {
syslog(LOG_ERR, "Error handling key instruction"); GUAC_LOG_ERROR("Error handling key instruction");
guac_free_instruction_data(&instruction); guac_free_instruction_data(&instruction);
return; return;
@ -303,7 +301,7 @@ void guac_start_client(guac_client* client) {
) )
) { ) {
syslog(LOG_ERR, "Error handling clipboard instruction"); GUAC_LOG_ERROR("Error handling clipboard instruction");
guac_free_instruction_data(&instruction); guac_free_instruction_data(&instruction);
return; return;
@ -311,7 +309,7 @@ void guac_start_client(guac_client* client) {
} }
else if (strcmp(instruction.opcode, "disconnect") == 0) { else if (strcmp(instruction.opcode, "disconnect") == 0) {
syslog(LOG_INFO, "Client requested disconnect"); GUAC_LOG_INFO("Client requested disconnect");
guac_free_instruction_data(&instruction); guac_free_instruction_data(&instruction);
return; return;
} }
@ -321,13 +319,13 @@ void guac_start_client(guac_client* client) {
} while ((retval = guac_read_instruction(io, &instruction)) > 0); } while ((retval = guac_read_instruction(io, &instruction)) > 0);
if (retval < 0) { if (retval < 0) {
syslog(LOG_ERR, "Error reading instruction from stream"); GUAC_LOG_ERROR("Error reading instruction from stream");
return; return;
} }
} }
if (retval < 0) { if (retval < 0) {
syslog(LOG_ERR, "Error or end of stream"); GUAC_LOG_ERROR("Error or end of stream");
return; /* EOF or error */ return; /* EOF or error */
} }
@ -335,7 +333,7 @@ void guac_start_client(guac_client* client) {
} }
else if (wait_result < 0) { else if (wait_result < 0) {
syslog(LOG_ERR, "Error waiting for next instruction"); GUAC_LOG_ERROR("Error waiting for next instruction");
return; return;
} }

56
libguac/src/guacio.c
View File

@ -23,8 +23,13 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #ifdef __MINGW32__
#include <winsock2.h>
#else
#include <sys/select.h> #include <sys/select.h>
#endif
#include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include "guacio.h" #include "guacio.h"
@ -48,9 +53,6 @@ GUACIO* guac_open(int fd) {
io->instructionbuf = malloc(io->instructionbuf_size); io->instructionbuf = malloc(io->instructionbuf_size);
io->instructionbuf_used_length = 0; io->instructionbuf_used_length = 0;
/* Set limit */
io->transfer_limit = 0;
return io; return io;
} }
@ -64,41 +66,15 @@ void guac_close(GUACIO* io) {
/* Write bytes, limit rate */ /* Write bytes, limit rate */
ssize_t __guac_write(GUACIO* io, const char* buf, int count) { ssize_t __guac_write(GUACIO* io, const char* buf, int count) {
struct timeval start, end;
int retval; int retval;
/* Write and time how long the write takes (microseconds) */ #ifdef __MINGW32__
gettimeofday(&start, NULL); /* MINGW32 WINSOCK only works with send() */
retval = send(io->fd, buf, count, 0);
#else
/* Use write() for all other platforms */
retval = write(io->fd, buf, count); retval = write(io->fd, buf, count);
gettimeofday(&end, NULL); #endif
if (retval < 0)
return retval;
if (io->transfer_limit > 0) {
suseconds_t elapsed;
suseconds_t required_usecs;
/* Get elapsed time */
elapsed = (end.tv_sec - start.tv_sec) * 1000000 + end.tv_usec - start.tv_usec;
/* Calculate how much time we must sleep */
required_usecs = retval * 1000 / io->transfer_limit - elapsed; /* useconds at transfer_limit KB/s*/
/* Sleep as necessary */
if (required_usecs > 0) {
struct timespec required_sleep;
required_sleep.tv_sec = required_usecs / 1000000;
required_sleep.tv_nsec = (required_usecs % 1000000) * 1000;
nanosleep(&required_sleep, NULL);
}
}
return retval; return retval;
} }
@ -136,19 +112,11 @@ ssize_t guac_write_string(GUACIO* io, const char* str) {
/* Flush when necessary, return on error */ /* Flush when necessary, return on error */
if (io->written > 8188 /* sizeof(out_buf) - 4 */) { if (io->written > 8188 /* sizeof(out_buf) - 4 */) {
struct timeval start, end;
suseconds_t elapsed;
gettimeofday(&start, NULL);
retval = __guac_write(io, out_buf, io->written); retval = __guac_write(io, out_buf, io->written);
gettimeofday(&end, NULL);
if (retval < 0) if (retval < 0)
return retval; return retval;
/* Get elapsed time */
elapsed = (end.tv_sec - start.tv_sec) * 1000000 + end.tv_usec - start.tv_usec;
io->written = 0; io->written = 0;
} }

9
libguac/src/protocol.c
View File

@ -23,8 +23,17 @@
#include <errno.h> #include <errno.h>
#include <png.h> #include <png.h>
#ifdef HAVE_PNGSTRUCT_H
#include <pngstruct.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#ifdef __MINGW32__
#include <winsock2.h>
#else
#include <sys/socket.h> #include <sys/socket.h>
#endif
#include "guacio.h" #include "guacio.h"
#include "protocol.h" #include "protocol.h"