github-mirrors/pyPLC
1
0
Fork 0
mirror of https://github.com/uhi22/pyPLC.git synced 2024-11-10 01:05:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

addressManager: remove old style ifconfig

Browse source
This commit is contained in:
uhi22 2023-05-26 09:12:26 +02:00
parent 2f68d6a76f
commit ea45451c28
1 changed files with 49 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
addressManager.py
View file

@ -58,77 +58,61 @@ class addressManager():
foundAddresses.append(line[k+1:]) foundAddresses.append(line[k+1:])
else: else:
# on Raspberry # on Raspberry
cfg_useOldStyleIfconfig = 0 # instead of the deprecated ifconfig, use "ip addr"
if (cfg_useOldStyleIfconfig!=0): result = subprocess.run(["ip", "addr"], capture_output=True, text=True)
result = subprocess.run(["ifconfig"], capture_output=True, text=True) if (len(result.stderr)>0):
if (len(result.stderr)>0): print(result.stderr)
print(result.stderr) else:
else: blInTheEthernetChapter = 0
lines = result.stdout.split("\n") lines = result.stdout.split("\n")
for line in lines: for line in lines:
if (line.strip().find("inet6")>0): # print(line);
k = line.strip().find("fe80::") # the beginning of the IPv6 if (line[0:1]!=" "): # if the line does not start with a blank, then it is a heading, e.g.
# 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP group default qlen 1000
# 3: wlan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP group default qlen 1000
# print("This is a heading")
sFind = ": " + getConfigValue("eth_interface") # e.g. "eth0"
if (line.find(sFind)>0):
# print("This is the heading for the ethernet.")
blInTheEthernetChapter = 1 # we are in the ethernet chapter
else:
blInTheEthernetChapter = 0 # we are not in the ethernet chapter
else:
# The line started with a blank. This means, it is no heading.
# In the best case, we find here something like
# inet6 fe80::181f:efdf:97e5:2191/64 scope link
if ((blInTheEthernetChapter==1) and (line.find(" inet6")>0) and (line.find(" scope link")>0)):
k = line.find(" fe80::") # the beginning of the IPv6
if (k>0): if (k>0):
sIpWithText = line[k+1:] sIpWithText = line[k+1:]
x = sIpWithText.find(" ") # the space is the end of the IPv6 x = sIpWithText.find(" ") # the space is the end of the IPv6
sIp = sIpWithText[0:x] sIp = sIpWithText[0:x]
x = sIp.find("/") # remove the /64 at the end
if (x>0):
sIp = sIp[0:x]
# print("[addressManager] IP=>" + sIp + "<") # print("[addressManager] IP=>" + sIp + "<")
foundAddresses.append(sIp) foundAddresses.append(sIp)
else: # instead of the deprecated ifconfig, use "ip addr"
result = subprocess.run(["ip", "addr"], capture_output=True, text=True)
if (len(result.stderr)>0):
print(result.stderr)
else:
blInTheEthernetChapter = 0
lines = result.stdout.split("\n")
for line in lines:
# print(line);
if (line[0:1]!=" "): # if the line does not start with a blank, then it is a heading, e.g.
# 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP group default qlen 1000
# 3: wlan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP group default qlen 1000
# print("This is a heading")
sFind = ": " + getConfigValue("eth_interface") # e.g. "eth0"
if (line.find(sFind)>0):
# print("This is the heading for the ethernet.")
blInTheEthernetChapter = 1 # we are in the ethernet chapter
else:
blInTheEthernetChapter = 0 # we are not in the ethernet chapter
else:
# The line started with a blank. This means, it is no heading.
# In the best case, we find here something like
# inet6 fe80::181f:efdf:97e5:2191/64 scope link
if ((blInTheEthernetChapter==1) and (line.find(" inet6")>0) and (line.find(" scope link")>0)):
k = line.find(" fe80::") # the beginning of the IPv6
if (k>0):
sIpWithText = line[k+1:]
x = sIpWithText.find(" ") # the space is the end of the IPv6
sIp = sIpWithText[0:x]
x = sIp.find("/") # remove the /64 at the end
if (x>0):
sIp = sIp[0:x]
# print("[addressManager] IP=>" + sIp + "<")
foundAddresses.append(sIp)
# Also the ethernet MAC is visible here, something like # Also the ethernet MAC is visible here, something like
# link/ether b8:27:eb:27:33:53 brd ff:ff:ff:ff:ff:ff # link/ether b8:27:eb:27:33:53 brd ff:ff:ff:ff:ff:ff
if ((blInTheEthernetChapter==1) and (line.find(" link/ether")>0)): if ((blInTheEthernetChapter==1) and (line.find(" link/ether")>0)):
# print(line) # print(line)
k = line.find("link/ether ") k = line.find("link/ether ")
# print(k) # print(k)
strMac = line[k+11:k+28] strMac = line[k+11:k+28]
# e.g. "b8:27:eb:12:34:56" # e.g. "b8:27:eb:12:34:56"
# print(strMac) # print(strMac)
# Remove all ":" # Remove all ":"
strMac = strMac.replace(":", "") strMac = strMac.replace(":", "")
# print(strMac) # print(strMac)
if (len(strMac)!=12): if (len(strMac)!=12):
print("[addressManager] ERROR: invalid length of MAC string. Expected be 6 bytes, means 12 hex characters. Found " + str(len(strMac))) print("[addressManager] ERROR: invalid length of MAC string. Expected be 6 bytes, means 12 hex characters. Found " + str(len(strMac)))
else: else:
for i in range(0, 6): for i in range(0, 6):
sTwoChar = strMac[2*i : 2*i+2] sTwoChar = strMac[2*i : 2*i+2]
ba[i] = int(sTwoChar, 16) ba[i] = int(sTwoChar, 16)
self.localMac = ba self.localMac = ba
print("[addressManager] we have local MAC " + prettyMac(self.localMac) + ".") print("[addressManager] we have local MAC " + prettyMac(self.localMac) + ".")
print("[addressManager] Found " + str(len(foundAddresses)) + " link-local IPv6 addresses.") print("[addressManager] Found " + str(len(foundAddresses)) + " link-local IPv6 addresses.")