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 ", "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 ", "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 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 e58227c..646c051 100644 Binary files a/pinacolada-website/pinacolada_website/__init__.pyc and b/pinacolada-website/pinacolada_website/__init__.pyc differ diff --git a/pinacolada-website/pinacolada_website/views/__init__.pyc b/pinacolada-website/pinacolada_website/views/__init__.pyc index 675c5e6..98ac504 100644 Binary files a/pinacolada-website/pinacolada_website/views/__init__.pyc and b/pinacolada-website/pinacolada_website/views/__init__.pyc differ diff --git a/pinacolada-website/pinacolada_website/views/index.pyc b/pinacolada-website/pinacolada_website/views/index.pyc index 8ea363c..bb1fee1 100644 Binary files a/pinacolada-website/pinacolada_website/views/index.pyc and b/pinacolada-website/pinacolada_website/views/index.pyc differ 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")