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 a8a2256a..11f7bdfa 100644 Binary files a/tar/pialert_3.01.tar and b/tar/pialert_3.01.tar differ diff --git a/tar/pialert_latest.tar b/tar/pialert_latest.tar index a8a2256a..11f7bdfa 100644 Binary files a/tar/pialert_latest.tar and b/tar/pialert_latest.tar differ