torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

selftests: mptcp: sockopt: use IPPROTO_MPTCP for getaddrinfo

Browse Source 
getaddrinfo MPTCP is recently supported in glibc and IPPROTO_MPTCP for
getaddrinfo is used in mptcp_connect.c. But in mptcp_sockopt.c and
mptcp_inq.c, IPPROTO_TCP are still used for getaddrinfo, So this patch
updates them.

Signed-off-by: Geliang Tang <tanggeliang@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-2-68eec95898fb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Geliang Tang 2025-05-02 14:29:22 +02:00 committed by Jakub Kicinski
parent 6d0eb15c65
commit dd367e81b7
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/testing/selftests/net/mptcp/mptcp_inq.c
View File

@ -72,13 +72,21 @@ static const char *getxinfo_strerr(int err)
} }
static void xgetaddrinfo(const char *node, const char *service, static void xgetaddrinfo(const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo *hints,
struct addrinfo **res) struct addrinfo **res)
{ {
again:
int err = getaddrinfo(node, service, hints, res); int err = getaddrinfo(node, service, hints, res);
if (err) { if (err) {
const char *errstr = getxinfo_strerr(err); const char *errstr;
if (err == EAI_SOCKTYPE) {
hints->ai_protocol = IPPROTO_TCP;
goto again;
}
errstr = getxinfo_strerr(err);
fprintf(stderr, "Fatal: getaddrinfo(%s:%s): %s\n", fprintf(stderr, "Fatal: getaddrinfo(%s:%s): %s\n",
node ? node : "", service ? service : "", errstr); node ? node : "", service ? service : "", errstr);
@ -91,7 +99,7 @@ static int sock_listen_mptcp(const char * const listenaddr,
{ {
int sock = -1; int sock = -1;
struct addrinfo hints = { struct addrinfo hints = {
.ai_protocol = IPPROTO_TCP, .ai_protocol = IPPROTO_MPTCP,
.ai_socktype = SOCK_STREAM, .ai_socktype = SOCK_STREAM,
.ai_flags = AI_PASSIVE | AI_NUMERICHOST .ai_flags = AI_PASSIVE | AI_NUMERICHOST
}; };
@ -136,7 +144,7 @@ static int sock_connect_mptcp(const char * const remoteaddr,
const char * const port, int proto) const char * const port, int proto)
{ {
struct addrinfo hints = { struct addrinfo hints = {
.ai_protocol = IPPROTO_TCP, .ai_protocol = IPPROTO_MPTCP,
.ai_socktype = SOCK_STREAM, .ai_socktype = SOCK_STREAM,
}; };
struct addrinfo *a, *addr; struct addrinfo *a, *addr;

16
tools/testing/selftests/net/mptcp/mptcp_sockopt.c
View File

@ -159,13 +159,21 @@ static const char *getxinfo_strerr(int err)
} }
static void xgetaddrinfo(const char *node, const char *service, static void xgetaddrinfo(const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo *hints,
struct addrinfo **res) struct addrinfo **res)
{ {
again:
int err = getaddrinfo(node, service, hints, res); int err = getaddrinfo(node, service, hints, res);
if (err) { if (err) {
const char *errstr = getxinfo_strerr(err); const char *errstr;
if (err == EAI_SOCKTYPE) {
hints->ai_protocol = IPPROTO_TCP;
goto again;
}
errstr = getxinfo_strerr(err);
fprintf(stderr, "Fatal: getaddrinfo(%s:%s): %s\n", fprintf(stderr, "Fatal: getaddrinfo(%s:%s): %s\n",
node ? node : "", service ? service : "", errstr); node ? node : "", service ? service : "", errstr);
@ -178,7 +186,7 @@ static int sock_listen_mptcp(const char * const listenaddr,
{ {
int sock = -1; int sock = -1;
struct addrinfo hints = { struct addrinfo hints = {
.ai_protocol = IPPROTO_TCP, .ai_protocol = IPPROTO_MPTCP,
.ai_socktype = SOCK_STREAM, .ai_socktype = SOCK_STREAM,
.ai_flags = AI_PASSIVE | AI_NUMERICHOST .ai_flags = AI_PASSIVE | AI_NUMERICHOST
}; };
@ -223,7 +231,7 @@ static int sock_connect_mptcp(const char * const remoteaddr,
const char * const port, int proto) const char * const port, int proto)
{ {
struct addrinfo hints = { struct addrinfo hints = {
.ai_protocol = IPPROTO_TCP, .ai_protocol = IPPROTO_MPTCP,
.ai_socktype = SOCK_STREAM, .ai_socktype = SOCK_STREAM,
}; };
struct addrinfo *a, *addr; struct addrinfo *a, *addr;