Re: [PATCH bpf-next v3 2/5] selftests/bpf: Drop must_fail from network_helper_opts

On 7/17/24 11:22 PM, Geliang Tang wrote:

diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c index 15e0e0bb7553..48c27c810db7 100644 --- a/tools/testing/selftests/bpf/network_helpers.c +++ b/tools/testing/selftests/bpf/network_helpers.c @@ -277,33 +277,6 @@ int client_socket(int family, int type, return -1; } -static int connect_fd_to_addr(int fd,

• 	      const struct sockaddr_storage *addr,
  

• 	      socklen_t addrlen, const bool must_fail)
  

-{

• int ret;
• errno = 0;
• ret = connect(fd, (const struct sockaddr *)addr, addrlen);
• if (must_fail) {

• if (!ret) {
  

• 	log_err("Unexpected success to connect to server");
  

• 	return -1;
  

• }
  

• if (errno != EPERM) {
  

• 	log_err("Unexpected error from connect to server");
  

• 	return -1;
  

• }
  

• } else {

• if (ret) {
  

• 	log_err("Failed to connect to server");
  

There was log_err on connect() failure.

• 	return -1;
  

• }
  

• }
• return 0;

-}

• int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addrlen, const struct network_helper_opts *opts) {

@@ -318,7 +291,7 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t add return -1; }

• if (connect_fd_to_addr(fd, addr, addrlen, opts->must_fail))

• if (connect(fd, (const struct sockaddr *)addr, addrlen))

log_err is gone now.

goto error_close;

return fd; @@ -383,7 +356,7 @@ int connect_fd_to_fd(int client_fd, int server_fd, int timeout_ms) return -1; }

• if (connect_fd_to_addr(client_fd, &addr, len, false))

• if (connect(client_fd, (const struct sockaddr *)&addr, len))

Same here.

return -1;

return 0;