Commit dd367e81 authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

selftests: mptcp: sockopt: use IPPROTO_MPTCP for getaddrinfo 



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: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu 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: default avatarJakub Kicinski <kuba@kernel.org>
parent 6d0eb15c

tools/testing/selftests/net/mptcp/mptcp_inq.c

+12 −4
Original line number Diff line number Diff line
@@ -72,13 +72,21 @@ static const char *getxinfo_strerr(int err) 
}



static void xgetaddrinfo(const char *node, const char *service,

			 const struct addrinfo *hints,

			 struct addrinfo *hints,

			 struct addrinfo **res)

{

again:

	int err = getaddrinfo(node, service, hints, res);



	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",

			node ? node : "", service ? service : "", errstr);
@@ -91,7 +99,7 @@ static int sock_listen_mptcp(const char * const listenaddr, 
{

	int sock = -1;

	struct addrinfo hints = {

		.ai_protocol = IPPROTO_TCP,

		.ai_protocol = IPPROTO_MPTCP,

		.ai_socktype = SOCK_STREAM,

		.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)

{

	struct addrinfo hints = {

		.ai_protocol = IPPROTO_TCP,

		.ai_protocol = IPPROTO_MPTCP,

		.ai_socktype = SOCK_STREAM,

	};

	struct addrinfo *a, *addr;

tools/testing/selftests/net/mptcp/mptcp_sockopt.c

+12 −4
Original line number Diff line number Diff line
@@ -159,13 +159,21 @@ static const char *getxinfo_strerr(int err) 
}



static void xgetaddrinfo(const char *node, const char *service,

			 const struct addrinfo *hints,

			 struct addrinfo *hints,

			 struct addrinfo **res)

{

again:

	int err = getaddrinfo(node, service, hints, res);



	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",

			node ? node : "", service ? service : "", errstr);
@@ -178,7 +186,7 @@ static int sock_listen_mptcp(const char * const listenaddr, 
{

	int sock = -1;

	struct addrinfo hints = {

		.ai_protocol = IPPROTO_TCP,

		.ai_protocol = IPPROTO_MPTCP,

		.ai_socktype = SOCK_STREAM,

		.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)

{

	struct addrinfo hints = {

		.ai_protocol = IPPROTO_TCP,

		.ai_protocol = IPPROTO_MPTCP,

		.ai_socktype = SOCK_STREAM,

	};

	struct addrinfo *a, *addr;