[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220902005825.2484023-5-ammar.faizi@intel.com>
Date: Fri, 2 Sep 2022 07:59:38 +0700
From: Ammar Faizi <ammarfaizi2@...weeb.org>
To: Jens Axboe <axboe@...nel.dk>
Cc: Ammar Faizi <ammarfaizi2@...weeb.org>,
Dylan Yudaken <dylany@...com>,
Facebook Kernel Team <kernel-team@...com>,
Pavel Begunkov <asml.silence@...il.com>,
Kanna Scarlet <knscarlet@...weeb.org>,
Muhammad Rizki <kiizuha@...weeb.org>,
GNU/Weeb Mailing List <gwml@...r.gnuweeb.org>,
io-uring Mailing List <io-uring@...r.gnuweeb.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: [PATCH liburing v1 04/12] t/socket-rw-eagain: Don't brute force the port number
From: Ammar Faizi <ammarfaizi2@...weeb.org>
Don't brute force the port number, use `t_bind_ephemeral_port()`,
much simpler and reliable for choosing a port number that is not
in use.
Cc: Dylan Yudaken <dylany@...com>
Cc: Facebook Kernel Team <kernel-team@...com>
Cc: Pavel Begunkov <asml.silence@...il.com>
Signed-off-by: Ammar Faizi <ammarfaizi2@...weeb.org>
---
test/socket-rw-eagain.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/test/socket-rw-eagain.c b/test/socket-rw-eagain.c
index 2d6a817..a12c70d 100644
--- a/test/socket-rw-eagain.c
+++ b/test/socket-rw-eagain.c
@@ -8,61 +8,51 @@
#include <stdint.h>
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <netinet/tcp.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "liburing.h"
+#include "helpers.h"
int main(int argc, char *argv[])
{
int p_fd[2], ret;
int32_t recv_s0;
int32_t val = 1;
struct sockaddr_in addr;
struct iovec iov_r[1], iov_w[1];
if (argc > 1)
return 0;
srand(getpid());
recv_s0 = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
ret = setsockopt(recv_s0, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
assert(ret != -1);
ret = setsockopt(recv_s0, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
assert(ret != -1);
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = inet_addr("127.0.0.1");
-
- do {
- addr.sin_port = htons((rand() % 61440) + 4096);
- ret = bind(recv_s0, (struct sockaddr*)&addr, sizeof(addr));
- if (!ret)
- break;
- if (errno != EADDRINUSE) {
- perror("bind");
- exit(1);
- }
- } while (1);
-
+ assert(!t_bind_ephemeral_port(recv_s0, &addr));
ret = listen(recv_s0, 128);
assert(ret != -1);
p_fd[1] = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
val = 1;
ret = setsockopt(p_fd[1], IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
assert(ret != -1);
int32_t flags = fcntl(p_fd[1], F_GETFL, 0);
assert(flags != -1);
flags |= O_NONBLOCK;
--
Ammar Faizi
Powered by blists - more mailing lists