mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #257 from Ysurac/develop

Browse source 
Update mptcpd
This commit is contained in:
suyuan 2022-07-26 02:49:19 +08:00 committed by GitHub
commit c8c48981e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mptcpd/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2020 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project # Copyright (C) 2020-2022 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mptcpd PKG_NAME:=mptcpd
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/intel/mptcpd.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_VERSION:=0.9-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org> PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
@ -36,7 +36,8 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-doxygen-doc \ --disable-doxygen-doc \
--disable-logging --disable-logging \
--with-kernel=upstream
TARGET_CFLAGS += -Wno-unused-result -Wno-format-nonliteral TARGET_CFLAGS += -Wno-unused-result -Wno-format-nonliteral

19
mptcpd/patches/endian.patch Normal file
View file

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