From b6fdba007740ddb5b6effd72cd64c02f50b0446d Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sun, 31 Aug 2014 18:34:52 -0300
Subject: [PATCH] The timeout Sniffer option is set to 1000 by default.

---
 include/sniffer.h | 8 +++++++-
 src/sniffer.cpp   | 8 +++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/sniffer.h b/include/sniffer.h
index 2563b51..d31fe4e 100644
--- a/include/sniffer.h
+++ b/include/sniffer.h
@@ -479,6 +479,13 @@ namespace Tins {
          */
         static const unsigned DEFAULT_SNAP_LEN;
 
+        /**
+         * \brief The default timeout.
+         *
+         * This is 1000 by default.
+         */
+        static const unsigned DEFAULT_TIMEOUT;
+
         /**
          * Default constructs a SnifferConfiguration.
          */
@@ -537,7 +544,6 @@ namespace Tins {
         bool _rfmon;
         bool _has_filter;
         std::string _filter;
-        bool _has_timeout;
         unsigned _timeout;
     };
 
diff --git a/src/sniffer.cpp b/src/sniffer.cpp
index d8ced2a..4a7355b 100644
--- a/src/sniffer.cpp
+++ b/src/sniffer.cpp
@@ -376,6 +376,7 @@ FileSniffer::FileSniffer(const std::string &file_name, const std::string &filter
 // ************************ SnifferConfiguration ************************
 
 const unsigned SnifferConfiguration::DEFAULT_SNAP_LEN = 65535;
+const unsigned SnifferConfiguration::DEFAULT_TIMEOUT = 1000;
 
 SnifferConfiguration::SnifferConfiguration() :
     _snap_len(DEFAULT_SNAP_LEN),
@@ -383,7 +384,7 @@ SnifferConfiguration::SnifferConfiguration() :
     _has_promisc(false), _promisc(false),
     _has_rfmon(false), _rfmon(false),
     _has_filter(false),
-    _has_timeout(false), _timeout(0)
+    _timeout(DEFAULT_TIMEOUT)
 {
 
 }
@@ -391,6 +392,7 @@ SnifferConfiguration::SnifferConfiguration() :
 void SnifferConfiguration::configure_sniffer_pre_activation(Sniffer& sniffer) const
 {
     sniffer.set_snap_len(_snap_len);
+    sniffer.set_timeout(_timeout);
     if (_has_buffer_size) {
         sniffer.set_buffer_size(_buffer_size);
     }
@@ -400,9 +402,6 @@ void SnifferConfiguration::configure_sniffer_pre_activation(Sniffer& sniffer) co
     if (_has_rfmon) {
         sniffer.set_rfmon(_rfmon);
     }
-    if (_has_timeout) {
-        sniffer.set_timeout(_timeout);
-    }
 }
 
 void SnifferConfiguration::configure_sniffer_pre_activation(FileSniffer& sniffer) const
@@ -454,7 +453,6 @@ void SnifferConfiguration::set_rfmon(bool enabled)
 
 void SnifferConfiguration::set_timeout(unsigned timeout)
 {
-    _has_timeout = true;
     _timeout = timeout;
 }