Message ID | 1511701300-3004-1-git-send-email-freifunk@adrianschmutzler.de |
---|---|
State | Superseded |
Headers | show |
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: ([^"]*).*/, \ - "<!-- \\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>
Hi Schaut soweit gut aus. Reviewed-by: Tim Niemeyer <tim@tn-x.org> Tim Am Sonntag, den 26.11.2017, 14:01 +0100 schrieb Adrian Schmutzler: > 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> > > ---- > > Changes in v2: > - none > > Changes in v3: > - Use Tim's preferred regex > --- > 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: ([^"]*).*/, \ > - "<!-- \\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> > -- > 2.7.4 >
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> ---- Changes in v2: - none Changes in v3: - Use Tim's preferred regex --- src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)