From dfb4b1c470ee152523732520bb4140fbc0395c51 Mon Sep 17 00:00:00 2001
From: Phil <phil@secdev.org>
Date: Mon, 23 Jun 2008 18:29:55 +0200
Subject: [PATCH] Moved conf initailisation for modules inside their respective
modules
---
scapy/config.py | 6 ------
scapy/modules/geoip.py | 5 +++++
scapy/modules/nmap.py | 3 +++
scapy/modules/p0f.py | 3 +++
scapy/modules/queso.py | 3 +++
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/scapy/config.py b/scapy/config.py
index b8191956..16226db8 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 fec7814e..01c06061 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 5b491193..ee3e0735 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 05118e92..731c0633 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 92daa32e..de29726e 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 ##
#################
--
GitLab