selftests: net: ip_local_port_range: define IPPROTO_MPTCP

[PATCH net] selftests: net: ip_local_port_range: define IPPROTO_MPTCP

Posted by Maxim Galaganov 1 year, 12 months ago

Older glibc's netinet/in.h may leave IPPROTO_MPTCP undefined when
building ip_local_port_range.c, that leads to "error: use of undeclared
identifier 'IPPROTO_MPTCP'".

Define IPPROTO_MPTCP in such cases, just like in other MPTCP selftests.

Fixes: 122db5e3634b ("selftests/net: add MPTCP coverage for IP_LOCAL_PORT_RANGE")
Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Closes: https://lore.kernel.org/netdev/CA+G9fYvGO5q4o_Td_kyQgYieXWKw6ktMa-Q0sBu6S-0y3w2aEQ@mail.gmail.com/
Signed-off-by: Maxim Galaganov <max@internet.ru>
---
 tools/testing/selftests/net/ip_local_port_range.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/testing/selftests/net/ip_local_port_range.c b/tools/testing/selftests/net/ip_local_port_range.c
index 0f217a1cc837..6ebd58869a63 100644
--- a/tools/testing/selftests/net/ip_local_port_range.c
+++ b/tools/testing/selftests/net/ip_local_port_range.c
@@ -16,6 +16,10 @@
 #define IP_LOCAL_PORT_RANGE 51
 #endif
 
+#ifndef IPPROTO_MPTCP
+#define IPPROTO_MPTCP 262
+#endif
+
 static __u32 pack_port_range(__u16 lo, __u16 hi)
 {
 	return (hi << 16) | (lo << 0);
-- 
2.43.0

Re: [PATCH net] selftests: net: ip_local_port_range: define IPPROTO_MPTCP

Posted by Matthieu Baerts 1 year, 12 months ago

Hi Maxim, Naresh,

On 09/02/2024 14:25, Maxim Galaganov wrote:
> Older glibc's netinet/in.h may leave IPPROTO_MPTCP undefined when
> building ip_local_port_range.c, that leads to "error: use of undeclared
> identifier 'IPPROTO_MPTCP'".
> 
> Define IPPROTO_MPTCP in such cases, just like in other MPTCP selftests.
> 
> Fixes: 122db5e3634b ("selftests/net: add MPTCP coverage for IP_LOCAL_PORT_RANGE")
> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> Closes: https://lore.kernel.org/netdev/CA+G9fYvGO5q4o_Td_kyQgYieXWKw6ktMa-Q0sBu6S-0y3w2aEQ@mail.gmail.com/
> Signed-off-by: Maxim Galaganov <max@internet.ru>

Thank you both for the fix and the bug report!

Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Re: [PATCH net] selftests: net: ip_local_port_range: define IPPROTO_MPTCP

Posted by Naresh Kamboju 1 year, 12 months ago

On Fri, 9 Feb 2024 at 19:27, Matthieu Baerts <matttbe@kernel.org> wrote:
>
> Hi Maxim, Naresh,
>
> On 09/02/2024 14:25, Maxim Galaganov wrote:
> > Older glibc's netinet/in.h may leave IPPROTO_MPTCP undefined when
> > building ip_local_port_range.c, that leads to "error: use of undeclared
> > identifier 'IPPROTO_MPTCP'".
> >
> > Define IPPROTO_MPTCP in such cases, just like in other MPTCP selftests.
> >
> > Fixes: 122db5e3634b ("selftests/net: add MPTCP coverage for IP_LOCAL_PORT_RANGE")
> > Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> > Closes: https://lore.kernel.org/netdev/CA+G9fYvGO5q4o_Td_kyQgYieXWKw6ktMa-Q0sBu6S-0y3w2aEQ@mail.gmail.com/
> > Signed-off-by: Maxim Galaganov <max@internet.ru>
>
> Thank you both for the fix and the bug report!
>
> Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>

--
Linaro LKFT
https://lkft.linaro.org