Merge 171bdb9e66 into fbad56f05c

README.md

@@ -327,7 +327,7 @@ Options:
     --dns <ip>|<port>|<ip:port>
                             DNS server's upstream DNS.
                             Use ',' to seperate multiple servers
-                            (default: use /etc/resolve.conf)
+                            (default: use /etc/resolv.conf)
                             (Note IPv6 addresses need '[]' around)
     --no-dns                Do not serve DNS
     --no-dnsmasq            Disable dnsmasq server (DHCP, DNS, RA)
@@ -453,7 +453,6 @@ Visit [**my homepage** 🏡](https://garywill.github.io) to see **more tools and
 ## TODO
 - WPA3
 - Global IPv6
-- Explictly ban forwarding if not needed
 
 ## License
 

lnxrouter

@@ -47,7 +47,7 @@ Options:
     --dns <ip>|<port>|<ip:port>
                             DNS server's upstream DNS.
                             Use ',' to seperate multiple servers
-                            (default: use /etc/resolve.conf)
+                            (default: use /etc/resolv.conf)
                             (Note IPv6 addresses need '[]' around)
     --no-dns                Do not serve DNS
     --no-dnsmasq            Disable dnsmasq server (DHCP, DNS, RA)
@@ -191,8 +191,9 @@ define_global_variables(){
     CHANNEL=default 
     HOTSPOT20=0 # For enabling Hotspot 2.0
     WPA_VERSION=2
-    MAC_FILTER=0
+    MAC_FILTER=3  # 3 is not valid
     MAC_FILTER_ACCEPT=/etc/hostapd/hostapd.accept
+    MAC_FILTER_DENY=/etc/hostapd/hostapd.deny
     IEEE80211N=0
     REQUIREHT=0
     IEEE80211AC=0
@@ -376,13 +377,34 @@ parse_user_options(){
                 shift
                 HIDDEN=1
                 ;;
-            --mac-filter)
+
-                shift
-                MAC_FILTER=1
-                ;;
             --mac-filter-accept)
                 shift
-                MAC_FILTER_ACCEPT="$1"
+                if [ "$MAC_FILTER_TYPE" == "deny" ]
+                then
+                    printf "ERROR: Can't use --mac-filter-accept and --mac-filter-deny together.\n"
+                    exit 1
+                fi
+                MAC_FILTER_TYPE=accept
+                MAC_FILTER=1
+                MAC_FILTER_FILE=$MAC_FILTER_ACCEPT
+                ;;
+
+            --mac-filter-deny)
+                shift
+                if [ "$MAC_FILTER_TYPE" == "accept" ]
+                then
+                    printf "ERROR: Can't use --mac-filter-accept and --mac-filter-deny together.\n"
+                    exit 1
+                fi
+                MAC_FILTER_TYPE=deny
+                MAC_FILTER=0
+                MAC_FILTER_FILE=$MAC_FILTER_DENY
+                ;;
+
+            --mac-filter-file)
+                shift
+                MAC_FILTER_FILE="$1"
                 shift
                 ;;
 
@@ -862,7 +884,7 @@ get_pid_by_dbus_name() {
     
     which dbus-send >/dev/null 2>&1 || return 1
     
-    pid="$( dbus-send --system --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID string:$DBUS_NAME | grep "   uint32 " | awk '{print $2}' )" 2>/dev/null
+    pid="$( dbus-send --system --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID string:$DBUS_NAME  2>/dev/null | grep "   uint32 " | awk '{print $2}' )"
     r=$?
     
     echo "$pid"
@@ -1902,8 +1924,15 @@ write_hostapd_conf() {
 
     if [[ $MAC_FILTER -eq 1 ]]; then
         cat <<- EOF >> "$CONFDIR/hostapd.conf"
-			macaddr_acl=${MAC_FILTER}
+			macaddr_acl=1
-			accept_mac_file=${MAC_FILTER_ACCEPT}
+			accept_mac_file=${MAC_FILTER_FILE}
+		EOF
+    fi
+
+    if [[ $MAC_FILTER -eq 0 ]]; then
+        cat <<- EOF >> "$CONFDIR/hostapd.conf"
+			macaddr_acl=0
+			deny_mac_file=${MAC_FILTER_FILE}
 		EOF
     fi