# HG changeset patch # User Pascal Bellard # Date 1341083591 -7200 # Node ID 1602cb73097e30fbbb21eb181446f6aaf49cde6f # Parent 186f45ca4d0490a06755e9fd9d8937ae24b37884 network.cgi: add ap diff -r 186f45ca4d04 -r 1602cb73097e network.cgi --- a/network.cgi Sat Jun 30 14:36:32 2012 +0200 +++ b/network.cgi Sat Jun 30 21:13:11 2012 +0200 @@ -33,17 +33,22 @@ for i in $(iwlist $WIFI_INTERFACE scan | sed '/Cell /!d;s/.*Cell $[^ ]*$.*/Cell.\1/') do SCAN=$(iwlist $WIFI_INTERFACE scan last | sed "/$i/,/Cell/!d" | sed '$d') - ESSID=$(echo $SCAN | sed '/ESSID/!d;s/.*ESSID:"$.*$"$/\1/') + ESSID=$(echo $SCAN | sed 's/.*ESSID:"$[^"]*$.*/\1/') if echo "$SCAN" | grep -q Quality; then - QUALITY=$(echo $SCAN | sed '/Quality/!d;s/.*Quality:$[^ ]*$.*/\1/') + QUALITY=$(echo $SCAN | sed 's/.*Quality:$[^ ]*$.*/\1/') else QUALITY="-" fi - ENCRYPTION=$(echo $SCAN | sed '/key:/!d;s/.*key:$[^ ]*$.*/\1/') + ENCRYPTION=$(echo $SCAN | sed 's/.*key:$[^ ]*$.*/\1/') # Check encryption type if echo "$SCAN" | grep -q WPA*; then ENCRYPTION="WPA" fi + if echo $SCAN | grep -q 'Mode:Managed'; then + AP="&ap=$(echo $SCAN | sed 's/.*Address: $[^ ]*$.*/\1/')" + else + AP="" + fi # Connected or not connected... if ifconfig | grep -A 1 $WIFI_INTERFACE | \ fgrep -q inet && iwconfig $WIFI_INTERFACE | \ @@ -53,7 +58,7 @@ status="---" fi echo '' - echo " + echo "

$ESSID" echo "$QUALITY$ENCRYPTION$status $ip" echo '' @@ -216,10 +221,11 @@ $(detect_wifi_networks) EOT + WIFI_AP="$(GET ap)" WIFI_KEY="$(GET key)" case "$(GET keytype)" in ''|off) WIFI_KEY_TYPE=none ;; - * WIFI_KEY_TYPE=any ;; + *) WIFI_KEY_TYPE=any ;; esac if [ "$(GET essid)" ]; then /etc/init.d/network.sh stop | log @@ -227,6 +233,7 @@ -e s"/^WIFI_ESSID=.*/WIFI_ESSID=\"$(GET essid)\""/ \ -e s"/^WIFI_KEY=.*/WIFI_KEY=\"$WIFI_KEY\"/" \ -e s"/^WIFI_KEY_TYPE=.*/WIFI_KEY_TYPE=\"$WIFI_KEY_TYPE\"/" \ + -e s"/^WIFI_AP=.*/WIFI_AP=\"$WIFI_AP\"/" \ /etc/network.conf . /etc/network.conf start_wifi @@ -262,6 +269,10 @@ $(gettext 'Encryption type') + + $(gettext 'Access point') + + $(table_end)