applications/create_ap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve automation for NetworkManager's unmanaged-devices

Browse Source
This commit is contained in:
oblique 2013-12-05 21:27:31 +02:00
parent 2b40f03e45
commit 94bbf1d030
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
create_ap
View File

@ -77,15 +77,21 @@ NETWORKMANAGER_CONF=/etc/NetworkManager/NetworkManager.conf
networkmanager_add_unmanaged() { networkmanager_add_unmanaged() {
[[ ! -f ${NETWORKMANAGER_CONF} ]] && return [[ ! -f ${NETWORKMANAGER_CONF} ]] && return
if [[ -n "$2" ]]; then if [[ -z "$2" ]]; then
MAC=$(get_macaddr "$1") MAC=$(get_macaddr "$1")
else else
MAC="$2" MAC="$2"
fi fi
grep -E "^unmanaged-devices=mac:${MAC}" ${NETWORKMANAGER_CONF} > /dev/null 2>&1 && return UNMANAGED=$(grep -m1 -Eo "^unmanaged-devices=.*" ${NETWORKMANAGER_CONF})
[[ $UNMANAGED == *mac:${MAC}* ]] && return
echo -n "Network Manager config found, set $1 as unmanaged device... " echo -n "Network Manager config found, set $1 as unmanaged device... "
grep -E '^\[keyfile\]' ${NETWORKMANAGER_CONF} > /dev/null 2>&1 || echo -e '\n\n[keyfile]' >> ${NETWORKMANAGER_CONF} grep -E '^\[keyfile\]' ${NETWORKMANAGER_CONF} > /dev/null 2>&1 || echo -e '\n\n[keyfile]' >> ${NETWORKMANAGER_CONF}
if [[ -z ${UNMANAGED} ]]; then
sed -e "s/^\(\[keyfile\].*\)$/\1\nunmanaged-devices=mac:${MAC}/" -i ${NETWORKMANAGER_CONF} sed -e "s/^\(\[keyfile\].*\)$/\1\nunmanaged-devices=mac:${MAC}/" -i ${NETWORKMANAGER_CONF}
else
NEW_UNMANAGED=$(echo "${UNMANAGED}" | sed -e "s/^\([[:alnum:]=:;-]*\)/\1;mac:${MAC}/")
sed -e "s/^${UNMANAGED}/${NEW_UNMANAGED}/" -i ${NETWORKMANAGER_CONF}
fi
ADDED_UNMANAGED=1 ADDED_UNMANAGED=1
sleep 2 sleep 2
echo "DONE" echo "DONE"
@ -94,12 +100,18 @@ networkmanager_add_unmanaged() {
networkmanager_rm_unmanaged() { networkmanager_rm_unmanaged() {
[[ $ADDED_UNMANAGED -eq 0 ]] && return [[ $ADDED_UNMANAGED -eq 0 ]] && return
[[ ! -f ${NETWORKMANAGER_CONF} ]] && return [[ ! -f ${NETWORKMANAGER_CONF} ]] && return
if [[ -n "$2" ]]; then if [[ -z "$2" ]]; then
MAC=$(get_macaddr "$1") MAC=$(get_macaddr "$1")
else else
MAC="$2" MAC="$2"
fi fi
UNMANAGED=$(grep -m1 -Eo "^unmanaged-devices=.*" ${NETWORKMANAGER_CONF})
if [[ $UNMANAGED != *\;* ]]; then
sed -e "/^unmanaged-devices=mac:${MAC}/d" -i ${NETWORKMANAGER_CONF} sed -e "/^unmanaged-devices=mac:${MAC}/d" -i ${NETWORKMANAGER_CONF}
else
NEW_UNMANAGED=$(echo ${UNMANAGED} | sed -e "s/;mac:${MAC}//")
sed -e "s/^${UNMANAGED}/${NEW_UNMANAGED}/" -i ${NETWORKMANAGER_CONF}
fi
sleep 2 sleep 2
} }
@ -116,6 +128,7 @@ INTERNET_IFACE=
BRIDGE_IFACE= BRIDGE_IFACE=
OLD_IP_FORWARD= OLD_IP_FORWARD=
OLD_BRIDGE_IPTABLES= OLD_BRIDGE_IPTABLES=
OLD_MACADDR=
cleanup() { cleanup() {
echo echo
@ -150,7 +163,7 @@ cleanup() {
ip link set down dev ${VWIFI_IFACE} ip link set down dev ${VWIFI_IFACE}
ip addr flush ${VWIFI_IFACE} ip addr flush ${VWIFI_IFACE}
networkmanager_rm_unmanaged ${VWIFI_IFACE} networkmanager_rm_unmanaged ${VWIFI_IFACE} ${OLD_MACADDR}
iw dev ${VWIFI_IFACE} del iw dev ${VWIFI_IFACE} del
} }
@ -310,8 +323,9 @@ else
die "Failed to create a virtual WiFi interface from ${WIFI_IFACE}." die "Failed to create a virtual WiFi interface from ${WIFI_IFACE}."
fi fi
OLD_MACADDR=$(get_macaddr ${VWIFI_IFACE})
NEW_MACADDR=$(get_new_macaddr ${VWIFI_IFACE}) NEW_MACADDR=$(get_new_macaddr ${VWIFI_IFACE})
networkmanager_add_unmanaged ${VWIFI_IFACE} ${NEW_MACADDR} networkmanager_add_unmanaged ${VWIFI_IFACE}
[[ $HIDDEN -eq 1 ]] && echo "Access Point's SSID is hidden!" [[ $HIDDEN -eq 1 ]] && echo "Access Point's SSID is hidden!"