Re: [Qemu-devel] [PATCH] slirp: Fix spurious error report when sending directly

[Philippe Mathieu-Daudé]

Hi Samuel,

On 05/31/2018 04:24 PM, Samuel Thibault wrote:
> When DEBUG is enabled, len needs to be updated.
> 
> Signed-off-by: Samuel Thibault <address@hidden>
> ---
>  slirp/socket.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/slirp/socket.c b/slirp/socket.c
> index e2a71c9b04..3182477ff5 100644
> --- a/slirp/socket.c
> +++ b/slirp/socket.c
> @@ -351,7 +351,7 @@ sosendoob(struct socket *so)
>  
>       if (sb->sb_rptr < sb->sb_wptr) {
>               /* We can send it directly */
> -             n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* 
> |MSG_DONTWAIT)); */
> +             len = n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); 
> /* |MSG_DONTWAIT)); */
>       } else {
>               /*
>                * Since there's no sendv or sendtov like writev,
> 

Isn't it cleaner to move the DEBUG code in the else { }?

        if (sb->sb_rptr < sb->sb_wptr) {
            /* We can send it directly */
            n = slirp_send(...
        } else {
            ...
            n = slirp_send(...
    #ifdef DEBUG
            if (n != len) {
                DEBUG_ERROR("Didn't send all data urgently ...
            }
    #endif
        }