Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use correct manufdb on windows

This commit is contained in:
gpotter2 2017-06-27 23:02:41 +02:00
parent 416b2fdaac
commit 299bd5e08d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scapy/arch/windows/__init__.py
View File

@ -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)

4
test/regression.uts
View File

@ -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