From 496c4bbc0e3d2e0c4b8699bccaf2ee7bd3dadffd Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 21 Sep 2020 16:28:33 +0200 Subject: [PATCH] interfaces: list mac addresses, phase out netaddr.eui.ieee.OUI_REGISTRY_PATH. closes https://github.com/opnsense/core/issues/4364 --- src/opnsense/scripts/interfaces/list_macdb.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/opnsense/scripts/interfaces/list_macdb.py b/src/opnsense/scripts/interfaces/list_macdb.py index d423b06dc..d76f6c153 100755 --- a/src/opnsense/scripts/interfaces/list_macdb.py +++ b/src/opnsense/scripts/interfaces/list_macdb.py @@ -32,12 +32,13 @@ import os.path import sys import ujson -import netaddr.eui.ieee +import importlib.util if __name__ == '__main__': result=dict() - if os.path.isfile(netaddr.eui.ieee.OUI_REGISTRY_PATH): - for line in open(netaddr.eui.ieee.OUI_REGISTRY_PATH, 'rb'): + oui_registry_file = "%s/eui/oui.txt" % os.path.dirname(importlib.util.find_spec('netaddr').origin) + if os.path.isfile(oui_registry_file): + for line in open(oui_registry_file, 'rb'): line = line.decode() if line.find('(base 16)') > -1: parts=line.split('(base 16)')