Skip to content

Commit

Permalink
vnc: added buffer_advance function
Browse files Browse the repository at this point in the history
Following Anthony Liguori's Websocket implementation I have added the
buffer_advance function to VNC and replaced all related buffer memmove
operations with it.

Signed-off-by: Tim Hardeck <thardeck@suse.de>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  • Loading branch information
thardeck authored and Anthony Liguori committed Jan 21, 2013
1 parent 11e9235 commit 32ed268
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
13 changes: 9 additions & 4 deletions ui/vnc.c
Expand Up @@ -510,6 +510,13 @@ void buffer_append(Buffer *buffer, const void *data, size_t len)
buffer->offset += len;
}

void buffer_advance(Buffer *buf, size_t len)
{
memmove(buf->buffer, buf->buffer + len,
(buf->offset - len));
buf->offset -= len;
}

static void vnc_desktop_resize(VncState *vs)
{
DisplayState *ds = vs->ds;
Expand Down Expand Up @@ -1166,8 +1173,7 @@ static long vnc_client_write_plain(VncState *vs)
if (!ret)
return 0;

memmove(vs->output.buffer, vs->output.buffer + ret, (vs->output.offset - ret));
vs->output.offset -= ret;
buffer_advance(&vs->output, ret);

if (vs->output.offset == 0) {
qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs);
Expand Down Expand Up @@ -1313,8 +1319,7 @@ void vnc_client_read(void *opaque)
}

if (!ret) {
memmove(vs->input.buffer, vs->input.buffer + len, (vs->input.offset - len));
vs->input.offset -= len;
buffer_advance(&vs->input, len);
} else {
vs->read_handler_expect = ret;
}
Expand Down
1 change: 1 addition & 0 deletions ui/vnc.h
Expand Up @@ -510,6 +510,7 @@ void buffer_reserve(Buffer *buffer, size_t len);
void buffer_reset(Buffer *buffer);
void buffer_free(Buffer *buffer);
void buffer_append(Buffer *buffer, const void *data, size_t len);
void buffer_advance(Buffer *buf, size_t len);


/* Misc helpers */
Expand Down

0 comments on commit 32ed268

Please sign in to comment.