better docs and --help options and minor fixes

.gitignore

@@ -25,6 +25,7 @@ var/
 *.egg
 habu*.tar.gz
 beta*.py
+*.swp
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

README.md

@@ -94,7 +94,24 @@ This can give you some extra info about what habu is doing.
 This command sends ARP 'is-at' packets to each victim, poisoning their
 ARP tables for send the traffic to your system.
 
+**Note**: If you want a full working Man In The Middle attack, you need
+to enable the packet forwarding on your operating system to act like a
+router. You can do that using:
+
+``` {.sourceCode .bash}
+echo 1 > /proc/sys/net/ipv4/ip_forward
+```
+
 ``` {.sourceCode .bash}
+Usage: habu.arpoison [OPTIONS] T1 T2
+
+Options:
+  -i TEXT  Interface to use
+  -v       Verbose
+  --help   Show this message and exit.
+
+Example:
+
 $ sudo habu.arpoison 192.168.1.5 192.168.1.6
 Ether / ARP is at 00:c2:c6:30:2c:58 says 192.168.1.6
 Ether / ARP is at 00:c2:c6:30:2c:58 says 192.168.1.5
@@ -103,21 +120,19 @@ Ether / ARP is at 00:c2:c6:30:2c:58 says 192.168.1.5
 ...
 ```
 
-**Note**: If you want a full working Man In The Middle attack, you need
-to enable the packet forwarding on your operating system to act like a
-router. You can do that using:
-
-``` {.sourceCode .bash}
-echo 1 > /proc/sys/net/ipv4/ip_forward
-```
-
 ## habu.arpsniff: Discover devices on your LAN capturing ARP packets
 
 This command listen for ARP packets and shows information each device.
 
 Columns: Seconds from last packet | IP | MAC | Vendor
 
 ``` {.sourceCode .bash}
+Options:
+  -i TEXT  Interface to use
+  --help   Show this message and exit.
+
+
+
 1   192.168.0.1     a4:08:f5:19:17:a4   Sagemcom Broadband SAS
 7   192.168.0.2     64:bc:0c:33:e5:57   LG Electronics (Mobile Communications)
 2   192.168.0.5     00:c2:c6:30:2c:58   Intel Corporate
@@ -462,9 +477,24 @@ IP / ICMP 8.8.8.8 > 192.168.0.5 echo-reply 0 / Padding
 ## habu.server.ftp: Fake FTP Server
 
 This command implements a basic fake FTP server, whith the only purpose to 
-steal user credentials. The server supports SSL/TLS.
+steal user credentials.
+
+The server supports SSL/TLS.
 
 ``` {.sourceCode .bash}
+Usage: habu.server.ftp [OPTIONS]
+
+Options:
+  -a TEXT          Address to bind (default: all)
+  -p INTEGER       Which port to use (default: 21)
+  --ssl            Enable SSL/TLS (default: False)
+  --ssl-cert TEXT  SSL/TLS Cert file
+  --ssl-key TEXT   SSL/TLS Key file
+  -v               Verbose
+  --help           Show this message and exit.
+
+Example:
+
 $ sudo habu.server.ftp -p 21 --ssl --ssl-cert /tmp/cert.pem --ssl-key /tmp/key.pem
 Listening on port 2121
 Accepted connection from ('192.168.0.27', 56832)