Skip to content

Now MAC filter deny is supported. (Only accept was supported.) #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Now MAC filter deny is supported. (Only accept was supported.) #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 35 additions & 6 deletions lnxrouter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,9 @@ define_global_variables(){
WIFI_IFACE=
CHANNEL=default
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
IEEE80211AC=0
HT_CAPAB='[HT40+]'
Expand Down Expand Up @@ -356,13 +357,34 @@ parse_user_options(){
shift
HIDDEN=1
;;
--mac-filter)

--mac-filter-accept)
shift
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-accept)

--mac-filter-deny)
shift
MAC_FILTER_ACCEPT="$1"
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
;;

Expand Down Expand Up @@ -1715,8 +1737,15 @@ write_hostapd_conf() {

if [[ $MAC_FILTER -eq 1 ]]; then
cat <<- EOF >> "$CONFDIR/hostapd.conf"
macaddr_acl=${MAC_FILTER}
accept_mac_file=${MAC_FILTER_ACCEPT}
macaddr_acl=1
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

Expand Down