Code cleanup and use same syntax on the entire project

Initial code cleanup

More code cleanup

Cleanup more code

Cleanup Dot11 code

Fix OSX build issue

Cleanup examples

Fix ref and pointer declaration syntax

Fix braces

examples/portscan.cpp

@@ -44,22 +44,30 @@
 #include <tins/utils.h>
 #include <tins/packet_sender.h>
 
+using std::cout;
+using std::endl;
+using std::vector;
+using std::pair;
+using std::setw;
+using std::string;
+using std::set;
+using std::runtime_error;
 
-using namespace std;
 using namespace Tins;
 
-typedef std::pair<Sniffer*, std::string> sniffer_data;
+typedef pair<Sniffer*, string> sniffer_data;
 
 class Scanner {
 public:
-    Scanner(const NetworkInterface& interface, const IPv4Address& address, 
-        const vector<string>& ports);
+    Scanner(const NetworkInterface& interface, 
+            const IPv4Address& address, 
+            const vector<string>& ports);
     
     void run();
 private:
-    void send_syns(const NetworkInterface &iface, IPv4Address dest_ip);
-    bool callback(PDU &pdu);
-    static void *thread_proc(void *param);
+    void send_syns(const NetworkInterface& iface, IPv4Address dest_ip);
+    bool callback(PDU& pdu);
+    static void* thread_proc(void* param);
     void launch_sniffer();
     
     NetworkInterface iface;
@@ -68,37 +76,35 @@ private:
     Sniffer sniffer;
 };
 
-Scanner::Scanner(const NetworkInterface& interface, const IPv4Address& address, 
-    const vector<string>& ports)
-: iface(interface), host_to_scan(address), sniffer(interface.name())
-{
+Scanner::Scanner(const NetworkInterface& interface, 
+                 const IPv4Address& address, 
+                 const vector<string>& ports)
+: iface(interface), host_to_scan(address), sniffer(interface.name()) {
     sniffer.set_filter(
         "tcp and ip src " + address.to_string() + " and tcp[tcpflags] & (tcp-rst|tcp-syn) != 0"
     );
-    for(size_t i = 0; i < ports.size(); ++i) {
+    for (size_t i = 0; i < ports.size(); ++i) {
         ports_to_scan.insert(atoi(ports[i].c_str()));
     }
 }
 
-void *Scanner::thread_proc(void *param) {
-    Scanner *data = (Scanner*)param;
+void* Scanner::thread_proc(void* param) {
+    Scanner* data = (Scanner*)param;
     data->launch_sniffer();
     return 0;
 }
 
-void Scanner::launch_sniffer()
-{
+void Scanner::launch_sniffer() {
     sniffer.sniff_loop(make_sniffer_handler(this, &Scanner::callback));
 }
 
 /* Our scan handler. This will receive SYNs and RSTs and inform us
  * the scanned port's status.
  */
-bool Scanner::callback(PDU &pdu) 
-{
+bool Scanner::callback(PDU& pdu) {
     // Find the layers we want.
-    const IP &ip = pdu.rfind_pdu<IP>();
-    const TCP &tcp = pdu.rfind_pdu<TCP>();
+    const IP& ip = pdu.rfind_pdu<IP>();
+    const TCP& tcp = pdu.rfind_pdu<TCP>();
     // Check if the host that we're scanning sent this packet and
     // the source port is one of those that we scanned.
     if(ip.src_addr() == host_to_scan && ports_to_scan.count(tcp.sport()) == 1) {
@@ -117,8 +123,7 @@ bool Scanner::callback(PDU &pdu)
     return true;
 }
 
-void Scanner::run()
-{
+void Scanner::run() {
     pthread_t thread;
     // Launch our sniff thread.
     pthread_create(&thread, 0, &Scanner::thread_proc, this); 
@@ -126,25 +131,25 @@ void Scanner::run()
     send_syns(iface, host_to_scan);
 
     // Wait for our sniffer.
-    void *dummy;
+    void* dummy;
     pthread_join(thread, &dummy);
 }
 
 // Send syns to the given ip address, using the destination ports provided.
-void Scanner::send_syns(const NetworkInterface &iface, IPv4Address dest_ip) {
+void Scanner::send_syns(const NetworkInterface& iface, IPv4Address dest_ip) {
     // Retrieve the addresses.
     NetworkInterface::Info info = iface.addresses();
     PacketSender sender;
     // Allocate the IP PDU
     IP ip = IP(dest_ip, info.ip_addr) / TCP();
     // Get the reference to the TCP PDU
-    TCP &tcp = ip.rfind_pdu<TCP>();
+    TCP& tcp = ip.rfind_pdu<TCP>();
     // Set the SYN flag on.
     tcp.set_flag(TCP::SYN, 1);
     // Just some random port. 
     tcp.sport(1337);
     cout << "Sending SYNs..." << endl;
-    for(set<uint16_t>::const_iterator it = ports_to_scan.begin(); it != ports_to_scan.end(); ++it) {
+    for (set<uint16_t>::const_iterator it = ports_to_scan.begin(); it != ports_to_scan.end(); ++it) {
         // Set the new port and send the packet!
         tcp.dport(*it);
         sender.send(ip);
@@ -163,7 +168,7 @@ void Scanner::send_syns(const NetworkInterface &iface, IPv4Address dest_ip) {
     sender.send(eth, iface);
 }
 
-void scan(int argc, char *argv[]) {
+void scan(int argc, char* argv[]) {
     IPv4Address ip(argv[1]);
     // Resolve the interface which will be our gateway
     NetworkInterface iface(ip);
@@ -176,13 +181,15 @@ void scan(int argc, char *argv[]) {
     scanner.run();
 }
 
-int main(int argc, char *argv[]) {
-    if(argc < 3 && cout << "Usage: " << *argv << " <IPADDR> <port1> [port2] [port3]\n")
+int main(int argc, char* argv[]) {
+    if (argc < 3) {
+        cout << "Usage: " <<* argv << " <IPADDR> <port1> [port2] [port3]" << endl;
         return 1;
+    }
     try {
         scan(argc, argv);
     }
-    catch(std::runtime_error &ex) {
+    catch(runtime_error& ex) {
         cout << "Error - " << ex.what() << endl;
     }
 }