Remove database instance from each interface thread.

diff --git a/cappie/__init__.py b/cappie/__init__.py
index 5e5a10a7beab792520ef83baed250edc87a79d91..01737d11254cbafd20eb2c825746511e7bf332d3 100644 (file)
--- a/cappie/__init__.py
+++ b/cappie/__init__.py
@@ -139,8 +139,6 @@ class Interface(Thread):
                self.promisc = promisc
                self.queue = self.cappie.queue
 
-               self.db = Database(self)
-
                self.log.debug("Created new interface %s" % self.dev)
                
                self.__running = True
@@ -160,14 +158,9 @@ class Interface(Thread):
                for key, val in p.items():
                        self.log.debug("  %s: %s" % (key, val))
 
-               if not self.db.has(p["source_address"]):
-                       self.db.put(p["source_address"], "SOURCE_IP_ADDRESS", p["source_ip_address"])
-
        def run(self):
                self.log.info("Starting interface %s" % self.dev)
 
-               self.db.open()
-
                p = pcapy.open_live(self.dev, self.mtu, self.promisc, 0)
                p.setfilter(self.filter)
                #p.loop(0, self._callback)
@@ -175,7 +168,6 @@ class Interface(Thread):
                p.setnonblock(1)
                while True:
                        if not self.__running:
-                               self.db.close()
                                return
                        
                        if p.dispatch(1, self._callback):