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

Use simpler pointer arithmetic to determine buffer regions for reading and parsing.

Browse Source
This commit is contained in:
Michael Jumper 2013-10-02 11:10:21 -07:00
parent 1a598db7a1
commit 0a09ed21fa
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libguac/guacamole/socket.h
View File

@ -161,14 +161,15 @@ struct guac_socket {
char __out_buf[GUAC_SOCKET_OUTPUT_BUFFER_SIZE]; char __out_buf[GUAC_SOCKET_OUTPUT_BUFFER_SIZE];
/** /**
* The number of bytes currently available within the instruction buffer. * Pointer to the first character of the current in-progress instruction
* within the buffer.
*/ */
int __instructionbuf_available; char* __instructionbuf_unparsed_start;
/** /**
* Pointer to the first unused section of the instruction buffer. * Pointer to the first unused section of the instruction buffer.
*/ */
char* __instructionbuf_current; char* __instructionbuf_unparsed_end;
/** /**
* The instruction buffer. This is essentially the input buffer, * The instruction buffer. This is essentially the input buffer,

27
src/libguac/instruction.c
View File

@ -157,8 +157,10 @@ int guac_instruction_append(guac_instruction* instr,
guac_instruction* guac_instruction_read(guac_socket* socket, guac_instruction* guac_instruction_read(guac_socket* socket,
int usec_timeout) { int usec_timeout) {
char* buffer = socket->__instructionbuf_current; char* unparsed_end = socket->__instructionbuf_unparsed_end;
int length = socket->__instructionbuf_available; char* unparsed_start = socket->__instructionbuf_unparsed_start;
char* buffer_end = socket->__instructionbuf
+ sizeof(socket->__instructionbuf);
guac_instruction* instruction = guac_instruction_alloc(); guac_instruction* instruction = guac_instruction_alloc();
@ -166,7 +168,8 @@ guac_instruction* guac_instruction_read(guac_socket* socket,
&& instruction->state != GUAC_INSTRUCTION_PARSE_ERROR) { && instruction->state != GUAC_INSTRUCTION_PARSE_ERROR) {
/* Add any available data to buffer */ /* Add any available data to buffer */
int parsed = guac_instruction_append(instruction, buffer, length); int parsed = guac_instruction_append(instruction, unparsed_start,
unparsed_end - unparsed_start);
/* Read more data if not enough data to parse */ /* Read more data if not enough data to parse */
if (parsed == 0) { if (parsed == 0) {
@ -174,7 +177,7 @@ guac_instruction* guac_instruction_read(guac_socket* socket,
int retval; int retval;
/* If no space left to read, fail */ /* If no space left to read, fail */
if (length == 0) { if (unparsed_end == buffer_end) {
guac_error = GUAC_STATUS_NO_MEMORY; guac_error = GUAC_STATUS_NO_MEMORY;
guac_error_message = "Instruction too long"; guac_error_message = "Instruction too long";
return NULL; return NULL;
@ -186,7 +189,8 @@ guac_instruction* guac_instruction_read(guac_socket* socket,
return NULL; return NULL;
/* Attempt to fill buffer */ /* Attempt to fill buffer */
retval = guac_socket_read(socket, buffer, length); retval = guac_socket_read(socket, unparsed_end,
buffer_end - unparsed_end);
/* Set guac_error if read unsuccessful */ /* Set guac_error if read unsuccessful */
if (retval < 0) { if (retval < 0) {
@ -203,14 +207,14 @@ guac_instruction* guac_instruction_read(guac_socket* socket,
return NULL; return NULL;
} }
/* Update length of internal buffer */ /* Update internal buffer */
length -= retval; unparsed_end += retval;
} }
/* If data was parsed, advance buffer */ /* If data was parsed, advance buffer */
else else
buffer += parsed; unparsed_start += parsed;
} /* end while parsing data */ } /* end while parsing data */
@ -221,8 +225,8 @@ guac_instruction* guac_instruction_read(guac_socket* socket,
return NULL; return NULL;
} }
socket->__instructionbuf_current = buffer; socket->__instructionbuf_unparsed_start = unparsed_start;
socket->__instructionbuf_available = length; socket->__instructionbuf_unparsed_end = unparsed_end;
return instruction; return instruction;
} }
@ -263,7 +267,8 @@ void guac_instruction_free(guac_instruction* instruction) {
int guac_instruction_waiting(guac_socket* socket, int usec_timeout) { int guac_instruction_waiting(guac_socket* socket, int usec_timeout) {
if (socket->__instructionbuf_available < sizeof(socket->__instructionbuf)) if (socket->__instructionbuf_unparsed_end >
socket->__instructionbuf_unparsed_start)
return 1; return 1;
return guac_socket_select(socket, usec_timeout); return guac_socket_select(socket, usec_timeout);

4
src/libguac/socket.c
View File

@ -140,8 +140,8 @@ guac_socket* guac_socket_alloc() {
socket->data = NULL; socket->data = NULL;
/* Init members */ /* Init members */
socket->__instructionbuf_current = socket->__instructionbuf; socket->__instructionbuf_unparsed_start = socket->__instructionbuf;
socket->__instructionbuf_available = sizeof(socket->__instructionbuf); socket->__instructionbuf_unparsed_end = socket->__instructionbuf;
/* Default to unsafe threading */ /* Default to unsafe threading */
socket->__threadsafe_instructions = 0; socket->__threadsafe_instructions = 0;