diff --git a/include/ehs/io/socket/BaseICMP.h b/include/ehs/io/socket/BaseICMP.h index b81e12e..42d3720 100644 --- a/include/ehs/io/socket/BaseICMP.h +++ b/include/ehs/io/socket/BaseICMP.h @@ -39,9 +39,11 @@ namespace ehs BaseICMP &operator=(const BaseICMP &icmp); - virtual UInt_64 Send(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size); + virtual void Release(); - virtual UInt_64 Receive(Str_8 &address, ICMP_Header &header, Serializer &data); + UInt_64 Send(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size); + + UInt_64 Receive(Str_8 &address, ICMP_Header &header, Serializer &data); void SendEchoRequest(const Str_8 &address, ICMP_EchoRequest er, const Byte *data, UInt_64 size); @@ -53,5 +55,14 @@ namespace ehs protected: static UInt_16 ComputeChecksumV4(UInt_16 *buffer, Size length); + + private: + virtual UInt_64 SendV6(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size); + + virtual UInt_64 SendV4(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size); + + virtual UInt_64 ReceiveV6(Str_8 &address, ICMP_Header &header, Serializer &data) const; + + virtual UInt_64 ReceiveV4(Str_8 &address, ICMP_Header &header, Serializer &data) const; }; } diff --git a/include/ehs/io/socket/ICMP_LNX.h b/include/ehs/io/socket/ICMP_LNX.h index 68efaaa..83525f1 100644 --- a/include/ehs/io/socket/ICMP_LNX.h +++ b/include/ehs/io/socket/ICMP_LNX.h @@ -20,7 +20,7 @@ namespace ehs sockaddr_in6 src; public: - ~ICMP(); + ~ICMP() override; ICMP(); @@ -34,9 +34,7 @@ namespace ehs ICMP &operator=(const ICMP &icmp); - UInt_64 Send(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) override; - - UInt_64 Receive(Str_8 &address, ICMP_Header &header, Serializer &data) override; + void Release() override; void SetReceiveTimeout(UInt_64 timeout) override; @@ -51,12 +49,12 @@ namespace ehs UInt_16 ComputeChecksumV6(UInt_16* buffer, Size length, const sockaddr_in6& dst); - UInt_64 SendV6(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size); + UInt_64 SendV6(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) override; - UInt_64 SendV4(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size); + UInt_64 SendV4(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) override; - UInt_64 ReceiveV6(Str_8 &address, ICMP_Header &header, Serializer &data) const; + UInt_64 ReceiveV6(Str_8 &address, ICMP_Header &header, Serializer &data) const override; - UInt_64 ReceiveV4(Str_8 &address, ICMP_Header &header, Serializer &data) const; + UInt_64 ReceiveV4(Str_8 &address, ICMP_Header &header, Serializer &data) const override; }; } \ No newline at end of file diff --git a/include/ehs/io/socket/ICMP_W32.h b/include/ehs/io/socket/ICMP_W32.h index 5d7b7e6..e960be7 100644 --- a/include/ehs/io/socket/ICMP_W32.h +++ b/include/ehs/io/socket/ICMP_W32.h @@ -1,6 +1,11 @@ #pragma once #include "BaseICMP.h" +#include "ehs/System/OS.h" + +#include +#include +#include namespace ehs { @@ -8,8 +13,11 @@ namespace ehs { private: Int_32 hdl; + sockaddr_in6 src; public: + ~ICMP() override; + ICMP(); ICMP(IP version); @@ -22,12 +30,27 @@ namespace ehs ICMP &operator=(const ICMP &icmp); - UInt_64 Send(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) override; - - UInt_64 Receive(Str_8 &address, ICMP_Header header, Serializer &data) override; + void Release() override; void SetReceiveTimeout(UInt_64 timeout) override; bool IsValid() const override; + + private: + static bool IsLinkLocal(const in6_addr &addr); + + static sockaddr_in6 RetrieveSrcAddress(); + + static UInt_32 CalculatePseudoHeaderChecksum(const PseudoICMPv6_Header &header); + + UInt_16 ComputeChecksumV6(UInt_16* buffer, Size length, const sockaddr_in6& dst); + + UInt_64 SendV6(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) override; + + UInt_64 SendV4(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) override; + + UInt_64 ReceiveV6(Str_8 &address, ICMP_Header &header, Serializer &data) const override; + + UInt_64 ReceiveV4(Str_8 &address, ICMP_Header &header, Serializer &data) const override; }; } \ No newline at end of file diff --git a/src/io/socket/BaseICMP.cpp b/src/io/socket/BaseICMP.cpp index 63ef63f..55273ca 100644 --- a/src/io/socket/BaseICMP.cpp +++ b/src/io/socket/BaseICMP.cpp @@ -45,14 +45,24 @@ namespace ehs return *this; } + void BaseICMP::Release() + { + } + UInt_64 BaseICMP::Send(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) { - return 0; + if (GetVersion() == IP::V6) + return SendV6(address, header, data, size); + + return SendV4(address, header, data, size); } UInt_64 BaseICMP::Receive(Str_8 &address, ICMP_Header &header, Serializer &data) { - return 0; + if (GetVersion() == IP::V6) + return ReceiveV6(address, header, data); + + return ReceiveV4(address, header, data); } void BaseICMP::SendEchoRequest(const Str_8 &address, ICMP_EchoRequest er, const Byte *data, UInt_64 size) @@ -112,4 +122,24 @@ namespace ehs return (UInt_16)~sum; } + + UInt_64 BaseICMP::SendV6(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) + { + return 0; + } + + UInt_64 BaseICMP::SendV4(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) + { + return 0; + } + + UInt_64 BaseICMP::ReceiveV6(Str_8 &address, ICMP_Header &header, Serializer &data) const + { + return 0; + } + + UInt_64 BaseICMP::ReceiveV4(Str_8 &address, ICMP_Header &header, Serializer &data) const + { + return 0; + } } diff --git a/src/io/socket/ICMP_LNX.cpp b/src/io/socket/ICMP_LNX.cpp index 1274b2f..c2cdf6f 100644 --- a/src/io/socket/ICMP_LNX.cpp +++ b/src/io/socket/ICMP_LNX.cpp @@ -79,20 +79,18 @@ namespace ehs return *this; } - UInt_64 ICMP::Send(const Str_8 &address, ICMP_Header header, const Byte *data, const UInt_64 size) + void ICMP::Release() { - if (GetVersion() == IP::V6) - return SendV6(address, header, data, size); + if (close(hdl) == -1) + { + EHS_LOG_INT(LogType::ERR, 0, "Failed to close socket."); - return SendV4(address, header, data, size); - } + return; + } - UInt_64 ICMP::Receive(Str_8 &address, ICMP_Header &header, Serializer &data) - { - if (GetVersion() == IP::V6) - return ReceiveV6(address, header, data); + hdl = EHS_INVALID_SOCKET; - return ReceiveV4(address, header, data); + EHS_LOG_SUCCESS(); } void ICMP::SetReceiveTimeout(const UInt_64 timeout) diff --git a/src/io/socket/ICMP_W32.cpp b/src/io/socket/ICMP_W32.cpp index ab5d16e..29b98ec 100644 --- a/src/io/socket/ICMP_W32.cpp +++ b/src/io/socket/ICMP_W32.cpp @@ -1,9 +1,5 @@ #include "ehs/io/socket/ICMP_W32.h" -#include -#include -#include - struct iphdr { u_char ip_hl:4, ip_v:4; @@ -19,6 +15,12 @@ struct iphdr namespace ehs { + ICMP::~ICMP() + { + if (close(hdl) == -1) + EHS_LOG_INT(LogType::ERR, 0, "Failed to close socket."); + } + ICMP::ICMP() : hdl(EHS_INVALID_SOCKET) { @@ -74,7 +76,173 @@ namespace ehs return *this; } - UInt_64 ICMP::Send(const Str_8 &address, ICMP_Header header, const Byte *data, const UInt_64 size) + void ICMP::Release() + { + if (close(hdl) == -1) + { + EHS_LOG_INT(LogType::ERR, 0, "Failed to close socket."); + + return; + } + + hdl = EHS_INVALID_SOCKET; + + EHS_LOG_SUCCESS(); + } + + void ICMP::SetReceiveTimeout(UInt_64 timeout) + { + timeval result = {}; + result.tv_sec = (long)timeout; + result.tv_usec = 0; + + if (setsockopt(hdl, SOL_SOCKET, SO_RCVTIMEO, (const char *)&result, sizeof(result)) < 0) + { + EHS_LOG_INT(LogType::WARN, 0, "Failed to set receive timeout with error #" + Str_8::FromNum(errno) + "."); + + return; + } + + EHS_LOG_SUCCESS(); + } + + bool ICMP::IsValid() const + { + return hdl != EHS_INVALID_SOCKET; + } + + bool ICMP::IsLinkLocal(const in6_addr &addr) + { + return addr.s6_addr[0] == 0xfe && (addr.s6_addr[1] & 0xc0) == 0x80; + } + + sockaddr_in6 ICMP::RetrieveSrcAddress() + { + ifaddrs *ifaddr; + sockaddr_in6 addr = {}; + + if (getifaddrs(&ifaddr) == -1) + { + EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve public address with error #" + Str_8::FromNum(errno) + "."); + + return addr; + } + + for (ifaddrs *ifa = ifaddr; ifa; ifa = ifa->ifa_next) + { + if (ifa->ifa_addr == nullptr || ifa->ifa_addr->sa_family != AF_INET6) + continue; + + addr = *(sockaddr_in6 *)ifa->ifa_addr; + if (!addr.sin6_addr.s6_addr32[0] || IsLinkLocal(addr.sin6_addr)) + continue; + + break; + } + + freeifaddrs(ifaddr); + + EHS_LOG_SUCCESS(); + + return addr; + } + + UInt_32 ICMP::CalculatePseudoHeaderChecksum(const PseudoICMPv6_Header &header) + { + UInt_32 checksum = 0; + + for (UInt_8 i = 0; i < 16; ++i) + checksum += header.src.sin6_addr.s6_addr[i]; + + for (UInt_8 i = 0; i < 16; ++i) + checksum += header.dst.sin6_addr.s6_addr[i]; + + checksum += 58; + + checksum += htons(header.length); + + checksum = (checksum >> 16) + (checksum & 0xFFFF); + checksum += (checksum >> 16); + + return checksum; + } + + UInt_16 ICMP::ComputeChecksumV6(UInt_16 *buffer, Size length, const sockaddr_in6 &dst) + { + UInt_32 checksum = 0; + + if (!src.sin6_addr.s6_addr32[0]) + { + src = RetrieveSrcAddress(); + if (!src.sin6_addr.s6_addr32[0]) + { + EHS_LOG_INT(LogType::ERR, 0, "Could not retrieve a suitable global address."); + return checksum; + } + } + + checksum += CalculatePseudoHeaderChecksum({src, dst, (UInt_32)length}); + + while (length > 1) + { + checksum += *buffer++; + length -= sizeof(UInt_16); + } + + if (length == 1) + checksum += *(UInt_8 *)buffer; + + // Carry over any overflow from the 16-bit result + checksum = (checksum >> 16) + (checksum & 0xFFFF); + checksum += (checksum >> 16); + + // Return the 16-bit complement + return ~checksum; + } + + UInt_64 ICMP::SendV6(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) + { + if (!IsValid()) + { + EHS_LOG_INT(LogType::WARN, 0, "Socket is not initialized."); + + return 0; + } + + header.checksum = 0; + + Serializer payload(Endianness::LE); + payload.Write(header); + payload.Resize(payload.Size() + size); + + Util::Copy(&payload[payload.GetOffset()], data, size); + + payload.SetOffset(payload.GetOffset() + size); + + sockaddr_in6 dst = {}; + dst.sin6_family = AF_INET6; + inet_pton(AF_INET6, address, &(dst.sin6_addr)); + + header.checksum = ComputeChecksumV6((UInt_16 *)&payload[0], payload.Size(), dst); + + payload.SetOffset(0); + payload.Write(header); + payload.SetOffset(payload.Size()); + + SInt_64 sent = sendto(hdl, (const char *)&payload[0], payload.Size(), 0, (sockaddr *)&dst, sizeof(sockaddr_in6)); + if (sent < 0) + { + EHS_LOG_INT(LogType::ERR, 0, "Failed to send packet with error #" + Str_8::FromNum(errno) + "."); + + return 0; + } + + EHS_LOG_SUCCESS(); + + return sent; + } + + UInt_64 ICMP::SendV4(const Str_8 &address, ICMP_Header header, const Byte *data, UInt_64 size) { if (!IsValid()) { @@ -116,7 +284,54 @@ namespace ehs return sent; } - UInt_64 ICMP::Receive(Str_8 &address, ICMP_Header header, Serializer &data) + UInt_64 ICMP::ReceiveV6(Str_8 &address, ICMP_Header &header, Serializer &data) const + { + if (!IsValid()) + { + EHS_LOG_INT(LogType::WARN, 0, "Socket is not initialized."); + + return 0; + } + + Serializer payload(Endianness::LE); + payload.Resize(1500); + + sockaddr_in6 remote = {}; + socklen_t from_len = sizeof(remote); + + SInt_64 recv = recvfrom(hdl, (char *)&payload[0], 1500, 0, (sockaddr *)&remote, &from_len); + if (recv < 0) + { + int code = errno; + if (code == EAGAIN) + EHS_LOG_SUCCESS(); + else + EHS_LOG_INT(LogType::ERR, 0, "Failed to receive packet with error #" + Str_8::FromNum(code) + "."); + + return 0; + } + + payload.Resize(recv); + + char tmpAddr[INET6_ADDRSTRLEN]; + + if (!inet_ntop(remote.sin6_family, &remote.sin6_addr, tmpAddr, INET6_ADDRSTRLEN)) + { + EHS_LOG_INT(LogType::ERR, 1, "Failed to convert IPv6 address with error #" + Str_8::FromNum(errno) + "."); + + return recv; + } + + address = tmpAddr; + header = payload.Read(); + data = Serializer(payload.GetEndianness(), &payload[payload.GetOffset()], payload.Size() - payload.GetOffset()); + + EHS_LOG_SUCCESS(); + + return recv; + } + + UInt_64 ICMP::ReceiveV4(Str_8 &address, ICMP_Header &header, Serializer &data) const { if (!IsValid()) { @@ -163,25 +378,4 @@ namespace ehs return recv; } - - void ICMP::SetReceiveTimeout(UInt_64 timeout) - { - timeval result = {}; - result.tv_sec = (long)timeout; - result.tv_usec = 0; - - if (setsockopt(hdl, SOL_SOCKET, SO_RCVTIMEO, (const char *)&result, sizeof(result)) < 0) - { - EHS_LOG_INT(LogType::WARN, 0, "Failed to set receive timeout with error #" + Str_8::FromNum(errno) + "."); - - return; - } - - EHS_LOG_SUCCESS(); - } - - bool ICMP::IsValid() const - { - return hdl != EHS_INVALID_SOCKET; - } }