BashfulBladder / gargoyle-plugins

9 stars 7 forks source link

wifi_survey.sh #1

Closed obsy closed 11 years ago

obsy commented 11 years ago

smb_share=uci show samba | grep -m 1 '/tmp/usb_mount' | awk -F '=' '{print $2}' nfs_share=uci show nfsd | grep -m 1 '/tmp/usb_mount' | awk -F '=' '{print $2}' ftp_share=`uci show vsftpd | grep -m 1 '/tmp/usb_mount' | awk -F '=' '{print $2}'

Should by

smb_share=uci -q show samba | grep -m 1 '/tmp/usb_mount' | awk -F '=' '{print $2}' nfs_share=uci -q show nfsd | grep -m 1 '/tmp/usb_mount' | awk -F '=' '{print $2}' ftp_share=`uci -q show vsftpd | grep -m 1 '/tmp/usb_mount' | awk -F '=' '{print $2}'

(uci -q show...)

It is important for router without plugin-usb-storage (and samba/ftp/nfs config)

BashfulBladder commented 11 years ago

Thanks for finding this. I have added the fix.

BashfulBladder commented 11 years ago

BTW, I added a new 2.4GHz chart. See bottom here:

https://github.com/BashfulBladder/gargoyle-plugins/wiki

If you know of a way to get the noise floor of each channel using something other than iw, please let me know.

Thanks.

obsy commented 11 years ago

Dnia 2013-04-28, o godz. 16:38:39 BashfulBladder notifications@github.com napisał(a):

BTW, I added a new 2.4GHz chart. See bottom here:

https://github.com/BashfulBladder/gargoyle-plugins/wiki

If you know of a way to get the noise floor of each channel using something other than iw, please let me know.

Very nice update!

But (there is always some but) - there is some glitches - see my screenshot: https://dl.dropboxusercontent.com/u/60469886/Gargoyle%20Router%20Management%20Utility.png

(see network "starapomarancza"

iwinfo can show noise floor, but not for all drivers - for ath9k is not working.

BTW: no spaces in OUI, ex: ZyXELCommunicationsCorporation

Pozdrawiam, Cezary Jackiewicz

BashfulBladder commented 11 years ago

see my screenshot Yeah, I have seen some of those weird 'Old Orange/starapomarancza' stations too.

The fill I can fix.

Then there is a station that is say 6 minutes old. The noise floor was down around -90, signal of -85. Then the station disappeared for a few surveys. The noise floor rose to say -82. Because I track the station for 15 minutes in the chart, this station is now completely under the noise floor. Or the noise floor is curved as it is for starapomarancza. Then you only see the right 1/2 peeking out. Or the leading edge curved UP to the noise floor like here:

screen shot 2013-04-29 at 6 02 24 pm

See the SN4V2 station on channel 11: low Signal-to-Noise + higher noise floor on channel 9+10 = stupid shape

I don't think I will do anything about this. If I skip these bizarre stations, a user will look at the table & think "why is it missing in the chart - it's only been 4 min". I can't win. A user will hopefully see signals jumping all over the place - and think they need to average things out in their heads & the same with the noise floor changing over time.

iwinfo can show noise floor, but not for all drivers - for ath9k is not working

My TP-Link WDR3600 on the 2.4GHz band doesn't have noise with 'iwinfo wlan0 info', but it might on broadcom. I might just get a broadcom router & figure it out. Eventually.

BTW: no spaces in OUI, ex: ZyXELCommunicationsCorporation

hmmm, I hadn't even noticed this. I never even compared the string output with the original file. So sad.

The file was 770kb before. Its 803k with the spaces.

Thanks for the feedback & info.

obsy commented 11 years ago

Hi, next: if wifi is disabled (default after flash) gui shows some wrong string position. See screenshot: https://dl.dropboxusercontent.com/u/60469886/Gargoyle%20Router%20Management%20Utility1.png

Why we don't can store OUI in compressed file? And read this by zcat /tmp/oui.js.gz | awk etc?

Pozdrawiam, Cezary Jackiewicz

BashfulBladder commented 11 years ago

Eric's wget fails on the gzipped file:

ewget https://raw.github.com/BashfulBladder/gargoyle-plugins/master/plugin-gargoyle-wifi-survey/OUIs.js.gz -O /tmp/OUIs.js.gz

regular wget won't do https

so its not going to happen.

obsy commented 11 years ago

Dnia 2013-05-04, o godz. 06:22:03 BashfulBladder notifications@github.com napisał(a):

Eric's wget fails on the gzipped file:

ewget https://raw.github.com/BashfulBladder/gargoyle-plugins/master/plugin-gargoyle-wifi-survey/OUIs.js.gz -O /tmp/OUIs.js.gz

regular wget won't do https

so its not going to happen.

Download plain text and compress in /tmp?

Pozdrawiam, Cezary Jackiewicz

BashfulBladder commented 11 years ago

If you have a pyszne patch...

obsy commented 11 years ago

Dnia 2013-05-04, o godz. 23:42:01 BashfulBladder notifications@github.com napisa³(a):

If you have a pyszne patch...

See attachment.

Pozdrawiam, Cezary Jackiewicz

BashfulBladder commented 11 years ago

The attachment didn't make it.

Can you inline it directly or send it to bashful++bladder@gmail.com

remove ++

obsy commented 11 years ago
diff -Nuar plugin-gargoyle-wifi-survey.orig/files/www/js/wifi_survey.js plugin-gargoyle-wifi-survey/files/www/js/wifi_survey.js
--- plugin-gargoyle-wifi-survey.orig/files/www/js/wifi_survey.js    2013-05-04 15:53:54.000000000 +0200
+++ plugin-gargoyle-wifi-survey/files/www/js/wifi_survey.js 2013-05-06 15:31:36.000000000 +0200
@@ -400,9 +400,9 @@
    var commands = [];
    if (button_name == "remove") {
        setControlsEnabled(false, true, "Purging vendors file");
-       commands.push("rm -rf /tmp/OUIs.js");
+       commands.push("rm -rf /tmp/OUIs.js.gz");
        if (sharepoint.match(/\/tmp\/usb_mount/)) {
-           commands.push("rm -rf " + sharepoint + "/OUIs.js");
+           commands.push("rm -rf " + sharepoint + "/OUIs.js.gz");
        }
        commands.push("grep -v -e 'plugin-gargoyle-wifi-survey/OUIs.js' /etc/rc.local > /tmp/rc.local");
        commands.push("mv /tmp/rc.local /etc/rc.local");
@@ -419,6 +419,7 @@
            commands.push("grep -v -e 'plugin-gargoyle-wifi-survey/OUIs.js' /etc/rc.local | awk -v oui=\"$ouiLine\" '/^exit 0/{print oui}1' > /tmp/rc.local");
            commands.push("mv /tmp/rc.local /etc/rc.local");
        }
+       commands.push("gzip -9 " + (button_name.split("+")[0] == "usb" ? sharepoint : "/tmp") + "/OUIs.js");
    }
    var param = getParameterDefinition("commands", commands.join("\n")) + "&" + getParameterDefinition("hash", document.cookie.replace(/^.*hash=/,"").replace(/[\t ;]+.*$/, ""));

diff -Nuar plugin-gargoyle-wifi-survey.orig/files/www/wifi_survey.sh plugin-gargoyle-wifi-survey/files/www/wifi_survey.sh
--- plugin-gargoyle-wifi-survey.orig/files/www/wifi_survey.sh   2013-05-04 15:53:54.000000000 +0200
+++ plugin-gargoyle-wifi-survey/files/www/wifi_survey.sh    2013-05-06 15:26:28.000000000 +0200
@@ -42,17 +42,17 @@
    echo "var wgetOUI=\"`awk '/OUIs.js/ {print $4}' /etc/rc.local`\";"

    OUI_cat=""
-   if [ -e "$smb_share"/OUIs.js ] ; then
-       OUI_cat="cat $smb_share/OUIs.js"
+   if [ -e "$smb_share"/OUIs.js.gz ] ; then
+       OUI_cat="zcat $smb_share/OUIs.js.gz"
        oui_src="USB"
-   elif [ -e "$nfs_share"/OUIs.js ] ; then
-       OUI_cat="cat $nfs_share/OUIs.js"
+   elif [ -e "$nfs_share"/OUIs.js.gz ] ; then
+       OUI_cat="zcat $nfs_share/OUIs.js.gz"
        oui_src="USB"
-   elif [ -e "$ftp_share"/OUIs.js ] ; then
-       OUI_cat="cat $ftp_share/OUIs.js"
+   elif [ -e "$ftp_share"/OUIs.js.gz ] ; then
+       OUI_cat="zcat $ftp_share/OUIs.js.gz"
        oui_src="USB"
-   elif [ -e /tmp/OUIs.js ] ; then
-       OUI_cat="cat /tmp/OUIs.js"
+   elif [ -e /tmp/OUIs.js.gz ] ; then
+       OUI_cat="zcat /tmp/OUIs.js.gz"
        oui_src="RAM"
    fi
   echo "var oui_src=\"$oui_src\";"