From d9ba8b0f4597724179eab2d5c44c3c438bc40617 Mon Sep 17 00:00:00 2001

From: Amit Shah <amit.shah@redhat.com>

Date: Mon, 21 Mar 2011 21:57:47 +0100

Subject: [PATCH] char: Split out tcp socket close code in a separate function

Signed-off-by: Amit Shah <amit.shah@redhat.com>

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---

 qemu-char.c | 25 ++++++++++++++++---------

 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/qemu-char.c b/qemu-char.c

index e4b0f53..d7fa7e6 100644

--- a/qemu-char.c

+++ b/qemu-char.c

@@ -2155,6 +2155,21 @@ typedef struct {

 static void tcp_chr_accept(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;

@@ -2313,15 +2328,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);