Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rudimentary eap packet parsing and dot11_action #303

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/tins/dot11.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@
#include <tins/dot11/dot11_auth.h>
#include <tins/dot11/dot11_probe.h>
#include <tins/dot11/dot11_control.h>
#include <tins/dot11/dot11_action.h>

#endif // TINS_DOT_11
154 changes: 154 additions & 0 deletions include/tins/dot11/dot11_action.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
/*
* Copyright (c) 2017, Matias Fontanini
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/

#include <tins/config.h>

#if !defined(TINS_DOT11_DOT11_ACTION_H) && defined(TINS_HAVE_DOT11)
#define TINS_DOT11_DOT11_ACTION_H

#include <tins/dot11/dot11_mgmt.h>
#include <tins/macros.h>

namespace Tins {

/**
* \brief Represents an IEEE 802.11 Action.
*
*/
class TINS_API Dot11Action : public Dot11ManagementFrame {
public:
/**
* \brief This PDU's flag.
*/
static const PDU::PDUType pdu_flag = PDU::DOT11_ACTION;

/**
* \brief Enum for the different action categories.
*
*/
enum ActionCategories {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would call this ActionCategory rather than the plural form of it.

SPECTRUMMANAGEMENT = 0,
QOS,
DLS,
BLOCKACK,
PUBLIC,
RADIOMEASUREMENT,
FASTBSS,
HT,
SAQUERY,
PROTECTEDPUBLIC,
VENDORSPECIFIC=127
};

/**
* \brief Constructor for creating a 802.11 Action.
*
* Constructs a 802.11 Action taking destination, source and a category
*
* \param dst_hw_addr The destination hardware address.
* \param src_hw_addr The source hardware address.
* \param category the action category
*/
Dot11Action(const address_type& dst_hw_addr = address_type(),
const address_type& src_hw_addr = address_type(),
ActionCategories category = ActionCategories::PUBLIC);

/**
* \brief Constructs a Dot11Action object from a buffer and adds
* all identifiable PDUs found in the buffer as children of this
* one.
*
* If the next PDU is not recognized, then a RawPDU is used.
*
* If there is not enough size for the header in the buffer
* or the input data is malformed, a malformed_packet exception
* is thrown.
*
* \param buffer The buffer from which this PDU will be constructed.
* \param total_sz The total size of the buffer.
*/
Dot11Action(const uint8_t* buffer, uint32_t total_sz);

/**
* \brief Getter for the category field.
*
* \return The stored category value.
*/
ActionCategories category() const {
return static_cast<ActionCategories>(body_.category);
}

/**
* \brief Setter for the category field.
*
* \param new_category The category to be set.
*/
void category(ActionCategories new_category);

uint32_t header_size() const;

/**
* \brief Check whether this PDU matches the specified flag.
* \param flag The flag to match
* \sa PDU::matches_flag
*/
bool matches_flag(PDUType flag) const {
return flag == pdu_flag || Dot11ManagementFrame::matches_flag(flag);
}

/**
* \brief Clones this PDU.
*
* \sa PDU::clone
*/
Dot11Action* clone() const {
return new Dot11Action(*this);
}

/**
* \brief Getter for the PDU's type.
* \sa PDU::pdu_type
*/
PDUType pdu_type() const {
return pdu_flag;
}
private:
TINS_BEGIN_PACK
struct dot11_action_body {
uint8_t category;
} TINS_END_PACK;

void write_fixed_parameters(Memory::OutputMemoryStream& stream);

dot11_action_body body_;
};

} // namespace Tins

#endif // TINS_DOT11_DOT11_ACTION_H
4 changes: 3 additions & 1 deletion include/tins/dot11/dot11_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ class TINS_API Dot11 : public PDU {
ATIM = 9,
DISASSOC = 10,
AUTH = 11,
DEAUTH = 12
DEAUTH = 12,
ACTION = 13

};

/**
Expand Down
Loading