From 90a59d545ad6759c105b0bfcfca70f574482584f Mon Sep 17 00:00:00 2001 Message-Id: <90a59d545ad6759c105b0bfcfca70f574482584f.1346162949.git.crobinso@redhat.com> From: Amit Shah Date: Mon, 21 Mar 2011 21:57:47 +0100 Subject: [PATCH 101/114] char: Split out tcp socket close code in a separate function Signed-off-by: Amit Shah Signed-off-by: Cole Robinson --- qemu-char.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 398baf1..8c53c05 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2143,6 +2143,21 @@ static void tcp_chr_accept(void *opaque); static void tcp_chr_connect(void *opaque); +static void tcp_closed(void *opaque) +{ + CharDriverState *chr = opaque; + TCPCharDriver *s = chr->opaque; + + s->connected = 0; + if (s->listen_fd >= 0) { + qemu_set_fd_handler2(s->listen_fd, NULL, tcp_chr_accept, NULL, chr); + } + qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); + closesocket(s->fd); + s->fd = -1; + qemu_chr_be_event(chr, CHR_EVENT_CLOSED); +} + static int tcp_chr_write(CharDriverState *chr, const uint8_t *buf, int len) { TCPCharDriver *s = chr->opaque; @@ -2302,15 +2317,7 @@ static void tcp_chr_read(void *opaque) len = s->max_size; size = tcp_chr_recv(chr, (void *)buf, len); if (size == 0) { - /* connection closed */ - s->connected = 0; - if (s->listen_fd >= 0) { - qemu_set_fd_handler2(s->listen_fd, NULL, tcp_chr_accept, NULL, chr); - } - qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); - closesocket(s->fd); - s->fd = -1; - qemu_chr_be_event(chr, CHR_EVENT_CLOSED); + tcp_closed(chr); } else if (size > 0) { if (s->do_telnetopt) tcp_chr_process_IAC_bytes(chr, s, buf, &size); -- 1.7.11.2