[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230415165904.791841-2-ammarfaizi2@gnuweeb.org>
Date: Sat, 15 Apr 2023 23:59:02 +0700
From: Ammar Faizi <ammarfaizi2@...weeb.org>
To: Jens Axboe <axboe@...nel.dk>
Cc: Ammar Faizi <ammarfaizi2@...weeb.org>,
Pavel Begunkov <asml.silence@...il.com>,
Alviro Iskandar Setiawan <alviro.iskandar@...weeb.org>,
io-uring Mailing List <io-uring@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
GNU/Weeb Mailing List <gwml@...r.gnuweeb.org>
Subject: [PATCH liburing 1/3] io_uring-udp: Fix the wrong IPv6 binary to string conversion
Another io_uring-udp fix. The verbose output shows the wrong address
when using IPv6.
When the address family is AF_INET6, the pointer should be cast to
'struct sockaddr_in6', not 'struct sockaddr_in'.
While in there, also add a square bracket around the IP address to
easily read the port number, especially for IPv6.
Before this patch:
port bound to 49567
received 4 bytes 28 from ::2400:6180:0:d1:0:0:47048
received 4 bytes 28 from ::2400:6180:0:d1:0:0:54755
received 4 bytes 28 from ::2400:6180:0:d1:0:0:57968
(the IPv6 address is wrong)
After this patch:
port bound to 48033
received 4 bytes 28 from [2400:6180:0:d1::6a4:a00f]:40456
received 4 bytes 28 from [2400:6180:0:d1::6a4:a00f]:50306
received 4 bytes 28 from [2400:6180:0:d1::6a4:a00f]:52291
Link: https://github.com/axboe/liburing/issues/814#issuecomment-1458862489
Fixes: https://github.com/axboe/liburing/issues/814
Fixes: 61d472b51e761e61c ("add an example for a UDP server")
Signed-off-by: Ammar Faizi <ammarfaizi2@...weeb.org>
---
examples/io_uring-udp.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/examples/io_uring-udp.c b/examples/io_uring-udp.c
index b81a5e7c47afd9c8..4697af171ba68999 100644
--- a/examples/io_uring-udp.c
+++ b/examples/io_uring-udp.c
@@ -271,14 +271,22 @@ static int process_cqe_recv(struct ctx *ctx, struct io_uring_cqe *cqe,
}
if (ctx->verbose) {
+ struct sockaddr_in *addr = io_uring_recvmsg_name(o);
+ struct sockaddr_in6 *addr6 = (void *)addr;
char buff[INET6_ADDRSTRLEN + 1];
const char *name;
- struct sockaddr_in *addr = io_uring_recvmsg_name(o);
+ void *paddr;
- name = inet_ntop(ctx->af, &addr->sin_addr, buff, sizeof(buff));
+ if (ctx->af == AF_INET6)
+ paddr = &addr6->sin6_addr;
+ else
+ paddr = &addr->sin_addr;
+
+ name = inet_ntop(ctx->af, paddr, buff, sizeof(buff));
if (!name)
name = "<INVALID>";
- fprintf(stderr, "received %u bytes %d from %s:%d\n",
+
+ fprintf(stderr, "received %u bytes %d from [%s]:%d\n",
io_uring_recvmsg_payload_length(o, cqe->res, &ctx->msg),
o->namelen, name, (int)ntohs(addr->sin_port));
}
--
Ammar Faizi
Powered by blists - more mailing lists