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

Changes for kernel 6.1 support

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2022-12-30 20:14:56 +01:00
parent af843b8156
commit f814139c3d
5 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
luci-app-firewall/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=Firewall and Portforwarding application LUCI_TITLE:=Firewall and Portforwarding application
LUCI_DEPENDS:=+@LINUX_5_4:firewall +@LINUX_5_15:uci-firewall LUCI_DEPENDS:=+@LINUX_5_4:firewall +@(LINUX_5_15||LINUX_6_1):uci-firewall
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_VERSION:=omr-202103 PKG_VERSION:=omr-202103

2
mptcpd/Makefile
View file

@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME) define Package/$(PKG_NAME)
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libell @LINUX_5_15 DEPENDS:=+libell @(LINUX_5_15||LINUX_6_1)
TITLE:=mptcpd TITLE:=mptcpd
URL:=https://github.com/intel/mptcpd URL:=https://github.com/intel/mptcpd
endef endef

2
openmptcprouter-full/Makefile
View file

@ -82,7 +82,7 @@ MY_DEPENDS := \
luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \ luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \
hwinfo (TARGET_x86||TARGET_x86_64):dmidecode luci-app-packet-capture kmod-bonding luci-proto-bonding luci-app-sysupgrade \ hwinfo (TARGET_x86||TARGET_x86_64):dmidecode luci-app-packet-capture kmod-bonding luci-proto-bonding luci-app-sysupgrade \
luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 TARGET_x86_64:kmod-atlantic \ luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 TARGET_x86_64:kmod-atlantic \
LINUX_5_15:mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc kmod-mmc-spi kmod-macsec usbutils (LINUX_5_15||LINUX_6_1):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc kmod-mmc-spi kmod-macsec usbutils
# !TARGET_mvebu:kmod-usb-net-smsc75xx # !TARGET_mvebu:kmod-usb-net-smsc75xx
# libnetfilter-conntrack ebtables ebtables-utils ip-full nstat \ # libnetfilter-conntrack ebtables ebtables-utils ip-full nstat \

4
openmptcprouter/files/etc/firewall.gre-tunnel
View file

@ -39,7 +39,7 @@ _setup_fw() {
[ -n "$ifnames" ] && rule="$rule -i $(echo "${ifnames}" | sed 's/ /-i /g')" [ -n "$ifnames" ] && rule="$rule -i $(echo "${ifnames}" | sed 's/ /-i /g')"
if [ -n "$rule" ] && [ -n "$lookup" ]; then if [ -n "$rule" ] && [ -n "$lookup" ]; then
$IPTABLESAVE --counters | grep -v "0x${lookup}" | $IPTABLERESTORE -w --counters $IPTABLESAVE --counters | grep -v "0x${lookup}" | $IPTABLERESTORE -w --counters
$IPTABLERESTORE --wait=60 --noflush <<-EOF $IPTABLERESTORE --noflush <<-EOF
*mangle *mangle
-A omr-gre-tunnel ${rule} -j MARK --set-mark 0x${lookup} -A omr-gre-tunnel ${rule} -j MARK --set-mark 0x${lookup}
COMMIT COMMIT
@ -48,7 +48,7 @@ _setup_fw() {
} }
if [ -z "$($IPTABLESAVE | grep omr-gre-tunnel)" ]; then if [ -z "$($IPTABLESAVE | grep omr-gre-tunnel)" ]; then
$IPTABLERESTORE --wait=60 --noflush <<-EOF $IPTABLERESTORE --noflush <<-EOF
*mangle *mangle
:omr-gre-tunnel - :omr-gre-tunnel -
-I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-gre-tunnel -I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-gre-tunnel

7
openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
View file

@ -236,9 +236,12 @@ for intf in $allintf; do
uci -q add_list firewall.zone_vpn.network="${intf}" uci -q add_list firewall.zone_vpn.network="${intf}"
done done
#uci -q batch <<-EOF >/dev/null
# set firewall.zone_lan.mtu_fix='1'
# set firewall.zone_vpn.mtu_fix='1'
#EOF
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set firewall.zone_lan.mtu_fix='1'
set firewall.zone_vpn.mtu_fix='1'
set firewall.@include[0].reload='1' set firewall.@include[0].reload='1'
commit firewall commit firewall
EOF EOF