diff --git a/scapy/config.py b/scapy/config.py index b81919564cbe2b24ef98799070787a09b4eaea59..16226db8c691def11f6f0979f143d34e0f4f0b78 100644 --- a/scapy/config.py +++ b/scapy/config.py @@ -149,12 +149,6 @@ extensions_paths: path or list of paths where extensions are to be looked for L2listen = None histfile = os.path.join(os.environ["HOME"], ".scapy_history") padding = 1 - p0f_base ="/etc/p0f/p0f.fp" - queso_base ="/etc/queso.conf" - nmap_base ="/usr/share/nmap/nmap-os-fingerprints" - IPCountry_base = "GeoIPCountry4Scapy.gz" - countryLoc_base = "countryLoc.csv" - gnuplot_world = "world.dat" except_filter = "" debug_match = 0 wepkey = "" diff --git a/scapy/modules/geoip.py b/scapy/modules/geoip.py index fec7814e0472665c2e8df50a7a2ca893e611d47a..01c06061d128a1194472a2a70c172139bac8d280 100644 --- a/scapy/modules/geoip.py +++ b/scapy/modules/geoip.py @@ -1,6 +1,11 @@ from scapy.data import KnowledgeBase from scapy.config import conf +conf.IPCountry_base = "GeoIPCountry4Scapy.gz" +conf.countryLoc_base = "countryLoc.csv" +conf.gnuplot_world = "world.dat" + + ########################## ## IP location database ## ########################## diff --git a/scapy/modules/nmap.py b/scapy/modules/nmap.py index 5b4911931ee0adbf37ebea6a7cf2e372a3bc01f7..ee3e0735edfc07b38eda1f8c2142f143e2c6ebbd 100644 --- a/scapy/modules/nmap.py +++ b/scapy/modules/nmap.py @@ -1,6 +1,9 @@ from scapy.data import KnowledgeBase from scapy.config import conf +conf.nmap_base ="/usr/share/nmap/nmap-os-fingerprints" + + ###################### ## nmap OS fp stuff ## ###################### diff --git a/scapy/modules/p0f.py b/scapy/modules/p0f.py index 05118e9289933ace65cb01c6bbc00b3e33031fb4..731c06336fae62a559060588cfe63c8cbb96243b 100644 --- a/scapy/modules/p0f.py +++ b/scapy/modules/p0f.py @@ -1,6 +1,9 @@ from scapy.data import KnowledgeBase from scapy.config import conf +conf.p0f_base ="/etc/p0f/p0f.fp" + + ############### ## p0f stuff ## ############### diff --git a/scapy/modules/queso.py b/scapy/modules/queso.py index 92daa32e2eb16adcd58b99800db68aacdb8bb2b6..de29726e64daa361b1844684e63af39ef144cc35 100644 --- a/scapy/modules/queso.py +++ b/scapy/modules/queso.py @@ -1,6 +1,9 @@ from scapy.data import KnowledgeBase from scapy.config import conf +conf.queso_base ="/etc/queso.conf" + + ################# ## Queso stuff ## #################