| Message ID | 1511701300-3004-2-git-send-email-freifunk@adrianschmutzler.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Adrian Schmutzler |
| 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 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: ([^"]*).*/, \ + "<!-- \\5 --><tr><'${ssid}'>\\2</'${ssid}'><td>\\4</td><td>\\5 dBm</td><td>\\3</td><'${mac}'>\\1</'${mac}'><td>\\6</td></tr>", "g"); print r;}' | sort -n | sed 's#&#\&#' + # The HTML comment contains the signal quality to allow sorting +} +%> <table style="width: 100%"> <tr><td> <fieldset> @@ -16,11 +29,7 @@ </tr> <% -iwinfo w2mesh scan |\ - awk -v RS='' \ - '{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 +readIWinfo "w2mesh" "td" "td" %> </table> </fieldset>
Hi Am Sonntag, den 26.11.2017, 14:01 +0100 schrieb Adrian Schmutzler: > This prepares for later extensions > > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > --- > > 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: ([^"]*).*/, \ Öh .. > + "<!-- \\5 --><tr><'${ssid}'>\\2</'${ssid}'><td>\\4</td><td>\\5 dBm</td><td>\\3</td><'${mac}'>\\1</'${mac}'><td>\\6</td></tr>", "g"); print r;}' | sort -n | sed 's#&#\&#' > > + # The HTML comment contains the signal quality to allow sorting > +} > +%> > <table style="width: 100%"> > <tr><td> > <fieldset> > @@ -16,11 +29,7 @@ > > </tr> > > <% > -iwinfo w2mesh scan |\ > > - awk -v RS='' \ > - '{r = gensub(/.*Address: ([0-9A-F:]*)?.*ESSID: "?([^"\n]*)"?.*Mode: ([^ ]*).*Channel: ([0-9]*).*Signal: (-[0-9]*) dBm.*Encryption: ([^"]*).*/, \ .. Das sieht hier anders aus. Tim > - "<!-- \\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 > +readIWinfo "w2mesh" "td" "td" > %> > > </table> > </fieldset> > -- > 2.7.4 >
Ist beim Umbauen durchgerutscht. Guter Fund. Grüße Adrian > -----Original Message----- > From: Tim Niemeyer [mailto:tim@tn-x.org] > Sent: Samstag, 20. Januar 2018 12:25 > To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken- > dev@freifunk.net > Subject: Re: [PATCH v3 2/4] fff-web: Externalize iwinfo in wifiscan.html > > Hi > > Am Sonntag, den 26.11.2017, 14:01 +0100 schrieb Adrian Schmutzler: > > This prepares for later extensions > > > > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > > > --- > > > > 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: ([^"]*).*/, \ > Öh .. > > > + "<!-- \\5 -- > ><tr><'${ssid}'>\\2</'${ssid}'><td>\\4</td><td>\\5 > dBm</td><td>\\3</td><'${mac}'>\\1</'${mac}'><td>\\6</td></tr>", "g"); > print r;}' | sort -n | sed 's#&#\&#' > > > + # The HTML comment contains the signal quality to allow > sorting > > +} > > +%> > > <table style="width: 100%"> > > <tr><td> > > <fieldset> > > @@ -16,11 +29,7 @@ > > > </tr> > > > > <% > > -iwinfo w2mesh scan |\ > > > - awk -v RS='' \ > > - '{r = gensub(/.*Address: ([0-9A-F:]*)?.*ESSID: "?([^"\n]*)"?.*Mode: > ([^ ]*).*Channel: ([0-9]*).*Signal: (-[0-9]*) dBm.*Encryption: ([^"]*).*/, \ > .. Das sieht hier anders aus. > > Tim > > > - "<!-- \\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 > > +readIWinfo "w2mesh" "td" "td" > > %> > > > </table> > > </fieldset> > > -- > > 2.7.4 > >
This prepares for later extensions Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- Introduced in v3. --- .../fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)