From patchwork Sun Nov 26 13:01:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,2/4] fff-web: Externalize iwinfo in wifiscan.html From: Adrian Schmutzler X-Patchwork-Id: 709 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Message-Id: <1511701300-3004-2-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sun, 26 Nov 2017 14:01:38 +0100 This prepares for later extensions Signed-off-by: Adrian Schmutzler --- Introduced in v3. --- .../fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html index 378896e..cc2c3b1 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html @@ -1,6 +1,19 @@ #!/usr/bin/haserl <%in /www/ssl/cgi-bin/header %> +<% +readIWinfo() { + local iface=$1 + local ssid=$2 + local mac=$3 + + iwinfo "$iface" scan |\ + awk -v RS='' \ + '{r = gensub(/.*Address: ([0-9A-F:]*)?.*ESSID: "?(unknown|[^"]*)"?[ ]*\n.*Mode: ([^ ]*).*Channel: ([0-9]*).*Signal: (-[0-9]*) dBm.*Encryption: ([^"]*).*/, \ + "<'${ssid}'>\\2\\4\\5 dBm\\3<'${mac}'>\\1\\6", "g"); print r;}' | sort -n | sed 's#&#\&#' + # The HTML comment contains the signal quality to allow sorting +} +%> <% -iwinfo w2mesh scan |\ - awk -v RS='' \ - '{r = gensub(/.*Address: ([0-9A-F:]*)?.*ESSID: "?([^"\n]*)"?.*Mode: ([^ ]*).*Channel: ([0-9]*).*Signal: (-[0-9]*) dBm.*Encryption: ([^"]*).*/, \ - "", "g"); print r;}' | sort -n | sed 's#&#\&#' - # The HTML comment contains the signal quality to allow sorting +readIWinfo "w2mesh" "td" "td" %>
@@ -16,11 +29,7 @@
\\2\\4\\5 dBm\\3\\1\\6