diff --git a/scapy/arch/windows/__init__.py b/scapy/arch/windows/__init__.py index 295effa5b..44981e822 100755 --- a/scapy/arch/windows/__init__.py +++ b/scapy/arch/windows/__init__.py @@ -242,7 +242,7 @@ class WinProgPath(ConfClass): env="SystemRoot") if self.wireshark: manu_path = load_manuf(os.path.sep.join(self.wireshark.split(os.path.sep)[:-1])+os.path.sep+"manuf") - scapy.data.MANUFDB = conf.manufdb = MANUFDB = manu_path + scapy.data.MANUFDB = conf.manufdb = manu_path self.os_access = (self.powershell is not None) or (self.cscript is not None) diff --git a/test/regression.uts b/test/regression.uts index 01d149119..5f068a6f1 100644 --- a/test/regression.uts +++ b/test/regression.uts @@ -331,8 +331,8 @@ if not WINDOWS: = Test manuf DB methods ~ manufdb -assert(MANUFDB._resolve_MAC("00:00:0F:01:02:03") == "Next:01:02:03") -assert(MANUFDB._get_short_manuf("00:00:0F:01:02:03") == "Next") +assert(conf.manufdb._resolve_MAC("00:00:0F:01:02:03") == "Next:01:02:03") +assert(conf.manufdb._get_short_manuf("00:00:0F:01:02:03") == "Next") assert(in6_addrtovendor("fe80::0200:0fff:fe01:0203").lower().startswith("next")) = Test utility functions - network related