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

Added Utils::resolve_domain and resolve_domain6.

Browse Source
This commit is contained in:
Matias Fontanini
2013-03-15 15:43:42 -03:00
parent 02a53da361
commit b5f9f5095e
4 changed files with 115 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/utils.h
View File

@@ -105,6 +105,26 @@ namespace Tins {
* \param to_resolve The domain name/ip address to resolve.
*/
IPv4Address resolve_ip(const std::string &to_resolve);
/**
* \brief Resolves a domain name and returns its corresponding ip address.
*
* If an ip address is given, its integer representation is returned.
* Otherwise, the domain name is resolved and its ip address is returned.
*
* \param to_resolve The domain name/ip address to resolve.
*/
IPv4Address resolve_domain(const std::string &to_resolve);
/**
* \brief Resolves a domain name and returns its corresponding ip address.
*
* If an ip address is given, its integer representation is returned.
* Otherwise, the domain name is resolved and its ip address is returned.
*
* \param to_resolve The domain name/ip address to resolve.
*/
IPv6Address resolve_domain6(const std::string &to_resolve);
/**
* \brief Resolves the hardware address for a given ip.

72
src/utils.cpp
View File

@@ -31,6 +31,7 @@
#include <sstream>
#include <memory>
#include <cassert>
#include <iostream> //borrame
#include <cstring>
#include "utils.h"
#ifndef WIN32
@@ -72,34 +73,45 @@ struct InterfaceCollector {
#endif
};
/*struct IPv4Collector {
uint32_t ip;
bool found;
const char *iface;
IPv4Collector(const char *interface) : ip(0), found(false), iface(interface) { }
bool operator() (struct ifaddrs *addr) {
if(!found && addr->ifa_addr->sa_family == AF_INET && !strcmp(addr->ifa_name, iface)) {
ip = ((struct sockaddr_in *)addr->ifa_addr)->sin_addr.s_addr;
found = true;
}
return found;
addrinfo *resolve_domain(const std::string &to_resolve, int family) {
addrinfo *result, hints = addrinfo();
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
hints.ai_family = family;
if(!getaddrinfo(to_resolve.c_str(), 0, &hints, &result))
return result;
else {
throw std::runtime_error("Could not resolve address");
}
};*/
}
namespace Tins {
/** \endcond */
IPv4Address Utils::resolve_ip(const string &to_resolve) {
namespace Utils {
IPv4Address resolve_ip(const string &to_resolve) {
struct hostent *data = gethostbyname(to_resolve.c_str());
if(!data)
throw std::runtime_error("Could not resolve IP");
return IPv4Address(((struct in_addr**)data->h_addr_list)[0]->s_addr);
}
bool Utils::resolve_hwaddr(const NetworkInterface &iface, IPv4Address ip,
IPv4Address resolve_domain(const std::string &to_resolve) {
addrinfo *result = ::resolve_domain(to_resolve, AF_INET);
IPv4Address addr(((sockaddr_in*)result->ai_addr)->sin_addr.s_addr);
freeaddrinfo(result);
return addr;
}
IPv6Address resolve_domain6(const std::string &to_resolve) {
addrinfo *result = ::resolve_domain(to_resolve, AF_INET6);
IPv6Address addr((const uint8_t*)&((sockaddr_in6*)result->ai_addr)->sin6_addr);
freeaddrinfo(result);
return addr;
}
bool resolve_hwaddr(const NetworkInterface &iface, IPv4Address ip,
HWAddress<6> *address, PacketSender &sender)
{
IPv4Address my_ip;
@@ -120,12 +132,17 @@ bool Utils::resolve_hwaddr(const NetworkInterface &iface, IPv4Address ip,
return false;
}
HWAddress<6> Utils::resolve_hwaddr(const NetworkInterface &iface, IPv4Address ip, PacketSender &sender)
HWAddress<6> resolve_hwaddr(const NetworkInterface &iface, IPv4Address ip, PacketSender &sender)
{
IPv4Address my_ip;
NetworkInterface::Info info(iface.addresses());
EthernetII packet = ARP::make_arp_request(iface, ip, info.ip_addr, info.hw_addr);
std::auto_ptr<PDU> response(sender.send_recv(packet));
#if TINS_IS_CXX11
std::unique_ptr<PDU>
#else
std::auto_ptr<PDU>
#endif
response(sender.send_recv(packet));
if(response.get()) {
const ARP *arp_resp = response->find_pdu<ARP>();
if(arp_resp)
@@ -134,7 +151,7 @@ HWAddress<6> Utils::resolve_hwaddr(const NetworkInterface &iface, IPv4Address ip
throw std::runtime_error("Could not resolve hardware address");
}
bool Utils::gateway_from_ip(IPv4Address ip, IPv4Address &gw_addr) {
bool gateway_from_ip(IPv4Address ip, IPv4Address &gw_addr) {
typedef std::vector<RouteEntry> entries_type;
entries_type entries;
uint32_t ip_int = ip;
@@ -148,21 +165,21 @@ bool Utils::gateway_from_ip(IPv4Address ip, IPv4Address &gw_addr) {
return false;
}
set<string> Utils::network_interfaces() {
set<string> network_interfaces() {
InterfaceCollector collector;
generic_iface_loop(collector);
return collector.ifaces;
}
uint16_t Utils::channel_to_mhz(uint16_t channel) {
uint16_t channel_to_mhz(uint16_t channel) {
return 2407 + (channel * 5);
}
uint16_t Utils::mhz_to_channel(uint16_t mhz) {
uint16_t mhz_to_channel(uint16_t mhz) {
return (mhz - 2407) / 5;
}
uint32_t Utils::do_checksum(const uint8_t *start, const uint8_t *end) {
uint32_t do_checksum(const uint8_t *start, const uint8_t *end) {
uint32_t checksum(0);
uint16_t *ptr = (uint16_t*)start, *last = (uint16_t*)end, padding(0);
if(((end - start) & 1) == 1) {
@@ -174,7 +191,7 @@ uint32_t Utils::do_checksum(const uint8_t *start, const uint8_t *end) {
return checksum + padding;
}
uint32_t Utils::pseudoheader_checksum(IPv4Address source_ip, IPv4Address dest_ip, uint32_t len, uint32_t flag) {
uint32_t pseudoheader_checksum(IPv4Address source_ip, IPv4Address dest_ip, uint32_t len, uint32_t flag) {
uint32_t checksum(0);
uint32_t source_ip_int = Endian::host_to_be<uint32_t>(source_ip),
dest_ip_int = Endian::host_to_be<uint32_t>(dest_ip);
@@ -188,7 +205,7 @@ uint32_t Utils::pseudoheader_checksum(IPv4Address source_ip, IPv4Address dest_ip
return checksum;
}
uint32_t Utils::pseudoheader_checksum(IPv6Address source_ip, IPv6Address dest_ip, uint32_t len, uint32_t flag) {
uint32_t pseudoheader_checksum(IPv6Address source_ip, IPv6Address dest_ip, uint32_t len, uint32_t flag) {
uint32_t checksum = 0;
IPv6Address::const_iterator it;
for(it = source_ip.begin(); it != source_ip.end(); ++it)
@@ -199,7 +216,7 @@ uint32_t Utils::pseudoheader_checksum(IPv6Address source_ip, IPv6Address dest_ip
return checksum;
}
uint32_t Utils::crc32(const uint8_t* data, uint32_t data_size) {
uint32_t crc32(const uint8_t* data, uint32_t data_size) {
uint32_t i, crc = 0;
static uint32_t crc_table[] = {
0x4DBDF21C, 0x500AE278, 0x76D3D2D4, 0x6B64C2B0,
@@ -216,3 +233,4 @@ uint32_t Utils::crc32(const uint8_t* data, uint32_t data_size) {
return crc;
}
}
}

44
tests/depends.d
View File

@@ -113,13 +113,22 @@
../include/network_interface.h:
../src/dhcpv6.o: ../src/dhcpv6.cpp ../include/dhcpv6.h ../include/pdu.h \
../include/small_uint.h
../include/endianness.h ../include/macros.h ../include/small_uint.h \
../include/ipv6_address.h ../include/pdu_option.h
../include/dhcpv6.h:
../include/pdu.h:
../include/endianness.h:
../include/macros.h:
../include/small_uint.h:
../include/ipv6_address.h:
../include/pdu_option.h:
../src/dns.o: ../src/dns.cpp ../include/dns.h ../include/macros.h \
../include/pdu.h ../include/endianness.h ../include/dns_record.h \
../include/cxxstd.h ../include/ip_address.h ../include/ipv6_address.h
@@ -582,7 +591,7 @@
../include/packet_writer.h ../include/utils.h ../include/macros.h \
../include/ip_address.h ../include/ipv6_address.h \
../include/hw_address.h ../include/internals.h ../include/constants.h \
../include/pdu.h ../include/pdu.h
../include/pdu.h ../include/cxxstd.h ../include/pdu.h
../include/packet_writer.h:
@@ -602,6 +611,8 @@
../include/pdu.h:
../include/cxxstd.h:
../include/pdu.h:
../src/pdu.o: ../src/pdu.cpp ../include/pdu.h ../include/rawpdu.h \
../include/pdu.h ../include/packet_sender.h \
@@ -1008,13 +1019,22 @@ src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
../include/ip_address.h:
src/dhcpv6.o: src/dhcpv6.cpp ../include/dhcpv6.h ../include/pdu.h \
../include/small_uint.h
../include/endianness.h ../include/macros.h ../include/small_uint.h \
../include/ipv6_address.h ../include/pdu_option.h
../include/dhcpv6.h:
../include/pdu.h:
../include/endianness.h:
../include/macros.h:
../include/small_uint.h:
../include/ipv6_address.h:
../include/pdu_option.h:
src/dns.o: src/dns.cpp ../include/dns.h ../include/macros.h \
../include/pdu.h ../include/endianness.h ../include/dns_record.h \
../include/cxxstd.h ../include/ipv6_address.h ../include/utils.h \
@@ -1839,7 +1859,8 @@ src/pdu.o: src/pdu.cpp ../include/ip.h ../include/pdu.h \
src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
../include/macros.h ../include/pdu.h ../include/endianness.h \
../include/network_interface.h ../include/hw_address.h \
../include/ip_address.h ../include/utils.h ../include/ipv6_address.h \
../include/ip_address.h ../include/dot11.h ../include/small_uint.h \
../include/pdu_option.h ../include/utils.h ../include/ipv6_address.h \
../include/internals.h ../include/constants.h
../include/radiotap.h:
@@ -1856,6 +1877,12 @@ src/radiotap.o: src/radiotap.cpp ../include/radiotap.h \
../include/ip_address.h:
../include/dot11.h:
../include/small_uint.h:
../include/pdu_option.h:
../include/utils.h:
../include/ipv6_address.h:
@@ -2073,10 +2100,11 @@ src/udp.o: src/udp.cpp ../include/udp.h ../include/macros.h \
../include/endianness.h:
../include/pdu.h:
src/utils_test.o: src/utils_test.cpp ../include/utils.h \
../include/macros.h ../include/ip_address.h ../include/ipv6_address.h \
src/utils.o: src/utils.cpp ../include/utils.h ../include/macros.h \
../include/ip_address.h ../include/ipv6_address.h \
../include/hw_address.h ../include/internals.h ../include/constants.h \
../include/pdu.h ../include/endianness.h ../include/ip_address.h
../include/pdu.h ../include/endianness.h ../include/ip_address.h \
../include/ipv6_address.h
../include/utils.h:
@@ -2097,6 +2125,8 @@ src/utils_test.o: src/utils_test.cpp ../include/utils.h \
../include/endianness.h:
../include/ip_address.h:
../include/ipv6_address.h:
src/wep_decrypt.o: src/wep_decrypt.cpp ../include/crypto.h \
../include/dot11.h ../include/macros.h ../include/pdu.h \
../include/endianness.h ../include/hw_address.h ../include/small_uint.h \

13
tests/src/utils_test.cpp → tests/src/utils.cpp
View File

@@ -4,6 +4,7 @@
#include "utils.h"
#include "endianness.h"
#include "ip_address.h"
#include "ipv6_address.h"
using namespace Tins;
@@ -74,6 +75,18 @@ TEST_F(UtilsTest, Crc32) {
}
TEST_F(UtilsTest, ResolveDomain) {
IPv4Address localhost_ip("127.0.0.1");
EXPECT_EQ(Utils::resolve_domain("localhost"), localhost_ip);
}
TEST_F(UtilsTest, ResolveDomain6) {
IPv6Address localhost_ip("2001:500:88:200::10");
EXPECT_EQ(Utils::resolve_domain6("example.com"), localhost_ip);
}
// FIXME
TEST_F(UtilsTest, Checksum) {