Re: [PATCH v6 bpf-next 10/12] selftests/bpf: Create established sockets in socket iterator tests

[Martin KaFai Lau <martin.lau@xxxxxxxxx>]

On 7/14/25 11:09 AM, Jordan Rife wrote:
> +static int *connect_to_server(int family, int sock_type, const char *addr,
> +			      __u16 port, int nr_connects, int *server_fds,
> +			      int server_fds_len)
> +{
> +	struct pollfd *server_poll_fds = NULL;
> +	struct network_helper_opts opts = {

A nit. I removed "opts" and just passed NULL to connect_to_addr_str.

I also carried Stan's ack from v4. Applied. Thanks.

> +		.timeout_ms = 0,
> +	};
> +	int *established_socks = NULL;
> +	int i;
> +
> +	server_poll_fds = calloc(server_fds_len, sizeof(*server_poll_fds));
> +	if (!ASSERT_OK_PTR(server_poll_fds, "server_poll_fds"))
> +		return NULL;
> +
> +	for (i = 0; i < server_fds_len; i++) {
> +		server_poll_fds[i].fd = server_fds[i];
> +		server_poll_fds[i].events = POLLIN;
> +	}
> +
> +	i = 0;
> +
> +	established_socks = malloc(sizeof(*established_socks) * nr_connects*2);
> +	if (!ASSERT_OK_PTR(established_socks, "established_socks"))
> +		goto error;
> +
> +	while (nr_connects--) {
> +		established_socks[i] = connect_to_addr_str(family, sock_type,
> +							   addr, port, &opts);
> +		if (!ASSERT_OK_FD(established_socks[i], "connect_to_addr_str"))
> +			goto error;
> +		i++;
> +		established_socks[i] = accept_from_one(server_poll_fds,
> +						       server_fds_len);
> +		if (!ASSERT_OK_FD(established_socks[i], "accept_from_one"))
> +			goto error;
> +		i++;
> +	}
> +
> +	free(server_poll_fds);
> +	return established_socks;
> +error:
> +	free_fds(established_socks, i);
> +	free(server_poll_fds);
> +	return NULL;
> +}