From 2c57ab4d43fae55451f5efa3a6a0d60216d2d4d4 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 24 Jul 2022 18:32:24 +0200 Subject: [PATCH] Update mptcpd --- mptcpd/Makefile | 7 ++++--- mptcpd/patches/endian.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 mptcpd/patches/endian.patch diff --git a/mptcpd/Makefile b/mptcpd/Makefile index f234e8362..cb6f95f6d 100644 --- a/mptcpd/Makefile +++ b/mptcpd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Ycarus (Yannick Chabanois) for OpenMPTCProuter project +# Copyright (C) 2020-2022 Ycarus (Yannick Chabanois) for OpenMPTCProuter project # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mptcpd PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/intel/mptcpd.git -PKG_SOURCE_VERSION:=df4ea048cd3821f749bf06e0d01bb7d79faac812 +PKG_SOURCE_VERSION:=88bea6802379ee1cdbcba4817351b63fd1489537 PKG_VERSION:=0.9-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) @@ -36,7 +36,8 @@ endef CONFIGURE_ARGS += \ --disable-doxygen-doc \ - --disable-logging + --disable-logging \ + --with-kernel=upstream TARGET_CFLAGS += -Wno-unused-result -Wno-format-nonliteral diff --git a/mptcpd/patches/endian.patch b/mptcpd/patches/endian.patch new file mode 100644 index 000000000..72686126d --- /dev/null +++ b/mptcpd/patches/endian.patch @@ -0,0 +1,19 @@ +--- a/include/mptcpd/private/sockaddr.h 2022-07-24 18:29:37.995613204 +0200 ++++ b/include/mptcpd/private/sockaddr.h 2022-07-24 18:30:53.802312010 +0200 +@@ -24,6 +24,16 @@ + * These macros may be used in place of @c htons() or @c htonl() when + * initializing an IPv4 address or IP port constant at compile-time. + */ ++#ifndef __bswap_constant_16 ++#define __bswap_constant_16(x) \ ++ ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) ++#endif ++#ifndef __bswap_constant_32 ++#define __bswap_constant_32(x) \ ++ ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) \ ++ | (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) ++#endif ++ + ///@{ + #if __BYTE_ORDER == __LITTLE_ENDIAN + # define MPTCPD_CONSTANT_HTONS(hs) __bswap_constant_16(hs)