forked from freifunk-franken/firmware
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 <freifunk@adrianschmutzler.de> Reviewed-by: Tim Niemeyer <tim@tn-x.org>
This commit is contained in:
parent
686da98770
commit
04105ad510
|
@ -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: ([^"]*).*/, \
|
||||
"<!-- \\5 --><tr><td>\\2</td><td>\\4</td><td>\\5 dBm</td><td>\\3</td><td>\\1</td><td>\\6</td></tr>", "g"); print r;}' | sort -n
|
||||
'{r = gensub(/.*Address: ([0-9A-F:]*)?.*ESSID: "?([^"\n]*)"?.*Mode: ([^ ]*).*Channel: ([0-9]*).*Signal: (-[0-9]*) dBm.*Encryption: ([^"]*).*/, \
|
||||
"<!-- \\5 --><tr><td>\\2</td><td>\\4</td><td>\\5 dBm</td><td>\\3</td><td>\\1</td><td>\\6</td></tr>", "g"); print r;}' | sort -n | sed 's#&#\&#'
|
||||
# The HTML comment contains the signal quality to allow sorting
|
||||
%>
|
||||
</table>
|
||||
|
|
Loading…
Reference in New Issue