3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-30 13:34:27 +01:00
Code Issues Releases Wiki Activity

Added PacketSender::recv_l2. Ethernet packets can now expect a response packet. ARP response is working now.

Browse Source
This commit is contained in:
matias
2011-08-16 00:36:59 -03:00
parent 5b851a9142
commit a489eab8b9
9 changed files with 190 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/arp.h
View File

@@ -181,8 +181,25 @@ namespace Tins {
void set_arp_request(const std::string &ip_dst, const std::string &ip_src, const std::string &hw_src = "");
/** \brief Check wether ptr points to a valid response for this PDU.
*
* \sa PDU::matches_response
* \param ptr The pointer to the buffer.
* \param total_sz The size of the buffer.
*/
bool matches_response(uint8_t *ptr, uint32_t total_sz);
uint32_t header_size() const;
/** \brief Clones this pdu, filling the corresponding header with data
* extracted from a buffer.
*
* \param ptr The pointer to the from from which the data will be extracted.
* \param total_sz The size of the buffer.
* \return The cloned PDU.
* \sa PDU::clone_packet
*/
PDU *clone_packet(uint8_t *ptr, uint32_t total_sz);
private:
struct arphdr {
uint16_t ar_hrd; /* format of hardware address */
@@ -197,6 +214,12 @@ namespace Tins {
uint32_t ar_tip; /* target IP address */
} __attribute__((__packed__));
/** \brief Creates an instance of ARP using an arphdr pointer.
*
* \param arp_ptr The pointer to the arphdr.
*/
ARP(arphdr *arp_ptr);
void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
arphdr _arp;

44
include/ethernetII.h
View File

@@ -41,12 +41,12 @@ namespace Tins {
* Constructor that builds an ethernet PDU taking the destination's
* and source's MAC.
*
* \param iface string containing the interface's name from where to send the packet.
* \param mac_dst uint8_t array of 6 bytes containing the destination's MAC.
* \param mac_src uint8_t array of 6 bytes containing the source's MAC.
* \param iface string containing the interface's name from where to send the packet.
* \param child PDU* with the PDU contained by the ethernet PDU (optional).
*/
EthernetII(const uint8_t* mac_dst, const uint8_t* mac_src, const std::string& iface, PDU* child = 0) throw (std::runtime_error);
EthernetII(const std::string& iface, const uint8_t* mac_dst, const uint8_t* mac_src, PDU* child = 0) throw (std::runtime_error);
/**
* \brief Constructor for creating an ethernet PDU
@@ -59,7 +59,7 @@ namespace Tins {
* \param iface_index uint32_t containing the interface's index from where to send the packet.
* \param child PDU* with the PDU contained by the ethernet PDU (optional).
*/
EthernetII(const uint8_t* mac_dst, const uint8_t* mac_src, const uint32_t iface_index, PDU* child = 0);
EthernetII(const uint32_t iface_index, const uint8_t* mac_dst = 0, const uint8_t* mac_src = 0, PDU* child = 0);
/* Getters */
/**
@@ -67,14 +67,14 @@ namespace Tins {
*
* \return Returns the destination's mac address as a constant uint8_t pointer.
*/
inline const uint8_t* dst_mac() const { return this->header.dst_mac; }
inline const uint8_t* dst_mac() const { return _eth.dst_mac; }
/**
* \brief Getter for the source's mac address.
*
* \return Returns the source's mac address as a constant uint8_t pointer.
*/
inline const uint8_t* src_mac() const { return this->header.src_mac; }
inline const uint8_t* src_mac() const { return _eth.src_mac; }
/**
* \brief Getter for the interface.
@@ -125,20 +125,50 @@ namespace Tins {
* \sa PDU::send()
*/
bool send(PacketSender* sender);
/** \brief Check wether ptr points to a valid response for this PDU.
*
* \sa PDU::matches_response
* \param ptr The pointer to the buffer.
* \param total_sz The size of the buffer.
*/
bool matches_response(uint8_t *ptr, uint32_t total_sz);
/** \brief Receives a matching response for this packet.
*
* \sa PDU::recv_response
* \param sender The packet sender which will receive the packet.
*/
PDU *recv_response(PacketSender *sender);
PDUType pdu_type() const { return PDU::ETHERNET_II; }
/** \brief Clones this pdu, filling the corresponding header with data
* extracted from a buffer.
*
* \param ptr The pointer to the from from which the data will be extracted.
* \param total_sz The size of the buffer.
* \return The cloned PDU.
* \sa PDU::clone_packet
*/
PDU *clone_packet(uint8_t *ptr, uint32_t total_sz);
private:
/**
* Struct that represents the Ethernet II header
*/
struct ethernet_header {
struct ethhdr {
uint8_t dst_mac[6];
uint8_t src_mac[6];
uint16_t payload_type;
} __attribute__((__packed__));
ethernet_header header;
/** \brief Creates an instance of EthernetII using an ethhdr pointer.
*
* \param eth_ptr The pointer to the ethhdr.
*/
EthernetII(ethhdr *eth_ptr);
ethhdr _eth;
uint32_t _iface_index;
void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);

2
include/packetsender.h
View File

@@ -71,6 +71,8 @@ namespace Tins {
PDU *send_recv(PDU *pdu);
PDU *recv_l2(PDU *pdu, struct sockaddr *link_addr, uint32_t len_link_addr);
bool send_l2(PDU *pdu, struct sockaddr* link_addr, uint32_t len_link_addr);
PDU *recv_l3(PDU *pdu, struct sockaddr *link_addr, uint32_t len_link_addr, SocketType type);

7
include/pdu.h
View File

@@ -148,6 +148,13 @@ namespace Tins {
*/
virtual PDUType pdu_type() const = 0;
/** \brief Clones this pdu, filling the corresponding header with data
* extracted from a buffer.
*
* \param ptr The pointer to the from from which the data will be extracted.
* \param total_sz The size of the buffer.
* \return The cloned PDU.
*/
virtual PDU *clone_packet(uint8_t *ptr, uint32_t total_sz) { return 0; }
protected:
/* Serialize this PDU storing the result in buffer. */

2
include/utils.h
View File

@@ -66,7 +66,7 @@ namespace Tins {
* The input buffer must be at least 6 bytes long.
* \param array The input buffer.
*/
std::string hwaddr_to_string(uint8_t *array);
std::string hwaddr_to_string(const uint8_t *array);
/** \brief Resolves a domain name and returns its corresponding ip address.
*