From a6cf170505d3964e64c73e7bda782952a9b49c89 Mon Sep 17 00:00:00 2001
From: George Hughey <ghughey@umd.edu>
Date: Wed, 16 Nov 2016 02:38:42 +0000
Subject: [PATCH] Minor fixes

---
 cli.py                                          |   4 ++--
 core.py                                         |   2 +-
 .../pinacolada_website/__init__.pyc             | Bin 373 -> 361 bytes
 .../pinacolada_website/views/__init__.pyc       | Bin 177 -> 165 bytes
 .../pinacolada_website/views/index.pyc          | Bin 724 -> 700 bytes
 setup.py                                        |   2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli.py b/cli.py
index c80b005..a976744 100644
--- a/cli.py
+++ b/cli.py
@@ -41,7 +41,7 @@ def print_help(self, lst):
     def do_help(self, args):
         print "\nAvailable commands are: "
         print "======================="
-        self.print_help(["list", "lists currently loaded targets, available capabilities, and enabled modules.", "quit", "quits","use <capability>", "engages a capability for use. Run \"list\" or \"list capabilities\" for a full list of capabilities.", "network", "shows all computers on the network", "discover", "use arp to discover all computers on the network and write to database"])
+        self.print_help(["list", "lists currently loaded targets, available capabilities, and enabled modules.", "quit", "quits","use <capability>", "engages a capability for use. Run \"list\" or \"list capabilities\" for a full list of capabilities.", "network", "shows all computers on the network", "discover", "use arp to discover all computers on the network and write to database", "wifi", "finds all wifi networks", "interface", "change interfaces", "promisc <enable/disable>", "enable or disable promiscuous mode", ])
     
     def do_quit(self, args):
         self.quit()
@@ -175,4 +175,4 @@ def main():
     if os.getuid() != 0:
         print BAD + "Please run me as root!"
         sys.exit()
-    main()
\ No newline at end of file
+    main()
diff --git a/core.py b/core.py
index fb216b4..fbf1a04 100644
--- a/core.py
+++ b/core.py
@@ -90,7 +90,7 @@ def promisc(self, enable=True):
     def get_categories(self):
         return ["auxiliary", "dos", "arp", "enumeration", "sniff", "exploitation", "scan"]
 
-    def beacon(pkt):
+    def beacon(self, pkt):
         ap_list = []
         if pkt.haslayer(Dot11):
             if pkt.type == 0 and pkt.subtype == 8:
diff --git a/pinacolada-website/pinacolada_website/__init__.pyc b/pinacolada-website/pinacolada_website/__init__.pyc
index e58227c568b8379f8652e72c565bd611c8008cea..646c051967185dcd10221f8a7ab7cf90ac01d8dc 100644
GIT binary patch
delta 33
pcmey$^pc64`7<xqEj7)F?7w(D7#JAzGxBp&^%Ij*CrdF#0|2<b3P1n=

delta 45
zcmaFK^p%O7`7<w<>pzW&?7t*K7#JAzGxBp&^^1#2vl8?4UGmHGa`F>XCi5{y0{~^A
B4_^QP

diff --git a/pinacolada-website/pinacolada_website/views/__init__.pyc b/pinacolada-website/pinacolada_website/views/__init__.pyc
index 675c5e672bd6da120f7e99720519598e85a3bfb8..98ac50490641f3aca555cad8c0b06781ed212784 100644
GIT binary patch
delta 32
ncmdnUxRjBd`7<xqEj7)F>}I@v3=9nV8Tq-X`iaS@6T_kbkuC`_

delta 44
zcmZ3=xRH^a`7<xql;0W?+07)Q7#JAzGxBp&^^1#2vl8?4UGmHGa`F>XCVE8!05kax
AoB#j-

diff --git a/pinacolada-website/pinacolada_website/views/index.pyc b/pinacolada-website/pinacolada_website/views/index.pyc
index 8ea363cec45282f858e985915970756d9a428289..bb1fee1566892d048a9b0f008afd74ebb276089f 100644
GIT binary patch
delta 56
xcmcb@x`&mW`7<xqEj7)J?4^vn-V6*3`WgATsrre@sgo<1oF-pq?7$F>0RYyE5WxTd

delta 80
zcmdnPdWDsp`7<w9#W#(O?4^v7;S3B6`WgATsrto5rCEu2`Y!q9c{%xsDU%bJoF<=U
J?7*uc1^^&;8pHqq

diff --git a/setup.py b/setup.py
index 73da965..3e4e858 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,3 @@
 import os
 
-os.system("pip install netifaces scapy netaddr pexpect colorama")
+os.system("pip install netifaces scapy netaddr pexpect colorama python-wifi")