banip: DHCPv6 bugfix 14367/head
authorDirk Brenken <dev@brenken.org>
Wed, 30 Dec 2020 15:13:58 +0000 (16:13 +0100)
committerDirk Brenken <dev@brenken.org>
Wed, 30 Dec 2020 19:02:40 +0000 (20:02 +0100)
* ignore local DHCPv6 related and local icmpv6 traffic in banIP chain

Signed-off-by: Dirk Brenken <dev@brenken.org>
net/banip/Makefile
net/banip/files/banip.sh

index ddcf90dc14977f32e478e28426b8eebeecb3c7f9..5ebd6456f1ddb8bb05093ef1dab49ead17bff331 100644 (file)
@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
-PKG_VERSION:=0.3.12
-PKG_RELEASE:=3
+PKG_VERSION:=0.3.13
+PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
index 708c883873c51943ced27d2e354dab6ee0fd15db..14cc1f5f223780ad23e08c3eaf00bd746f0076cd 100755 (executable)
@@ -13,7 +13,7 @@
 #
 LC_ALL=C
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-ban_ver="0.3.12"
+ban_ver="0.3.13"
 ban_basever=""
 ban_enabled=0
 ban_automatic="1"
@@ -410,8 +410,10 @@ f_iptadd()
                        f_iptrule "-I" "${wan_forward} -j ${ban_chain}"
                        if [ "${src_name##*_}" != "6" ]
                        then
-                               # special IPv4 rules
                                f_iptrule "-A" "${ban_chain} -p udp --dport 67:68 --sport 67:68 -j RETURN"
+                       else
+                               f_iptrule "-A" "${ban_chain} -p udp -s fc00::/6 --sport 547 -d fc00::/6 --dport 546 -j RETURN"
+                               f_iptrule "-A" "${ban_chain} -p ipv6-icmp -s fe80::/10 -d fe80::/10 -j RETURN"
                        fi
                        for dev in ${ban_dev}
                        do
@@ -424,8 +426,10 @@ f_iptadd()
                        f_iptrule "-I" "${lan_forward} -j ${ban_chain}"
                        if [ "${src_name##*_}" != "6" ]
                        then
-                               # special IPv4 rules
                                f_iptrule "-A" "${ban_chain} -p udp --dport 67:68 --sport 67:68 -j RETURN"
+                       else
+                               f_iptrule "-A" "${ban_chain} -p udp -s fc00::/6 --sport 547 -d fc00::/6 --dport 546 -j RETURN"
+                               f_iptrule "-A" "${ban_chain} -p ipv6-icmp -s fe80::/10 -d fe80::/10 -j RETURN"
                        fi
                        for dev in ${ban_dev}
                        do