Merge branch 'master' of github.com:mfontanini/libtins into develop

Conflicts:
	examples/dns_stats.cpp
	include/tins/sniffer.h
	src/sniffer.cpp

examples/arpmonitor.cpp

@@ -94,9 +94,14 @@ int main(int argc, char* argv[]) {
     config.set_promisc_mode(true);
     config.set_filter("arp");
 
-    // Sniff on the provided interface in promiscuous mode
-    Sniffer sniffer(argv[1], config);
-    
-    // Only capture arp packets
-    monitor.run(sniffer);
+    try {
+        // Sniff on the provided interface in promiscuous mode
+        Sniffer sniffer(argv[1], config);
+        
+        // Only capture arp packets
+        monitor.run(sniffer);
+    }
+    catch (std::exception& ex) {
+        std::cerr << "Error: " << ex.what() << std::endl;
+    }
 }

examples/dns_stats.cpp

@@ -204,7 +204,7 @@ int main(int argc, char* argv[]) {
             auto info = monitor.stats().get_information();
             cout << "\rAverage " << info.average.count() 
                 << "ms. Worst: " << info.worst.count() << "ms. Count: "
-                << info.count;
+                << info.count << "   ";
             cout.flush();
             sleep_for(seconds(1));
         }