[PATCH net-next 2/7] selftests: mptcp: sockopt: use IPPROTO_MPTCP for getaddrinfo

[Matthieu Baerts (NGI0)]

From: Geliang Tang <tanggeli...@kylinos.cn>

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 <tanggeli...@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matt...@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matt...@kernel.org>
---
 tools/testing/selftests/net/mptcp/mptcp_inq.c     | 16 ++++++++++++----
 tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_inq.c 
b/tools/testing/selftests/net/mptcp/mptcp_inq.c
index 
218aac46732125c005212d0d561ae3bce8f91a74..3cf1e2a612cef911028f46569563d16dd5d32129
 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_inq.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_inq.c
@@ -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;
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c 
b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
index 
926b0be87c9905e763cfb5ba6df974d3518f0b49..9934a68df23708ecb413c4ab26523989e3b9f158
 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
@@ -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;

-- 
2.48.1