Re: [Qemu-devel] [PATCH] slirp: fix big/little endian conversion in ident protocol

[Philippe Mathieu-Daudé]

Hi Samuel,

On 3/2/19 3:25 AM, Samuel Thibault wrote:
> Signed-off-by: Samuel Thibault <address@hidden>
> ---

I got:

Applying: slirp: fix big/little endian conversion in ident protocol
error: patch failed: slirp/tcp_subr.c:660
error: slirp/tcp_subr.c: patch does not apply

Then noticed another slirp patch, applied first then this one succeed,
so you missed:

Based-on: <address@hidden>

>  slirp/tcp_subr.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
> index ef9d99c154..1d7e72dca7 100644
> --- a/slirp/tcp_subr.c
> +++ b/slirp/tcp_subr.c
> @@ -660,10 +660,12 @@ tcp_emu(struct socket *so, struct mbuf *m)
>                                                   tmpso->so_fport == n1) {
>                                                       if 
> (getsockname(tmpso->s,
>                                                               (struct 
> sockaddr *)&addr, &addrlen) == 0)
> -                                                        n2 = 
> ntohs(addr.sin_port);
> +                                                        n2 = addr.sin_port;
>                                                       break;
>                                               }
>                                       }
> +                                     NTOHS(n1);
> +                                     NTOHS(n2);
>                                       so_rcv->sb_cc = 
> snprintf(so_rcv->sb_data,
>                                                                
> so_rcv->sb_datalen,
>                                                                "%d,%d\r\n", 
> n1, n2);
> 

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>