diff --git a/WIFI_sniffer/b.lua b/WIFI_sniffer/b.lua index 0235126..a5cfc99 100644 --- a/WIFI_sniffer/b.lua +++ b/WIFI_sniffer/b.lua @@ -1,7 +1,7 @@ -- Scripts pour tester le sniffer de smartphone qui essaient de se connecter sur des AP WIFI -- source: https://nodemcu.readthedocs.io/en/dev/modules/wifi/#wifieventmonregister -print("\n b.lua zf190210.1804 \n") +print("\n b.lua zf190215.1856 \n") --f= "set_time.lua" if file.exists(f) then dofile(f) end @@ -60,7 +60,7 @@ end function zsort_rssi() print("tri du tableau") table.sort(zmac_adrs, function(a,b) - return a:match("[^,]+,[^,]+,([^,]+),[^,]+,[^,]+") > b:match("[^,]+,[^,]+,([^,]+),[^,]+,[^,]+") + return a:match("[^,]+,[^,]+,([^,]+),[^,]+,[^,]+") < b:match("[^,]+,[^,]+,([^,]+),[^,]+,[^,]+") end) end @@ -149,9 +149,9 @@ d = 10 ^ ((TxPower - RSSI) / (10 * n)) -wifi.eventmon.register(wifi.eventmon.AP_PROBEREQRECVED, zsniff) --[[ +wifi.eventmon.register(wifi.eventmon.AP_PROBEREQRECVED, zsniff) wifi.eventmon.unregister(wifi.eventmon.AP_PROBEREQRECVED) zshow() zsort_rssi() diff --git a/WIFI_sniffer/boot.lua b/WIFI_sniffer/boot.lua index 6dd091a..30096c2 100644 --- a/WIFI_sniffer/boot.lua +++ b/WIFI_sniffer/boot.lua @@ -1,6 +1,6 @@ -- Scripts à charger après le boot pour démarrer son appli -print("\n boot.lua zf190215.1814 \n") +print("\n boot.lua zf190215.1844 \n") function heartbeat() f= "flash_led_xfois.lua" if file.exists(f) then dofile(f) end @@ -19,7 +19,7 @@ f= "wifi_cli_start.lua" if file.exists(f) then dofile(f) end f= "web_srv2.lua" if file.exists(f) then dofile(f) end f= "set_time.lua" if file.exists(f) then dofile(f) end --f= "dsleep.lua" if file.exists(f) then dofile(f) end ---f= "b.lua" if file.exists(f) then dofile(f) end +f= "b.lua" if file.exists(f) then dofile(f) end diff --git a/WIFI_sniffer/restart.lua b/WIFI_sniffer/goodies/restart.lua similarity index 100% rename from WIFI_sniffer/restart.lua rename to WIFI_sniffer/goodies/restart.lua diff --git a/WIFI_sniffer/initz.lua b/WIFI_sniffer/initz.lua index 356caa1..49a45bb 100644 --- a/WIFI_sniffer/initz.lua +++ b/WIFI_sniffer/initz.lua @@ -3,13 +3,24 @@ -- le script repair.lua pendant xx secondes avant de continuer --Source: https://nodemcu.readthedocs.io/en/master/en/modules/node/#nodebootreason -print("\n init.lua zf181210.2358 \n") +print("\n init.lua zf190217.1231 \n") + +zswitch=3 --switch flash +gpio.mode(zswitch, gpio.INT, gpio.PULLUP) + +function hvbouton() +-- gpio.trig(zswitch, "none") + tmr.unregister(initalarme) + f= "boot.lua" if file.exists(f) then dofile(f) end +end + +gpio.trig(zswitch, "both", hvbouton) function second_chance() print("seconde chance...") f= "repair.lua" if file.exists(f) then dofile(f) end initalarme=tmr.create() - tmr.alarm(initalarme, 8*1000, tmr.ALARM_SINGLE, function() + tmr.alarm(initalarme, 4*1000, tmr.ALARM_SINGLE, function() f= "boot.lua" if file.exists(f) then dofile(f) end end) end @@ -27,7 +38,8 @@ elseif reset_reason == 5 then f= "boot.lua" if file.exists(f) then dofile(f) end elseif reset_reason == 6 then print("external reset") - f= "boot.lua" if file.exists(f) then dofile(f) end + second_chance() +-- f= "boot.lua" if file.exists(f) then dofile(f) end else print("autre raison") second_chance() diff --git a/WIFI_sniffer/a_tst_sort.lua b/WIFI_sniffer/oldies/a_tst_sort.lua similarity index 100% rename from WIFI_sniffer/a_tst_sort.lua rename to WIFI_sniffer/oldies/a_tst_sort.lua diff --git a/WIFI_sniffer/tst_sniffer_wifi1.csv b/WIFI_sniffer/oldies/tst_sniffer_wifi1.csv similarity index 100% rename from WIFI_sniffer/tst_sniffer_wifi1.csv rename to WIFI_sniffer/oldies/tst_sniffer_wifi1.csv diff --git a/WIFI_sniffer/page3.html b/WIFI_sniffer/page3.html index 91acfd7..ae96cf4 100644 --- a/WIFI_sniffer/page3.html +++ b/WIFI_sniffer/page3.html @@ -3,11 +3,11 @@ - ESP8266 page 2 + ESP8266 page 3 -

ESP8266 page 2 190215.1819

+

ESP8266 page 3 190215.1854


Coucou c'est la page 3 !
Retour à la home page...


@@ -18,34 +18,31 @@ Les données du tableau viennent du NodeMCU !

<% - -- création du tableau sur le NodeMCUjuste juste pour la démo ici ! - zmac_adrs={} - zmac_adrs["b8:d7:af:a6:bd:86"]={["zname"]="S7 zf", ["zrssi"]=45, ["ztime"]="12:03:36"} - zmac_adrs["cc:c0:79:7d:f5:d5"]={["zname"]="S7 Mélanie", ["zrssi"]=50, ["ztime"]="14:23:46"} - zmac_adrs["5c:f9:38:a1:f7:f0"]={["zname"]="MAC zf", ["zrssi"]=40, ["ztime"]="11:53:16"} - zmac_adrs["d8:30:62:5a:d6:3a"]={["zname"]="IMAC Maman", ["zrssi"]=55, ["ztime"]="17:07:23"} + zout(node.heap().."

\n") %> - + <% - for k, v in pairs(zmac_adrs) do + zsort_rssi() + for i=1, #zmac_adrs do + -- print(i,zmac_adrs[i]) + zadrs, zname, zrssi, ztime0, ztime1 = zmac_adrs[i]:match("([^,]+),([^,]+),([^,]+),([^,]+),([^,]+)") zout("\n") - zout("\t\n") - zout("\t\n") - zout("\t\n") - zout("\t\n") - zout("\n") + if tonumber(zrssi,10) < 0 then + zout("\t\n") + zout("\t\n") + zout("\t\n") + zout("\t\n") + zout("\t\n") + zout("\t\n") + zout("\t\n") + zout("\n") + end end %> -
MACNameRSSITimeIndexMACNameRSSITime0Time1Distance
" .. k .. "" .. tostring(zmac_adrs[k]["zname"]) .. "" .. tostring(zmac_adrs[k]["zrssi"]) .. "" .. tostring(zmac_adrs[k]["ztime"]) .. "
" .. tostring(i) .. "" .. zadrs .. "" .. tostring(zname) .. "" .. tostring(zrssi) .. "" .. tostring(ztime0) .. "" .. tostring(ztime1) .. "" .. tostring(zround(zcalc_distance(zrssi),1)) .. "m" .. "
- - <% - -- libère la mémoire du tableau sur le NodeMCU qui avait été créé pour la démo ici ! - zmac_adrs=nil - %> - + diff --git a/WIFI_sniffer/web_html.lua b/WIFI_sniffer/web_html.lua deleted file mode 100644 index 648ff29..0000000 --- a/WIFI_sniffer/web_html.lua +++ /dev/null @@ -1,32 +0,0 @@ --- petit script pour le HTML du serveur web - -print("\n web_html.lua zf190119.2018 \n") - ---Partie HTML et CSS pour la page web -function html_home() - buf = "\n" - buf = buf .. "

Hello, this is NodeMCU WIFI Sniffer 2008

\n" - buf = buf .. string.format("%04d/%02d/%02d %02d:%02d:%02d", tm["year"], tm["mon"], tm["day"], tm["hour"], tm["min"], tm["sec"]) .. "

\n" - buf = buf .. "\n" - for k, v in pairs(zmac_adrs) do - buf = buf .. "\n" - buf = buf .. "\n" - buf = buf .. "\n" - buf = buf .. "\n" - buf = buf .. "\n" - end - buf = buf .. "
MACNameRSSITime
" .. k .. "" .. tostring(zmac_adrs[k]["zname"]) .. "" .. tostring(zmac_adrs[k]["zrssi"]) .. "" .. tostring(zmac_adrs[k]["ztime"]) .. "
\n" - buf = buf .. "" -end - -function html_status() - buf = "\n" - buf = buf .. "

Hello, this is NodeMCU. 1608

\n" - buf = buf .. "Toto\n" - if gpio.read(zLED) == 1 then - buf = buf .. "

Led is off

\n" - else - buf = buf .. "

Led is on

\n" - end - buf = buf .. "" -end diff --git a/WIFI_sniffer/web_srv.lua b/WIFI_sniffer/web_srv.lua deleted file mode 100644 index 16ad45e..0000000 --- a/WIFI_sniffer/web_srv.lua +++ /dev/null @@ -1,38 +0,0 @@ --- petit script de serveur WEB Wifi - -print("\n web_srv.lua zf190119.1932 \n") - ---dofile("web_get.lua") -dofile("web_html.lua") - -srv = net.createServer(net.TCP) -srv:listen(80, function(conn) - conn:on("receive", function(client, request) - _, _, method, path, vars = string.find(request, "([A-Z]+) (.+)?(.+) HTTP") - - --print("\n\nweb_srv") - --print("method: ",method) - --print("path: ",path) - --print("request: ",request) - --print("vars: ",vars) - - if not string.find(request, "/favicon.ico") then - --print("coucou") - if (method == nil) then - _, _, method, path = string.find(request, "([A-Z]+) (.+) HTTP") - end - _GET = {} - if (vars ~= nil) then - for k, v in string.gmatch(vars, "(%w+)=(%w+)&*") do - _GET[k] = v - print(k..": "..v) - end - end --- web_get() - html_home() - client:send(buf) - buf=nil - end - end) - conn:on("sent", function(c) c:close() end) -end)