From 99c29fe86be5af5bbf8bfe84f27fea3d894bcaa9 Mon Sep 17 00:00:00 2001 From: pucherot Date: Thu, 22 Apr 2021 23:03:59 +0200 Subject: [PATCH] Pi.Alert 3.01 --- back/pialert.py | 6 +++--- docs/VERSIONS_HISTORY.md | 2 +- tar/pialert_3.01.tar | Bin 58634240 -> 58634240 bytes tar/pialert_latest.tar | Bin 58634240 -> 58634240 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/back/pialert.py b/back/pialert.py index 1ba3cc61..61944dc8 100644 --- a/back/pialert.py +++ b/back/pialert.py @@ -589,14 +589,14 @@ def save_scanned_devices (p_arpscan_devices, p_cycle_interval): # BUGFIX #106 - Device that pialert is running # local_mac_cmd = ["bash -lc ifconfig `ip route list default | awk {'print $5'}` | grep ether | awk '{print $2}'"] # local_mac_cmd = ["/sbin/ifconfig `ip route list default | sort -nk11 | head -1 | awk {'print $5'}` | grep ether | awk '{print $2}'"] - local_mac_cmd = ["/sbin/ifconfig `ip -o route get 1 | sed 's/^.*dev \([^ ]*\).*$/\1/;q'` | grep ether | awk '{print $2}'"] + local_mac_cmd = ["/sbin/ifconfig `ip -o route get 1 | sed 's/^.*dev \\([^ ]*\\).*$/\\1/;q'` | grep ether | awk '{print $2}'"] local_mac = subprocess.Popen (local_mac_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() - # local_dev_cmd = ["ip -o route get 1 | sed 's/^.*dev \([^ ]*\).*$/\1/;q'"] + # local_dev_cmd = ["ip -o route get 1 | sed 's/^.*dev \\([^ ]*\\).*$/\\1/;q'"] # local_dev = subprocess.Popen (local_dev_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() # local_ip_cmd = ["ip route list default | awk {'print $7'}"] - local_ip_cmd = ["ip -o route get 1 | sed 's/^.*src \([^ ]*\).*$/\1/;q'"] + local_ip_cmd = ["ip -o route get 1 | sed 's/^.*src \\([^ ]*\\).*$/\\1/;q'"] local_ip = subprocess.Popen (local_ip_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() sql.execute ("INSERT INTO CurrentScan (cur_ScanCycle, cur_MAC, cur_IP, cur_Vendor, cur_ScanMethod) "+ diff --git a/docs/VERSIONS_HISTORY.md b/docs/VERSIONS_HISTORY.md index 2b8156d1..8dd67cb5 100644 --- a/docs/VERSIONS_HISTORY.md +++ b/docs/VERSIONS_HISTORY.md @@ -17,7 +17,7 @@ ## Pi.Alert v3.01 **PENDING UPDATE DOC** - - Fixed: Problem with local IP (raspberry IP) #106 + - Fixed: Problem with local MAC & IP (raspberry) #106 ## Pi.Alert v3.00 diff --git a/tar/pialert_3.01.tar b/tar/pialert_3.01.tar index a8a2256a924c0cd918eaf0ebb2cd4eb3ff088dae..11f7bdfa8083fd837e42d6636d06ec19f3c49b38 100644 GIT binary patch delta 4411 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 bKoSguL68h7Fc^lwP)Ie}uk&a0vCMw}iPZZL diff --git a/tar/pialert_latest.tar b/tar/pialert_latest.tar index a8a2256a924c0cd918eaf0ebb2cd4eb3ff088dae..11f7bdfa8083fd837e42d6636d06ec19f3c49b38 100644 GIT binary patch delta 4411 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 bKoSguL68h7Fc^lwP)Ie}uk&a0vCMw}iPZZL