On Fri, Dec 19, 2025 at 05:45:13PM +0100, Laurent Vivier wrote:
> Move the assignment of uflow->s[sidei] from the caller (udp_flow_new())
> into udp_flow_sock() itself, placing it after the successful connect().
> 
> This is a pure refactoring with no functional change.  The socket fd is
> now assigned within udp_flow_sock() where the socket is created, rather
> than requiring the caller to capture the return value.  On error paths,
> uflow->s[sidei] remains at its initialized value of -1 rather than being
> set to the negative error code, which is semantically cleaner (though
> functionally equivalent given the >= 0 check in udp_flow_close()).
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  udp_flow.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/udp_flow.c b/udp_flow.c
> index 8907f2f72741..33f29f21e69e 100644
> --- a/udp_flow.c
> +++ b/udp_flow.c
> @@ -109,6 +109,7 @@ static int udp_flow_sock(const struct ctx *c,
>  		flow_dbg_perror(uflow, "Couldn't connect flow socket");
>  		return rc;
>  	}
> +	uflow->s[sidei] = s;
>  
>  	/* It's possible, if unlikely, that we could receive some packets in
>  	 * between the bind() and connect() which may or may not be for this
> @@ -163,7 +164,7 @@ static flow_sidx_t udp_flow_new(const struct ctx *c, union flow *flow,
>  
>  	flow_foreach_sidei(sidei) {
>  		if (pif_is_socket(uflow->f.pif[sidei]))
> -			if ((uflow->s[sidei] = udp_flow_sock(c, uflow, sidei)) < 0)
> +			if (udp_flow_sock(c, uflow, sidei) < 0)
>  				goto cancel;
>  	}
>  
> -- 
> 2.51.1
> 

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson