3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Added some getters and setter to ARP and refactored some methods

Browse Source
This commit is contained in:
Santiago Alessandri
2011-08-18 10:58:20 -03:00
parent 4532d8d236
commit 305a0a6b14
2 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/arp.h
View File

@@ -128,7 +128,7 @@ namespace Tins {
*
* \param new_snd_hw_addr uint8_t array containing the new sender's hardware address.
*/
void sender_hw_addr(uint8_t* new_snd_hw_addr);
void sender_hw_addr(const uint8_t* new_snd_hw_addr);
/**
* \brief Setter for the sender's IP address.
@@ -137,12 +137,19 @@ namespace Tins {
*/
void sender_ip_addr(uint32_t new_snd_ip_addr);
/**
* \brief Setter for the sender's IP address.
*
* \param new_snd_ip_addr string containing the new sender's IP address or hostname.
*/
void sender_ip_addr(const std::string& new_snd_ip_addr);
/**
* \brief Setter for the target's hardware address.
*
* \param new_tgt_hw_addr uint8_t array containing the new target's hardware address.
*/
void target_hw_addr(uint8_t* new_tgt_hw_addr);
void target_hw_addr(const uint8_t* new_tgt_hw_addr);
/**
* \brief Setter for the target's IP address.
@@ -151,6 +158,13 @@ namespace Tins {
*/
void target_ip_addr(uint32_t new_tgt_ip_addr);
/**
* \brief Setter for the target's IP address.
*
* \param new_tgt_ip_addr string containing the new target's IP address or hostname.
*/
void target_ip_addr(const std::string& new_tgt_ip_addr);
/**
* \brief Setter for the hardware address format.
*

48
src/arp.cpp
View File

@@ -47,10 +47,10 @@ Tins::PDU* Tins::ARP::make_arp_request(const std::string& iface,
/* Create ARP packet and set its attributes */
ARP* arp = new ARP();
arp->_arp.ar_tip = target;
arp->_arp.ar_sip = sender;
arp->target_ip_addr(target);
arp->sender_ip_addr(sender);
if (hw_snd) {
memcpy(arp->_arp.ar_sha, hw_snd, 6);
arp->sender_hw_addr(hw_snd);
}
arp->opcode(REQUEST);
@@ -78,10 +78,10 @@ Tins::PDU* Tins::ARP::make_arp_reply(const string& iface,
/* Create ARP packet and set its attributes */
ARP* arp = new ARP();
arp->_arp.ar_tip = target;
arp->_arp.ar_sip = sender;
memcpy(arp->_arp.ar_sha, hw_snd, 6);
memcpy(arp->_arp.ar_tha, hw_tgt, 6);
arp->target_ip_addr(target);
arp->sender_ip_addr(sender);
arp->target_hw_addr(hw_tgt);
arp->sender_hw_addr(hw_snd);
arp->opcode(REPLY);
/* Create the EthernetII PDU with the ARP PDU as its inner PDU */
@@ -91,17 +91,17 @@ Tins::PDU* Tins::ARP::make_arp_reply(const string& iface,
Tins::ARP::ARP() : PDU(0x0608) {
std::memset(&_arp, 0, sizeof(arphdr));
_arp.ar_hrd = Utils::net_to_host_s(0x0001);
_arp.ar_pro = Utils::net_to_host_s(0x0800);
_arp.ar_hln = 6;
_arp.ar_pln = 4;
this->hw_addr_format(1);
this->prot_addr_format(0x0800);
this->hw_addr_length(6);
this->prot_addr_length(4);
}
Tins::ARP::ARP(arphdr *arp_ptr) : PDU(Utils::net_to_host_s(0x0806)) {
memcpy(&_arp, arp_ptr, sizeof(arphdr));
}
void Tins::ARP::sender_hw_addr(uint8_t* new_snd_hw_addr) {
void Tins::ARP::sender_hw_addr(const uint8_t* new_snd_hw_addr) {
memcpy(this->_arp.ar_sha, new_snd_hw_addr, 6); //Should this use hardware address' length?
}
@@ -109,7 +109,11 @@ void Tins::ARP::sender_ip_addr(uint32_t new_snd_ip_addr) {
this->_arp.ar_sip = new_snd_ip_addr;
}
void Tins::ARP::target_hw_addr(uint8_t* new_tgt_hw_addr) {
void Tins::ARP::sender_ip_addr(const string& new_snd_ip_addr) {
this->_arp.ar_sip = Utils::ip_to_int(new_snd_ip_addr);
}
void Tins::ARP::target_hw_addr(const uint8_t* new_tgt_hw_addr) {
memcpy(this->_arp.ar_tha, new_tgt_hw_addr, 6); //Should this use hardware address' length?
}
@@ -117,6 +121,10 @@ void Tins::ARP::target_ip_addr(uint32_t new_tgt_ip_addr) {
this->_arp.ar_tip = new_tgt_ip_addr;
}
void Tins::ARP::target_ip_addr(const std::string& new_tgt_ip_addr) {
this->_arp.ar_tip = Utils::ip_to_int(new_tgt_ip_addr);
}
void Tins::ARP::hw_addr_format(uint16_t new_hw_addr_fmt) {
this->_arp.ar_hrd = Utils::net_to_host_s(new_hw_addr_fmt);
}
@@ -138,10 +146,10 @@ void Tins::ARP::opcode(Flags new_opcode) {
}
void Tins::ARP::set_arp_request(const std::string& ip_tgt, const std::string& ip_snd, const uint8_t* hw_snd) {
this->_arp.ar_tip = Utils::resolve_ip(ip_tgt);
this->_arp.ar_sip = Utils::resolve_ip(ip_snd);
this->target_ip_addr(ip_tgt);
this->sender_ip_addr(ip_snd);
if (hw_snd)
memcpy(this->_arp.ar_sha, hw_snd, 6);
this->sender_hw_addr(hw_snd);
this->opcode(REQUEST);
}
@@ -150,10 +158,10 @@ void Tins::ARP::set_arp_reply(const std::string& ip_tgt,
const uint8_t* hw_tgt,
const uint8_t* hw_snd) {
this->_arp.ar_tip = Utils::resolve_ip(ip_tgt);
this->_arp.ar_sip = Utils::resolve_ip(ip_snd);
memcpy(this->_arp.ar_tha, hw_tgt, 6);
memcpy(this->_arp.ar_sha, hw_snd, 6);
this->target_ip_addr(ip_tgt);
this->sender_ip_addr(ip_snd);
this->sender_hw_addr(hw_snd);
this->target_hw_addr(hw_tgt);
this->opcode(REPLY);
}