Added Dot11ProbeRequest

include/dot11.h

@@ -1025,6 +1025,7 @@ namespace Tins {
         void power_capabilities(uint8_t min_power, uint8_t max_power);
         void supported_channels(const std::list<std::pair<uint8_t, uint8_t> > &new_channels);
         void edca_parameter_set(uint32_t ac_be, uint32_t ac_bk, uint32_t ac_vi, uint32_t ac_vo);
+        void request_information(const std::list<uint8_t> elements);
 
         uint32_t write_ext_header(uint8_t *buffer, uint32_t total_sz);
         void copy_ext_header(const Dot11ManagementFrame *other);
@@ -1944,6 +1945,71 @@ namespace Tins {
 
     };
 
+    /**
+     * \brief Class representing an Probe Request frame in the IEEE 802.11 Protocol.
+     *
+     */
+    class Dot11ProbeRequest : public Dot11ManagementFrame {
+
+    public:
+
+        /**
+         * \brief Default constructor for the Probe Request frame.
+         *
+         */
+        Dot11ProbeRequest();
+
+        /**
+         * \brief Constructor for creating a 802.11 Probe Request.
+         *
+         * Constructor that builds a 802.11 Probe Request taking the interface name,
+         * destination's and source's MAC.
+         *
+         * \param iface string containing the interface's name from where to send the packet.
+         * \param dst_hw_addr uint8_t array of 6 bytes containing the destination's MAC(optional).
+         * \param src_hw_addr uint8_t array of 6 bytes containing the source's MAC(optional).
+         */
+        Dot11ProbeRequest(const std::string& iface, const uint8_t* dst_hw_addr = 0, const uint8_t* src_hw_addr = 0) throw (std::runtime_error);
+
+        /**
+         * \brief Constructor which creates a Dot11ProbeRequest object from a
+         * buffer and adds all identifiable PDUs found in the buffer as children of this one.
+         *
+         * \param buffer The buffer from which this PDU will be constructed.
+         * \param total_sz The total size of the buffer.
+         */
+        Dot11ProbeRequest(const uint8_t *buffer, uint32_t total_sz);
+
+        /**
+         * \brief Helper method to set the essid.
+         *
+         * \param new_ssid The ssid to be set.
+         */
+        void ssid(const std::string &new_ssid);
+
+        /**
+         * \brief Helper method to set the supported rates.
+         *
+         * \param new_rates A list of rates to be set.
+         */
+        void supported_rates(const std::list<float> &new_rates);
+
+        /**
+         * \brief Helper method to set the extended supported rates.
+         *
+         * \param new_rates A list of rates to be set.
+         */
+        void extended_supported_rates(const std::list<float> &new_rates);
+
+        /**
+         * \brief Helper method to set the Request Information element.
+         *
+         * \param elements A list of elements.
+         */
+        void request_information(const std::list<uint8_t> elements);
+
+    };
+
     class Dot11QoSData : public Dot11DataFrame {
 
     public:
@@ -2474,7 +2540,7 @@ namespace Tins {
          * \return The bar control field.
          */
         uint16_t bar_control() const { return _bar_control.tid; }
-        
+
         /**
          * \brief Getter for the start sequence field.
          * \return The bar start sequence.

src/dot11.cpp

@@ -432,6 +432,18 @@ void Tins::Dot11ManagementFrame::edca_parameter_set(uint32_t ac_be, uint32_t ac_
     delete[] buffer;
 }
 
+void Tins::Dot11ManagementFrame::request_information(const std::list<uint8_t> elements) {
+    uint16_t sz = elements.size();
+    list<uint8_t>::const_iterator it = elements.begin();
+    uint8_t* buffer = new uint8_t[sz];
+    for (uint16_t i = 0; i < sz; i++) {
+        buffer[i] = *it;
+        it++;
+    }
+    add_tagged_option(REQUEST, sz, buffer);
+    delete[] buffer;
+}
+
 /*
  * Dot11DataFrame
  */
@@ -1048,6 +1060,38 @@ uint32_t Tins::Dot11ReAssocResponse::write_fixed_parameters(uint8_t *buffer, uin
     return sz;
 }
 
+/* Probe Request */
+
+Tins::Dot11ProbeRequest::Dot11ProbeRequest() : Dot11ManagementFrame() {
+    this->subtype(Dot11::PROBE_REQ);
+}
+
+Tins::Dot11ProbeRequest::Dot11ProbeRequest(const std::string& iface,
+                                           const uint8_t* dst_hw_addr,
+                                           const uint8_t* src_hw_addr) throw (std::runtime_error) : Dot11ManagementFrame(iface, dst_hw_addr, src_hw_addr) {
+    this->subtype(Dot11::PROBE_REQ);
+}
+
+Tins::Dot11ProbeRequest::Dot11ProbeRequest(const uint8_t *buffer, uint32_t total_sz) : Dot11ManagementFrame(buffer, total_sz) {
+    parse_tagged_parameters(buffer, total_sz);
+}
+
+void Tins::Dot11ProbeRequest::ssid(const std::string &new_ssid) {
+    Dot11ManagementFrame::ssid(new_ssid);
+}
+
+void Tins::Dot11ProbeRequest::supported_rates(const std::list<float> &new_rates) {
+    Dot11ManagementFrame::supported_rates(new_rates);
+}
+
+void Tins::Dot11ProbeRequest::request_information(const std::list<uint8_t> elements) {
+    Dot11ManagementFrame::request_information(elements);
+}
+
+void Tins::Dot11ProbeRequest::extended_supported_rates(const std::list<float> &new_rates) {
+    Dot11ManagementFrame::extended_supported_rates(new_rates);
+}
+
 /* QoS data. */
 
 Tins::Dot11QoSData::Dot11QoSData(const std::string& iface, const uint8_t* dst_hw_addr, const uint8_t* src_hw_addr, PDU* child) throw (std::runtime_error) : Dot11DataFrame(iface, dst_hw_addr, src_hw_addr, child) {