Commit e7bad359 authored by Igor Pecovnik's avatar Igor Pecovnik
Browse files

Minot bugfixes and adding iper3 server toggle to networking menu.

parent b4e0bc66
...@@ -189,6 +189,17 @@ function jobs () ...@@ -189,6 +189,17 @@ function jobs ()
fi fi
;; ;;
# Connect to wireless access point
#
"Iperf3" )
# disable AP mode on certain adapters
if pgrep -x "iperf3" > /dev/null
then
pkill iperf3
else
iperf3 -s -D
fi
;;
# Connect to wireless access point # Connect to wireless access point
# #
......
...@@ -562,6 +562,14 @@ while true; do ...@@ -562,6 +562,14 @@ while true; do
fi fi
if pgrep -x "iperf3" > /dev/null
then
LIST+=( "Iperf3" "Disable network throughput tests daemon" )
else
LIST+=( "Iperf3" "Enable network throughput tests daemon" )
fi
if [[ -n $(nmcli device status | grep wifi | grep -v unavailable | grep -v unmanaged) ]]; then if [[ -n $(nmcli device status | grep wifi | grep -v unavailable | grep -v unmanaged) ]]; then
LIST+=( "WiFi" "Manage wireless networking" ) LIST+=( "WiFi" "Manage wireless networking" )
else else
...@@ -577,7 +585,7 @@ while true; do ...@@ -577,7 +585,7 @@ while true; do
LIST+=( "Forget" "Disconnect and forget all wireless connections" ) LIST+=( "Forget" "Disconnect and forget all wireless connections" )
# count number of menu items to adjust window sizee # count number of menu items to adjust window sizee
LISTLENGHT="$((13+${#LIST[@]}/2))" LISTLENGHT="$((12+${#LIST[@]}/2))"
BOXLENGHT=${#LIST[@]} BOXLENGHT=${#LIST[@]}
WIFICONNECTED=$(nmcli -f NAME,TYPE connection show --active | grep wireless | awk 'NF{NF-=1};1') WIFICONNECTED=$(nmcli -f NAME,TYPE connection show --active | grep wireless | awk 'NF{NF-=1};1')
...@@ -585,13 +593,12 @@ while true; do ...@@ -585,13 +593,12 @@ while true; do
local ipadd=$(ip -4 addr show dev $DEFAULT_ADAPTER | awk '/inet/ {print $2}' | cut -d'/' -f1) local ipadd=$(ip -4 addr show dev $DEFAULT_ADAPTER | awk '/inet/ {print $2}' | cut -d'/' -f1)
if [[ -n $(grep $DEFAULT_ADAPTER /etc/network/interfaces | grep static) ]]; then if [[ -n $(nmcli device status | grep wlan0 | grep connected) ]]; then
local ifup="\nStatic IP ($DEFAULT_ADAPTER) via IFUPDOWN: \Z1${ipadd}\n\Z0 " local ifup="\nIP ($DEFAULT_ADAPTER) via Network Manager: \Z1${ipadd}\n\Z0 "
elif [[ -n $(grep $DEFAULT_ADAPTER /etc/network/interfaces | grep dhcp) ]]; then
local ifup="\nDynamic IP ($DEFAULT_ADAPTER) via IFUPDOWN: \Z1${ipadd}\n\Z0 "
else else
local ifup="\nDynamic IP ($DEFAULT_ADAPTER) via Network Manager: \Z1${ipadd}\n\Z0 " local ifup="\nIP ($DEFAULT_ADAPTER) via IFUPDOWN: \Z1${ipadd}\n\Z0 "
fi fi
disclaimer="$ifup" disclaimer="$ifup"
if [[ -n $WIFICONNECTED ]]; then if [[ -n $WIFICONNECTED ]]; then
...@@ -613,9 +620,7 @@ while true; do ...@@ -613,9 +620,7 @@ while true; do
if [ -n $chip ] || [ "$HOSTAPDCLIENTS" -gt "0" ]; then LISTLENGHT=$((LISTLENGHT+2)); fi if [ -n $chip ] || [ "$HOSTAPDCLIENTS" -gt "0" ]; then LISTLENGHT=$((LISTLENGHT+2)); fi
disclaimer=$disclaimer$"\n"; disclaimer=$disclaimer$"\n";
fi fi
disclaimer=$disclaimer"\n\Z1Note\Zn: This tool can be successful only when drivers are in good shape. If autodetection fails, you are on your own.\n "
disclaimer=$disclaimer"\n\Z1Note\Zn: wireless networking in Linux is problematic.\
Our tools make it easy for some cases but can't enable AP on every random WiFi chip. If this tool fail, you are on your own.\n "
exec 3>&1 exec 3>&1
selection=$(dialog --backtitle "$BACKTITLE" --colors --title " Wired, Wireless, Bluetooth, Hotspot " --clear \ selection=$(dialog --backtitle "$BACKTITLE" --colors --title " Wired, Wireless, Bluetooth, Hotspot " --clear \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment