1
0
mirror of https://github.com/mfontanini/libtins synced 2026-01-30 13:34:27 +01:00

Added Utils::resolve_ip. IP pdu now uses this function to resolve ips.

This commit is contained in:
Matias F
2011-08-11 10:40:06 -03:00
parent f9445b05b6
commit 424d9c6476
3 changed files with 28 additions and 13 deletions

View File

@@ -14,9 +14,9 @@ using namespace std;
Tins::IP::IP(const string &ip_dst, const string &ip_src) : PDU(IPPROTO_IP) {
init_ip_fields();
if(ip_dst.size())
_ip.daddr = Utils::ip_to_int(ip_dst);
_ip.daddr = Utils::resolve_ip(ip_dst);
if(ip_src.size())
_ip.saddr = Utils::ip_to_int(ip_src);
_ip.saddr = Utils::resolve_ip(ip_src);
}
@@ -64,7 +64,7 @@ void Tins::IP::check(uint16_t new_check) {
}
void Tins::IP::source_address(const string &ip) {
_ip.saddr = Utils::ip_to_int(ip);
_ip.saddr = Utils::resolve_ip(ip);
}
void Tins::IP::source_address(uint32_t ip) {
@@ -72,7 +72,7 @@ void Tins::IP::source_address(uint32_t ip) {
}
void Tins::IP::dest_address(const string &ip) {
_ip.daddr = Utils::ip_to_int(ip);
_ip.daddr = Utils::resolve_ip(ip);
}
void Tins::IP::dest_address(uint32_t ip) {
@@ -86,23 +86,25 @@ uint32_t Tins::IP::header_size() const {
}
bool Tins::IP::send(PacketSender* sender) {
struct sockaddr_in link_addr;
link_addr.sin_family = AF_INET;
link_addr.sin_port = 0;
link_addr.sin_addr.s_addr = _ip.daddr;
return sender->send_l3(this, (const struct sockaddr*)&link_addr, sizeof(link_addr));
}
void Tins::IP::write_serialization(uint8_t *buffer, uint32_t total_sz) {
uint32_t my_sz = header_size() + trailer_size();
uint32_t new_flag = inner_pdu()? inner_pdu()->flag() : 255;
uint32_t new_flag;
assert(total_sz >= my_sz);
if(new_flag == IPPROTO_IP)
new_flag = IPPROTO_IPIP;
if(inner_pdu()) {
new_flag = inner_pdu()->flag();
if(new_flag == IPPROTO_IP)
new_flag = IPPROTO_IPIP;
}
else
new_flag = IPPROTO_IP;
flag(new_flag);
_ip.protocol = new_flag;
_ip.tot_len = total_sz;