[PATCH liburing v1 10/12] t/recv-msgall: Don't use a static port number

From: Ammar Faizi
Date: Thu Sep 01 2022 - 21:01:49 EST


From: Ammar Faizi <ammarfaizi2@xxxxxxxxxxx>

Don't use a static port number. It might already be in use, resulting
in a test failure. Use an ephemeral port to make this test reliable.

Cc: Dylan Yudaken <dylany@xxxxxx>
Cc: Facebook Kernel Team <kernel-team@xxxxxx>
Cc: Pavel Begunkov <asml.silence@xxxxxxxxx>
Signed-off-by: Ammar Faizi <ammarfaizi2@xxxxxxxxxxx>
---
test/recv-msgall.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/recv-msgall.c b/test/recv-msgall.c
index a6f7cfc..ae123e4 100644
--- a/test/recv-msgall.c
+++ b/test/recv-msgall.c
@@ -6,57 +6,55 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <arpa/inet.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <pthread.h>

#include "liburing.h"
#include "helpers.h"

#define MAX_MSG 128
-
-#define PORT 10201
#define HOST "127.0.0.1"
+static __be16 bind_port;

static int recv_prep(struct io_uring *ring, struct iovec *iov, int *sock,
int use_recvmsg)
{
struct sockaddr_in saddr;
struct io_uring_sqe *sqe;
int sockfd, ret, val;
struct msghdr msg = { };

memset(&saddr, 0, sizeof(saddr));
saddr.sin_family = AF_INET;
saddr.sin_addr.s_addr = htonl(INADDR_ANY);
- saddr.sin_port = htons(PORT);

sockfd = socket(AF_INET, SOCK_DGRAM, 0);
if (sockfd < 0) {
perror("socket");
return 1;
}

val = 1;
setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));

- ret = bind(sockfd, (struct sockaddr *)&saddr, sizeof(saddr));
- if (ret < 0) {
+ if (t_bind_ephemeral_port(sockfd, &saddr)) {
perror("bind");
goto err;
}
+ bind_port = saddr.sin_port;

sqe = io_uring_get_sqe(ring);
if (!use_recvmsg) {
io_uring_prep_recv(sqe, sockfd, iov->iov_base, iov->iov_len,
MSG_WAITALL);
} else {
msg.msg_namelen = sizeof(struct sockaddr_in);
msg.msg_iov = iov;
msg.msg_iovlen = 1;
io_uring_prep_recvmsg(sqe, sockfd, &msg, MSG_WAITALL);
}

sqe->user_data = 2;
@@ -155,27 +153,27 @@ static int do_send(void)

ret = io_uring_queue_init(2, &ring, 0);
if (ret) {
fprintf(stderr, "queue init failed: %d\n", ret);
return 1;
}

buf = malloc(MAX_MSG * sizeof(int));
for (i = 0; i < MAX_MSG; i++)
buf[i] = i;

memset(&saddr, 0, sizeof(saddr));
saddr.sin_family = AF_INET;
- saddr.sin_port = htons(PORT);
+ saddr.sin_port = bind_port;
inet_pton(AF_INET, HOST, &saddr.sin_addr);

sockfd = socket(AF_INET, SOCK_DGRAM, 0);
if (sockfd < 0) {
perror("socket");
return 1;
}

ret = connect(sockfd, (struct sockaddr *)&saddr, sizeof(saddr));
if (ret < 0) {
perror("connect");
return 1;
}
--
Ammar Faizi