vnc: added buffer_advance function
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>
This commit is contained in:
parent
11e9235b1a
commit
32ed26808d
13
ui/vnc.c
13
ui/vnc.c
|
@ -510,6 +510,13 @@ void buffer_append(Buffer *buffer, const void *data, size_t len)
|
||||||
buffer->offset += 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)
|
static void vnc_desktop_resize(VncState *vs)
|
||||||
{
|
{
|
||||||
DisplayState *ds = vs->ds;
|
DisplayState *ds = vs->ds;
|
||||||
|
@ -1166,8 +1173,7 @@ static long vnc_client_write_plain(VncState *vs)
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
memmove(vs->output.buffer, vs->output.buffer + ret, (vs->output.offset - ret));
|
buffer_advance(&vs->output, ret);
|
||||||
vs->output.offset -= ret;
|
|
||||||
|
|
||||||
if (vs->output.offset == 0) {
|
if (vs->output.offset == 0) {
|
||||||
qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs);
|
qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs);
|
||||||
|
@ -1313,8 +1319,7 @@ void vnc_client_read(void *opaque)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
memmove(vs->input.buffer, vs->input.buffer + len, (vs->input.offset - len));
|
buffer_advance(&vs->input, len);
|
||||||
vs->input.offset -= len;
|
|
||||||
} else {
|
} else {
|
||||||
vs->read_handler_expect = ret;
|
vs->read_handler_expect = ret;
|
||||||
}
|
}
|
||||||
|
|
1
ui/vnc.h
1
ui/vnc.h
|
@ -510,6 +510,7 @@ void buffer_reserve(Buffer *buffer, size_t len);
|
||||||
void buffer_reset(Buffer *buffer);
|
void buffer_reset(Buffer *buffer);
|
||||||
void buffer_free(Buffer *buffer);
|
void buffer_free(Buffer *buffer);
|
||||||
void buffer_append(Buffer *buffer, const void *data, size_t len);
|
void buffer_append(Buffer *buffer, const void *data, size_t len);
|
||||||
|
void buffer_advance(Buffer *buf, size_t len);
|
||||||
|
|
||||||
|
|
||||||
/* Misc helpers */
|
/* Misc helpers */
|
||||||
|
|
Loading…
Reference in New Issue