Re: [Qemu-devel] [PATCH for-1.1] slirp: Untangle TCPOLEN_* from TCPOPT_*

[Andreas Färber]

Am 28.04.2012 00:29, schrieb Andreas Färber:
> From: Andreas Färber <address@hidden>
> 
> Commit b72210568ef0c0fb141a01cffb71a09c4efa0364 (slirp: clean up
> conflicts with system headers) enclosed TCPOLEN_MAXSEG with an #ifdef
> TCPOPT_EOL. This broke the build on illumos, which has TCPOPT_*
> but not TCPOLEN_*.
> 
> Move them to their own #ifdef TCPOLEN_MAXSEG section to remedy this.
> 
> Cc: Paolo Bonzini <address@hidden>
> Signed-off-by: Andreas Färber <address@hidden>

Ping! It seems this patch has not been applied yet despite agreement
between Blue and Jan that we should apply this least-invasive version
for 1.1. Please apply / include in a PULL for rc4.

Andreas

> ---
>  slirp/tcp.h |   13 ++++++++-----
>  1 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/slirp/tcp.h b/slirp/tcp.h
> index 8299603..2e2b403 100644
> --- a/slirp/tcp.h
> +++ b/slirp/tcp.h
> @@ -79,20 +79,23 @@ struct tcphdr {
>  #define      TCPOPT_EOL              0
>  #define      TCPOPT_NOP              1
>  #define      TCPOPT_MAXSEG           2
> -#define    TCPOLEN_MAXSEG            4
>  #define TCPOPT_WINDOW                3
> -#define    TCPOLEN_WINDOW            3
>  #define TCPOPT_SACK_PERMITTED        4               /* Experimental */
> -#define    TCPOLEN_SACK_PERMITTED    2
>  #define TCPOPT_SACK          5               /* Experimental */
>  #define TCPOPT_TIMESTAMP     8
> -#define    TCPOLEN_TIMESTAMP         10
> -#define    TCPOLEN_TSTAMP_APPA               (TCPOLEN_TIMESTAMP+2) /* 
> appendix A */
>  
>  #define TCPOPT_TSTAMP_HDR    \
>      (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
>  #endif
>  
> +#ifndef TCPOLEN_MAXSEG
> +#define    TCPOLEN_MAXSEG            4
> +#define    TCPOLEN_WINDOW            3
> +#define    TCPOLEN_SACK_PERMITTED    2
> +#define    TCPOLEN_TIMESTAMP         10
> +#define    TCPOLEN_TSTAMP_APPA               (TCPOLEN_TIMESTAMP+2) /* 
> appendix A */
> +#endif
> +
>  /*
>   * Default maximum segment size for TCP.
>   * With an IP MSS of 576, this is 536,