From patchwork Sun Nov 26 13:01:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,1/4] fff-web: Fix two bugs in wifiscan.html From: Adrian Schmutzler X-Patchwork-Id: 708 Message-Id: <1511701300-3004-1-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sun, 26 Nov 2017 14:01:37 +0100 Bug 1: If devices with hidden SSID are present, the matched SSID in the awk contains the newline (="unknown\n\t"). This destroys the table after the sort. Bug 2: If SSIDs contain ampersands (yes, people do that), they are now converted to &. Signed-off-by: Adrian Schmutzler ---- Changes in v2: - none Changes in v3: - Use Tim's preferred regex Reviewed-by: Tim Niemeyer --- src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html | 4 ++-- 1 file changed, 2 insertions(+), 2 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 a235159..378896e 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 @@ -18,8 +18,8 @@ <% iwinfo w2mesh scan |\ awk -v RS='' \ - '{r = gensub(/.*Address: ([0-9A-F:]*)?.*ESSID: "?(unknown|[^"]*)"?.*Mode: ([^ ]*).*Channel: ([0-9]*).*Signal: (-[0-9]*) dBm.*Encryption: ([^"]*).*/, \ - "\\2\\4\\5 dBm\\3\\1\\6", "g"); print r;}' | sort -n + '{r = gensub(/.*Address: ([0-9A-F:]*)?.*ESSID: "?([^"\n]*)"?.*Mode: ([^ ]*).*Channel: ([0-9]*).*Signal: (-[0-9]*) dBm.*Encryption: ([^"]*).*/, \ + "\\2\\4\\5 dBm\\3\\1\\6", "g"); print r;}' | sort -n | sed 's#&#\&#' # The HTML comment contains the signal quality to allow sorting %>