Integrated master and network

cli.py

@@ -4,6 +4,8 @@
 import traceback
 import netifaces as ni
 import core
+from sniff import *
+from network import *
 
 from colorama import *
 from Tkinter import *
@@ -25,6 +27,9 @@ def __init__(self):
         self.ctrlc = False
         ascii()
         print "Welcome to Pina Colada, a powerful Wifi Pineapple. Type \"help\" to see the list of available commands."
+        print "Packets are being stored in the packets directory."
+        start_sniffing()
+        init_network()
 
     def print_help(self, lst):
         it = iter(lst)

master.py

@@ -2,13 +2,13 @@
 import subprocess
 from network import *
 from scapy import *
-from packets/sniff import *
+from sniff import *
 import time
 
 if __name__ == "__main__":
     if os.getuid() != 0:
         print "Please run me as root!"
         sys.exit()
     start_sniffing()
-    init_scan()
+    init_network()
     time.sleep(3600)

network.py

@@ -51,10 +51,9 @@ def __init__(self):
         self.profile()
         self.connect()
 
-def init_scan():
-    thisComp = Network()
+def begin_scan(thisComp, portLow, portHigh):
     for comp in thisComp.comps:
-        ports = syn_scan(comp.ip, (0,1000))
+        ports = syn_scan(comp.ip, (portLow, portHigh))
         ports = ','.join(ports)
         ts = time.time()
         st = datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d %H:%M:%S')
@@ -70,3 +69,20 @@ def init_scan():
                 .format(st, network, network, st, network))
     thisComp.conn.commit()
     thisComp.cur.close()
+    return thisComp
+
+def init_network():
+    print "Initializing Network DB..."
+    thisComp = Network()
+
+    try:
+        thread.start_new_thread(begin_scan, (thisComp, 22, 22))
+    except Exception as e:
+        print "Thread creation failed :("
+        print e
+
+
+    return thisComp
+
+
+

scans.py

@@ -22,7 +22,6 @@ def slow_syn_scan(host, ports):
 
 #This is a fast syn scan.
 def syn_scan(target, ports):
-    print "Beginning Scan...\n"
     ans,unans = sr(IP(dst=target)/TCP(dport=ports),timeout=.1,verbose=0)
     rep = []
     for s,r in ans: