github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 09:04:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

selftests: mptcp: refactor send_query parameters for code clarity

Browse Source 
This patch use 'inet_diag_req_v2' instead of 'token' as parameters of
send_query, and construct the req in 'get_mptcpinfo'.

This modification enhances the clarity of the code, and prepare for the
dump_subflow_info.

Co-developed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Gang Yan <yangang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250502-net-next-mptcp-sft-inc-cover-v1-4-68eec95898fb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Gang Yan 2025-05-02 14:29:24 +02:00 committed by Jakub Kicinski
parent cd732d5110
commit 3fea468dca
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/testing/selftests/net/mptcp/mptcp_diag.c
View File

@ -62,7 +62,7 @@ static void die_usage(int r)
exit(r);
}
static void send_query(int fd, __u32 token)
static void send_query(int fd, struct inet_diag_req_v2 *r)
{
struct sockaddr_nl nladdr = {
.nl_family = AF_NETLINK
@ -76,19 +76,13 @@ static void send_query(int fd, __u32 token)
.nlmsg_type = SOCK_DIAG_BY_FAMILY,
.nlmsg_flags = NLM_F_REQUEST
},
.r = {
.sdiag_family = AF_INET,
/* Real proto is set via INET_DIAG_REQ_PROTOCOL */
.sdiag_protocol = IPPROTO_TCP,
.id.idiag_cookie[0] = token,
}
.r = *r
};
struct rtattr rta_proto;
struct iovec iov[6];
int iovlen = 1;
__u32 proto;
req.r.idiag_ext |= (1 << (INET_DIAG_INFO - 1));
proto = IPPROTO_MPTCP;
rta_proto.rta_type = INET_DIAG_REQ_PROTOCOL;
rta_proto.rta_len = RTA_LENGTH(sizeof(proto));
@ -229,13 +223,20 @@ static void recv_nlmsg(int fd)
static void get_mptcpinfo(__u32 token)
{
struct inet_diag_req_v2 r = {
.sdiag_family = AF_INET,
/* Real proto is set via INET_DIAG_REQ_PROTOCOL */
.sdiag_protocol = IPPROTO_TCP,
.idiag_ext = 1 << (INET_DIAG_INFO - 1),
.id.idiag_cookie[0] = token,
};
int fd;
fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_SOCK_DIAG);
if (fd < 0)
die_perror("Netlink socket");
send_query(fd, token);
send_query(fd, &r);
recv_nlmsg(fd);
close(fd);