Merge pull request #297 from Ysurac/develop

sync

luci-app-firewall/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 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_VERSION:=omr-202103

mptcp/files/usr/bin/multipath

@@ -131,31 +131,47 @@ if [ -f /proc/sys/net/mptcp/mptcp_enabled ]; then
 
         printf "0x%02x" $(($(($IFF^$(($IFF&$IFF_MASK))))|$FLAG)) > $FLAG_PATH
 else
-        ID=$(ip mptcp endpoint show | grep "dev $DEVICE" | awk '{print $3}')
+        ID=$(ip mptcp endpoint show | grep -m 1 "dev $DEVICE" | awk '{print $3}')
-        IFF=$(ip mptcp endpoint show | grep "dev $DEVICE" | awk '{print $4}')
+        IFF=$(ip mptcp endpoint show | grep -m 1 "dev $DEVICE" | awk '{print $4}')
         IP=$(ip a show $DEVICE | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p')
         [ -z "$ID" ] && [ -n "$IP" ] && ID=$(ip mptcp endpoint show | grep "$IP" | awk '{print $3}')
         RMID=$(ip mptcp endpoint show | grep '::ffff' | awk '{ print $3 }')
         [ -n "$RMID" ] && ip mptcp endpoint delete id $RMID 2>&1 >/dev/null
         case $TYPE in
                 "off")
-                        [ -n "$ID" ] && ip mptcp endpoint delete id $ID 2>&1 >/dev/null
+                        [ -n "$ID" ] && {
+                            for i in $ID; do
+                                ip mptcp endpoint delete id $i 2>&1 >/dev/null
+                            done
+                        }
                         exit 0;;
                 "on")
-                        [ -n "$ID" ] && ip mptcp endpoint delete id $ID 2>&1 >/dev/null
+                        [ -n "$ID" ] && {
+                            for i in $ID; do
+                                ip mptcp endpoint delete id $i 2>&1 >/dev/null
+                            done
+                        }
                         for i in $IP; do
                             ip mptcp endpoint add $i dev $DEVICE subflow fullmesh
                         done
                         exit 0;;
                 "signal")
-                        [ -n "$ID" ] && ip mptcp endpoint delete id $ID 2>&1 >/dev/null
+                        [ -n "$ID" ] && {
+                            for i in $ID; do
+                                ip mptcp endpoint delete id $i 2>&1 >/dev/null
+                            done
+                        }
                         for i in $IP; do
                             #ip mptcp endpoint add $i dev $DEVICE signal subflow fullmesh
                             ip mptcp endpoint add $i dev $DEVICE signal
                         done
                         exit 0;;
                 "backup")
-                        [ -n "$ID" ] && ip mptcp endpoint delete id $ID 2>&1 >/dev/null
+                        [ -n "$ID" ] && {
+                            for i in $ID; do
+                                ip mptcp endpoint delete id $i 2>&1 >/dev/null
+                            done
+                        }
                         for i in $IP; do
                             ip mptcp endpoint add $i dev $DEVICE backup fullmesh
                         done

mptcpd/Makefile

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

openmptcprouter-full/Makefile

@@ -21,7 +21,7 @@ MY_DEPENDS := \
     mc          \
     f2fs-tools \
     openmptcprouter \
-    dnsmasq-full \
+    dnsmasq-full dnsmasq_full_ipset \
     uhttpd \
     uhttpd-mod-ubus \
     curl \
@@ -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 \
     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 \
-    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
 #    libnetfilter-conntrack ebtables ebtables-utils ip-full nstat \
 

openmptcprouter/files/etc/firewall.gre-tunnel

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

openmptcprouter/files/etc/uci-defaults/1980-omr-firewall

@@ -236,9 +236,12 @@ for intf in $allintf; do
 	uci -q add_list firewall.zone_vpn.network="${intf}"
 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
-	set firewall.zone_lan.mtu_fix='1'
-	set firewall.zone_vpn.mtu_fix='1'
 	set firewall.@include[0].reload='1'
 	commit firewall
 EOF