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

Fix library name generation, fix instruction parsing.

Browse Source
This commit is contained in:
Michael Jumper 2011-11-26 00:28:43 -08:00
parent 7bca78c7a8
commit 61579bd9b7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libguac/src/client.c
View File

@ -127,6 +127,10 @@ guac_client_plugin* guac_client_plugin_open(const char* protocol) {
void* obj; void* obj;
} alias; } alias;
/* Add protocol and .so suffix to protocol_lib */
strcat(protocol_lib, protocol);
strcat(protocol_lib, ".so");
/* Load client plugin */ /* Load client plugin */
client_plugin_handle = dlopen(protocol_lib, RTLD_LAZY); client_plugin_handle = dlopen(protocol_lib, RTLD_LAZY);
if (!client_plugin_handle) { if (!client_plugin_handle) {

4
libguac/src/protocol.c
View File

@ -461,8 +461,8 @@ guac_instruction* guac_protocol_read_instruction(guac_socket* socket, int usec_t
} }
/* Reset buffer */ /* Reset buffer */
memmove(socket->__instructionbuf, socket->__instructionbuf + i + 1, socket->__instructionbuf_used_length - i - 1); memmove(socket->__instructionbuf, socket->__instructionbuf + i, socket->__instructionbuf_used_length - i);
socket->__instructionbuf_used_length -= i + 1; socket->__instructionbuf_used_length -= i;
socket->__instructionbuf_parse_start = 0; socket->__instructionbuf_parse_start = 0;
socket->__instructionbuf_elementc = 0; socket->__instructionbuf_elementc = 0;