From 04105ad5109182f68b37fdffed9d886a41eb15b3 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 21 Jan 2018 15:54:29 +0100 Subject: [PATCH] fff-web: Fix two bugs in wifiscan.html 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 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 %>