pacohope
/
hetrixtools-freebsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final netif with base64

main
Paco Hope 2023-10-08 15:25:26 -04:00
parent 4cadb91a2c
commit 2034477270
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hetrixtools_freebsd/cli.py
View File

@ -149,10 +149,10 @@ class Update:
def getNetInfo(self):
""" Take 2 samples, about 2 seconds apart. Report the difference."""
t0 = json.loads( self.callCommand(command=['netstat', '-f', 'inet', '-b',
t0 = json.loads( self.callCommand(command=['/usr/bin/netstat', '-f', 'inet', '-b',
'-i', '--libxo', 'json']) )
time.sleep(2.0)
t1 = json.loads( self.callCommand(command=['netstat', '-f', 'inet', '-b',
t1 = json.loads( self.callCommand(command=['/usr/bin/netstat', '-f', 'inet', '-b',
'-i', '--libxo', 'json']) )
t0list = {ifname['name']:(ifname['sent-bytes'], ifname['received-bytes'])
for ifname in t0 ['statistics']['interface']}
@ -167,23 +167,26 @@ class Update:
self.nics = base64.b64encode("".join(result).encode()).decode('utf-8')
# Now get the IPv4 and IPv6 addresses for each interface
ifconfigtxt = self.callCommand(command=['netstat', '-a'])
ifconfigtxt = self.callCommand(command=['/sbin/ifconfig', '-a'])
ifconfig = jc.parse(parser_mod_name="ifconfig", data=ifconfigtxt)
# XXX only returns first IP address assigned to an interface. Interfaces cnan have more
# than one IP
# Deliberately excludes lo0 interface
ipv4 = {ifname['name']:ifname['ipv4'][0]['address'] for ifname in ifconfig
if ifname['name'] != 'lo0' }
self.ipv4 = ','.join(f"{key}:{value}" for key, value in ipv4.items())
ipv4s = ';'.join(f"{key},{value}" for key, value in ipv4.items())
self.logger.debug(f"ipv4 = {ipv4s}")
self.ipv4 = base64.b64encode(ipv4s.encode()).decode('utf-8')
# XXX Same thing: only catches first ipv6 addr, which is probably worse, since
# most ipv6 interfaces have several IP addresses.
ipv6 = {ifname['name']:ifname['ipv6'][0]['address'] for ifname in ifconfig
if ifname['name'] != 'lo0' }
self.ipv6 = ','.join(f"{key}:{value}" for key, value in ipv6.items())
ipv6s = ';'.join(f"{key},{value}" for key, value in ipv6.items())
self.logger.debug(f"ipv6 = {ipv6s}")
self.ipv6 = base64.b64encode(ipv6s.encode()).decode('utf-8')
# Get open connections
conntext = self.callCommand(['sockstat', '-c', '-n', '-P', 'tcp'])
conntext = self.callCommand(['/usr/bin/sockstat', '-c', '-n', '-P', 'tcp'])
# At first glance it might seem like a bug. len() returns the number of lines
# counting from 0, so if there are 4 lines it reports 3. But one of the lines
# is a header line, not a connection. So we WANT to return 1 less than the actual
@ -277,6 +280,7 @@ def go():
update.getSysCtlInfo()
update.getVMStatInfo()
update.getSwapInfo()
update.getNetInfo()
else:
_logger.fatal("Failed to get output from sysctl")
_logger.info(f"Done fetching results")