Enable TCP_NODELAY, by Daniel Jacobowitz.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2257 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/slirp/tcp.h b/slirp/tcp.h
index cd7e89110ab6e9c1e8ce46195dc75169d2704bc5..0cd3ab3a49e25cc5d8fa5835d3eca76e607ec70e 100644 (file)
--- a/slirp/tcp.h
+++ b/slirp/tcp.h
@@ -112,7 +112,7 @@ struct tcphdr {
 /*
  * User-settable options (used with setsockopt).
  */
-/* #define     TCP_NODELAY     0x01 */ /* don't delay send to coalesce packets */
+#define        TCP_NODELAY     0x01    /* don't delay send to coalesce packets */
 /* #define     TCP_MAXSEG      0x02 */ /* set maximum segment size */
 
 /*

diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index e66987eeae786dccf1fc891855c2e37e7c92f1aa..2526bffc602f1e74c128a665b87d09e4fe476c52 100644 (file)
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -499,6 +499,8 @@ tcp_connect(inso)
        setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int));
        opt = 1;
        setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int));
+       opt = 1;
+       setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&opt,sizeof(int));
        
        so->so_fport = addr.sin_port;
        so->so_faddr = addr.sin_addr;