From c1b408d0c9d836e0a95d1e0695c0c6c605ceb368 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>

Date: Mon, 10 Sep 2012 20:52:25 +0200

Subject: [PATCH] slirp: improve TFTP performance

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

When transferring a file, keep it open during the whole transfer,

instead of opening/closing it for each block.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

(cherry picked from commit 78be056628c76ff73eedeade86fde44b97343c79)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

---

 slirp/tftp.c | 32 ++++++++++++++++++--------------

 slirp/tftp.h |  1 +

 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/slirp/tftp.c b/slirp/tftp.c

index b78765f..520dbd6 100644

--- a/slirp/tftp.c

+++ b/slirp/tftp.c

@@ -37,6 +37,10 @@ static inline void tftp_session_update(struct tftp_session *spt)

 static void tftp_session_terminate(struct tftp_session *spt)

 {

+    if (spt->fd >= 0) {

+        close(spt->fd);

+        spt->fd = -1;

+    }

     g_free(spt->filename);

     spt->slirp = NULL;

 }

@@ -54,7 +58,7 @@ static int tftp_session_allocate(Slirp *slirp, struct tftp_t *tp)

     /* sessions time out after 5 inactive seconds */

     if ((int)(curtime - spt->timestamp) > 5000) {

-        g_free(spt->filename);

+        tftp_session_terminate(spt);

         goto found;

     }

   }

@@ -64,6 +68,7 @@ static int tftp_session_allocate(Slirp *slirp, struct tftp_t *tp)

  found:

   memset(spt, 0, sizeof(*spt));

   memcpy(&spt->client_ip, &tp->ip.ip_src, sizeof(spt->client_ip));

+  spt->fd = -1;

   spt->client_port = tp->udp.uh_sport;

   spt->slirp = slirp;

@@ -95,24 +100,23 @@ static int tftp_session_find(Slirp *slirp, struct tftp_t *tp)

 static int tftp_read_data(struct tftp_session *spt, uint16_t block_nr,

                           uint8_t *buf, int len)

 {

-  int fd;

-  int bytes_read = 0;

-

-  fd = open(spt->filename, O_RDONLY | O_BINARY);

+    int bytes_read = 0;

-  if (fd < 0) {

-    return -1;

-  }

+    if (spt->fd < 0) {

+        spt->fd = open(spt->filename, O_RDONLY | O_BINARY);

+    }

-  if (len) {

-    lseek(fd, block_nr * 512, SEEK_SET);

+    if (spt->fd < 0) {

+        return -1;

+    }

-    bytes_read = read(fd, buf, len);

-  }

+    if (len) {

+        lseek(spt->fd, block_nr * 512, SEEK_SET);

-  close(fd);

+        bytes_read = read(spt->fd, buf, len);

+    }

-  return bytes_read;

+    return bytes_read;

 }

 static int tftp_send_oack(struct tftp_session *spt,

diff --git a/slirp/tftp.h b/slirp/tftp.h

index 72e5e91..9c364ea 100644

--- a/slirp/tftp.h

+++ b/slirp/tftp.h

@@ -33,6 +33,7 @@ struct tftp_t {

 struct tftp_session {

     Slirp *slirp;

     char *filename;

+    int fd;

     struct in_addr client_ip;

     uint16_t client_port;