Skip to content

Commit 887b568

Browse files
TomasTurinaTomasTurina
committed
fix: apply clang tidy to windowsHelper
1 parent 91be8f0 commit 887b568

23 files changed

+964
-834
lines changed

‎src/common/data_provider/CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,16 @@ target_link_libraries(sysinfo PUBLIC
149149
FileIO
150150
glob_helper
151151
json_helper
152+
network_helper
152153
sqlite_wrapper
153154
string_helper
154155
time_helper
155156
)
156157

157158
if(WIN32)
158159
target_link_libraries(sysinfo PUBLIC encoding_helper registry_helper windows_helper)
159-
elseif(APPLE)
160-
target_link_libraries(sysinfo PUBLIC network_helper)
161-
else()
162-
target_link_libraries(sysinfo PUBLIC linux_helper network_helper)
160+
elseif(NOT APPLE)
161+
target_link_libraries(sysinfo PUBLIC linux_helper)
163162
endif()
164163

165164
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

‎src/common/data_provider/src/network/networkInterfaceWindows.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111

1212
#include "networkInterfaceWindows.h"
13+
#include "networkWindowsHelper.hpp"
1314
#include "networkWindowsWrapper.h"
14-
#include "windowsHelper.h"
1515
#include <ws2tcpip.h>
1616

1717
std::shared_ptr<IOSNetwork>
@@ -23,17 +23,17 @@ FactoryWindowsNetwork::create(const std::shared_ptr<INetworkInterfaceWrapper>& i
2323
{
2424
const auto family {interfaceWrapper->family()};
2525

26-
if (Utils::NetworkWindowsHelper::IPV4 == family)
26+
if (Utils::IPV4 == family)
2727
{
28-
ret = std::make_shared<WindowsNetworkImpl<Utils::NetworkWindowsHelper::IPV4>>(interfaceWrapper);
28+
ret = std::make_shared<WindowsNetworkImpl<Utils::IPV4>>(interfaceWrapper);
2929
}
30-
else if (Utils::NetworkWindowsHelper::IPV6 == family)
30+
else if (Utils::IPV6 == family)
3131
{
32-
ret = std::make_shared<WindowsNetworkImpl<Utils::NetworkWindowsHelper::IPV6>>(interfaceWrapper);
32+
ret = std::make_shared<WindowsNetworkImpl<Utils::IPV6>>(interfaceWrapper);
3333
}
34-
else if (Utils::NetworkWindowsHelper::COMMON_DATA == family)
34+
else if (Utils::COMMON_DATA == family)
3535
{
36-
ret = std::make_shared<WindowsNetworkImpl<Utils::NetworkWindowsHelper::COMMON_DATA>>(interfaceWrapper);
36+
ret = std::make_shared<WindowsNetworkImpl<Utils::COMMON_DATA>>(interfaceWrapper);
3737
}
3838

3939
// else: The current interface family is not supported
@@ -47,13 +47,13 @@ FactoryWindowsNetwork::create(const std::shared_ptr<INetworkInterfaceWrapper>& i
4747
}
4848

4949
template<>
50-
void WindowsNetworkImpl<Utils::NetworkWindowsHelper::UNDEF>::buildNetworkData(nlohmann::json& /*network*/)
50+
void WindowsNetworkImpl<Utils::UNDEF>::buildNetworkData(nlohmann::json& /*network*/)
5151
{
5252
throw std::runtime_error {"Invalid network adapter family."};
5353
}
5454

5555
template<>
56-
void WindowsNetworkImpl<Utils::NetworkWindowsHelper::IPV4>::buildNetworkData(nlohmann::json& networkV4)
56+
void WindowsNetworkImpl<Utils::IPV4>::buildNetworkData(nlohmann::json& networkV4)
5757
{
5858
// Get IPv4 address
5959
const auto address {m_interfaceAddress->address()};
@@ -76,7 +76,7 @@ void WindowsNetworkImpl<Utils::NetworkWindowsHelper::IPV4>::buildNetworkData(nlo
7676
}
7777

7878
template<>
79-
void WindowsNetworkImpl<Utils::NetworkWindowsHelper::IPV6>::buildNetworkData(nlohmann::json& networkV6)
79+
void WindowsNetworkImpl<Utils::IPV6>::buildNetworkData(nlohmann::json& networkV6)
8080
{
8181
const auto address {m_interfaceAddress->addressV6()};
8282

@@ -98,7 +98,7 @@ void WindowsNetworkImpl<Utils::NetworkWindowsHelper::IPV6>::buildNetworkData(nlo
9898
}
9999

100100
template<>
101-
void WindowsNetworkImpl<Utils::NetworkWindowsHelper::COMMON_DATA>::buildNetworkData(nlohmann::json& networkCommon)
101+
void WindowsNetworkImpl<Utils::COMMON_DATA>::buildNetworkData(nlohmann::json& networkCommon)
102102
{
103103
// Extraction of common adapter data
104104
networkCommon["name"] = m_interfaceAddress->name();

‎src/common/data_provider/src/network/networkWindowsWrapper.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
#define _NETWORK_WINDOWS_WRAPPER_H
1414

1515
#include "inetworkWrapper.h"
16+
#include "networkWindowsHelper.hpp"
1617
#include "sharedDefs.h"
17-
#include "windowsHelper.h"
18+
#include "windowsHelper.hpp"
1819
#include <ifdef.h>
1920
#include <iomanip>
2021
#include <iptypes.h>
@@ -45,7 +46,7 @@ static const std::map<IF_OPER_STATUS, std::string> NETWORK_OPERATIONAL_STATUS =
4546
class NetworkWindowsInterface final : public INetworkInterfaceWrapper
4647
{
4748
public:
48-
explicit NetworkWindowsInterface(Utils::NetworkWindowsHelper::NetworkFamilyTypes family,
49+
explicit NetworkWindowsInterface(Utils::NetworkFamilyTypes family,
4950
const PIP_ADAPTER_ADDRESSES& addrs,
5051
const PIP_ADAPTER_UNICAST_ADDRESS& unicastAddress,
5152
const PIP_ADAPTER_INFO& adapterInfo)
@@ -59,7 +60,7 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
5960
throw std::runtime_error {"Nullptr instance of network interface"};
6061
}
6162

62-
if (Utils::NetworkWindowsHelper::NetworkFamilyTypes::UNDEF == family)
63+
if (Utils::NetworkFamilyTypes::UNDEF == family)
6364
{
6465
throw std::runtime_error {"Undefined network instance family value"};
6566
}
@@ -86,7 +87,7 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
8687

8788
if (m_currentUnicastAddress)
8889
{
89-
retVal = Utils::NetworkWindowsHelper::IAddressToString(
90+
retVal = Utils::IAddressToString(
9091
this->adapterFamily(),
9192
(reinterpret_cast<sockaddr_in*>(m_currentUnicastAddress->Address.lpSockaddr))->sin_addr);
9293
}
@@ -102,15 +103,15 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
102103
{
103104
if (Utils::isVistaOrLater())
104105
{
105-
retVal = Utils::NetworkWindowsHelper::IAddressToString(
106+
retVal = Utils::IAddressToString(
106107
this->adapterFamily(),
107108
(reinterpret_cast<sockaddr_in6*>(m_currentUnicastAddress->Address.lpSockaddr))->sin6_addr);
108109
}
109110
else
110111
{
111112
// Windows XP
112113
const auto ipv6Address {reinterpret_cast<sockaddr_in6*>(m_currentUnicastAddress->Address.lpSockaddr)};
113-
retVal = Utils::NetworkWindowsHelper::getIpV6Address(ipv6Address->sin6_addr.u.Byte);
114+
retVal = Utils::getIpV6Address(ipv6Address->sin6_addr.u.Byte);
114115
}
115116
}
116117

@@ -131,8 +132,7 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
131132
if (m_currentUnicastAddress &&
132133
!pfnGetConvertLengthToIpv4Mask(m_currentUnicastAddress->OnLinkPrefixLength, &mask))
133134
{
134-
retVal = Utils::NetworkWindowsHelper::IAddressToString(this->adapterFamily(),
135-
*(reinterpret_cast<in_addr*>(&mask)));
135+
retVal = Utils::IAddressToString(this->adapterFamily(), *(reinterpret_cast<in_addr*>(&mask)));
136136
}
137137
}
138138
}
@@ -158,7 +158,7 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
158158
if (m_currentUnicastAddress && Utils::isVistaOrLater())
159159
{
160160
// Get ipv6Netmask based on current OnLinkPrefixLength value
161-
retVal = Utils::NetworkWindowsHelper::ipv6Netmask(m_currentUnicastAddress->OnLinkPrefixLength);
161+
retVal = Utils::ipv6Netmask(m_currentUnicastAddress->OnLinkPrefixLength);
162162
}
163163

164164
// Windows XP netmask IPv6 is not supported
@@ -173,7 +173,7 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
173173

174174
if (address.size() && netmask.size())
175175
{
176-
const auto broadcast {Utils::NetworkWindowsHelper::broadcastAddress(address, netmask)};
176+
const auto broadcast {Utils::broadcastAddress(address, netmask)};
177177
if (!broadcast.empty())
178178
{
179179
network["broadcast"] = broadcast;
@@ -202,14 +202,14 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
202202

203203
if (AF_INET == gatewayFamily)
204204
{
205-
retVal += Utils::NetworkWindowsHelper::IAddressToString(
206-
gatewayFamily, (reinterpret_cast<sockaddr_in*>(sockAddress))->sin_addr);
205+
retVal +=
206+
Utils::IAddressToString(gatewayFamily, (reinterpret_cast<sockaddr_in*>(sockAddress))->sin_addr);
207207
retVal += GATEWAY_SEPARATOR;
208208
}
209209
else if (AF_INET6 == gatewayFamily)
210210
{
211-
retVal += Utils::NetworkWindowsHelper::IAddressToString(
212-
gatewayFamily, (reinterpret_cast<sockaddr_in6*>(sockAddress))->sin6_addr);
211+
retVal += Utils::IAddressToString(gatewayFamily,
212+
(reinterpret_cast<sockaddr_in6*>(sockAddress))->sin6_addr);
213213
retVal += GATEWAY_SEPARATOR;
214214
}
215215

@@ -357,7 +357,7 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
357357
private:
358358
std::string getAdapterEncodedUTF8(const std::wstring& name) const
359359
{
360-
return Utils::NetworkWindowsHelper::getAdapterNameStr(name);
360+
return Utils::getAdapterNameStr(name);
361361
}
362362

363363
int adapterFamily() const
@@ -476,7 +476,7 @@ class NetworkWindowsInterface final : public INetworkInterfaceWrapper
476476
return retVal;
477477
}
478478

479-
Utils::NetworkWindowsHelper::NetworkFamilyTypes m_interfaceFamily;
479+
Utils::NetworkFamilyTypes m_interfaceFamily;
480480
PIP_ADAPTER_ADDRESSES m_interfaceAddress;
481481
PIP_ADAPTER_UNICAST_ADDRESS m_currentUnicastAddress;
482482
PIP_ADAPTER_INFO m_adapterInfo; // XP needed structure

‎src/common/data_provider/src/packages/appxWindowsWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "registryHelper.hpp"
1616
#include "sharedDefs.h"
1717
#include "stringHelper.hpp"
18-
#include "windowsHelper.h"
18+
#include "windowsHelper.hpp"
1919
#include <algorithm>
2020
#include <ctime>
2121
#include <set>

‎src/common/data_provider/src/ports/portWindowsWrapper.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "iportWrapper.h"
1616
#include "sharedDefs.h"
1717
#include "stringHelper.hpp"
18-
#include "windowsHelper.h"
18+
#include "windowsHelper.hpp"
1919
#include <pal.h>
2020
#include <ws2ipdef.h>
2121

@@ -60,7 +60,7 @@ class WindowsPortWrapper final : public IPortWrapper
6060
{
6161
in_addr ipaddress;
6262
ipaddress.S_un.S_addr = addr;
63-
return Utils::NetworkWindowsHelper::IAddressToString(AF_INET, ipaddress);
63+
return Utils::IAddressToString(AF_INET, ipaddress);
6464
}
6565

6666
static std::string getProcessName(const std::map<pid_t, std::string> processDataList, const pid_t pid)
@@ -104,9 +104,9 @@ class WindowsPortWrapper final : public IPortWrapper
104104
WindowsPortWrapper(const _MIB_TCP6ROW_OWNER_PID& data, const std::map<pid_t, std::string>& processDataList)
105105
: m_protocol {"tcp6"}
106106
, m_localPort {static_cast<int32_t>(ntohs(static_cast<u_short>(data.dwLocalPort)))}
107-
, m_localIpAddress {Utils::NetworkWindowsHelper::getIpV6Address(data.ucLocalAddr)}
107+
, m_localIpAddress {Utils::getIpV6Address(data.ucLocalAddr)}
108108
, m_remotePort {static_cast<int32_t>(ntohs(static_cast<u_short>(data.dwRemotePort)))}
109-
, m_remoteIpAddress {Utils::NetworkWindowsHelper::getIpV6Address(data.ucRemoteAddr)}
109+
, m_remoteIpAddress {Utils::getIpV6Address(data.ucRemoteAddr)}
110110
, m_state {data.dwState}
111111
, m_pid {data.dwOwningPid}
112112
, m_processName {getProcessName(processDataList, data.dwOwningPid)}
@@ -127,7 +127,7 @@ class WindowsPortWrapper final : public IPortWrapper
127127
WindowsPortWrapper(const _MIB_UDP6ROW_OWNER_PID& data, const std::map<pid_t, std::string>& processDataList)
128128
: m_protocol("udp6")
129129
, m_localPort {static_cast<int32_t>(ntohs(static_cast<u_short>(data.dwLocalPort)))}
130-
, m_localIpAddress {Utils::NetworkWindowsHelper::getIpV6Address(data.ucLocalAddr)}
130+
, m_localIpAddress {Utils::getIpV6Address(data.ucLocalAddr)}
131131
, m_remotePort {0}
132132
, m_state {0}
133133
, m_pid {data.dwOwningPid}

‎src/common/data_provider/src/sysInfoWin.cpp

+9-12
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "encodingWindowsHelper.hpp"
1414
#include "network/networkFamilyDataAFactory.h"
1515
#include "network/networkWindowsWrapper.h"
16+
#include "networkWindowsHelper.hpp"
1617
#include "osinfo/sysOsInfoWin.h"
1718
#include "packages/appxWindowsWrapper.h"
1819
#include "packages/modernPackageDataRetriever.hpp"
@@ -27,7 +28,7 @@
2728
#include "sysInfo.hpp"
2829
#include "sysinfoapi.h"
2930
#include "timeHelper.hpp"
30-
#include "windowsHelper.h"
31+
#include "windowsHelper.hpp"
3132
#include <iphlpapi.h>
3233
#include <list>
3334
#include <memory>
@@ -615,12 +616,12 @@ nlohmann::json SysInfo::getNetworks() const
615616
nlohmann::json networks {};
616617
std::unique_ptr<IP_ADAPTER_INFO, Utils::IPAddressSmartDeleter> adapterInfo;
617618
std::unique_ptr<IP_ADAPTER_ADDRESSES, Utils::IPAddressSmartDeleter> adaptersAddresses;
618-
Utils::NetworkWindowsHelper::getAdapters(adaptersAddresses);
619+
Utils::getAdapters(adaptersAddresses);
619620

620621
if (!Utils::isVistaOrLater())
621622
{
622623
// Get additional IPv4 info - Windows XP only
623-
Utils::NetworkWindowsHelper::getAdapterInfo(adapterInfo);
624+
Utils::getAdapterInfo(adapterInfo);
624625
}
625626

626627
auto rawAdapterAddresses {adaptersAddresses.get()};
@@ -648,20 +649,16 @@ nlohmann::json SysInfo::getNetworks() const
648649
{
649650
// IPv4 data
650651
FactoryNetworkFamilyCreator<OSPlatformType::WINDOWS>::create(
651-
std::make_shared<NetworkWindowsInterface>(Utils::NetworkWindowsHelper::IPV4,
652-
rawAdapterAddresses,
653-
unicastAddress,
654-
adapterInfo.get()))
652+
std::make_shared<NetworkWindowsInterface>(
653+
Utils::IPV4, rawAdapterAddresses, unicastAddress, adapterInfo.get()))
655654
->buildNetworkData(netInterfaceInfo);
656655
}
657656
else if (AF_INET6 == unicastAddressFamily)
658657
{
659658
// IPv6 data
660659
FactoryNetworkFamilyCreator<OSPlatformType::WINDOWS>::create(
661-
std::make_shared<NetworkWindowsInterface>(Utils::NetworkWindowsHelper::IPV6,
662-
rawAdapterAddresses,
663-
unicastAddress,
664-
adapterInfo.get()))
660+
std::make_shared<NetworkWindowsInterface>(
661+
Utils::IPV6, rawAdapterAddresses, unicastAddress, adapterInfo.get()))
665662
->buildNetworkData(netInterfaceInfo);
666663
}
667664
}
@@ -672,7 +669,7 @@ nlohmann::json SysInfo::getNetworks() const
672669
// Common data
673670
FactoryNetworkFamilyCreator<OSPlatformType::WINDOWS>::create(
674671
std::make_shared<NetworkWindowsInterface>(
675-
Utils::NetworkWindowsHelper::COMMON_DATA, rawAdapterAddresses, unicastAddress, adapterInfo.get()))
672+
Utils::COMMON_DATA, rawAdapterAddresses, unicastAddress, adapterInfo.get()))
676673
->buildNetworkData(netInterfaceInfo);
677674

678675
networks["iface"].push_back(netInterfaceInfo);

‎src/common/data_provider/tests/sysInfoNetworkWindows/sysInfoNetworkWindows_test.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "sysInfoNetworkWindows_test.h"
1313
#include "network/networkFamilyDataAFactory.h"
1414
#include "network/networkInterfaceWindows.h"
15-
#include "windowsHelper.h"
15+
#include "networkWindowsHelper.hpp"
1616

1717
void SysInfoNetworkWindowsTest::SetUp() {};
1818

@@ -50,7 +50,7 @@ TEST_F(SysInfoNetworkWindowsTest, Test_IPV4_THROW)
5050
{
5151
auto mock {std::make_shared<SysInfoNetworkWindowsWrapperMock>()};
5252
nlohmann::json networkInfo {};
53-
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::NetworkWindowsHelper::IPV4));
53+
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::IPV4));
5454
EXPECT_CALL(*mock, address()).Times(1).WillOnce(Return(""));
5555
EXPECT_ANY_THROW(FactoryNetworkFamilyCreator<OSPlatformType::WINDOWS>::create(mock)->buildNetworkData(networkInfo));
5656
}
@@ -59,7 +59,7 @@ TEST_F(SysInfoNetworkWindowsTest, Test_IPV6_THROW)
5959
{
6060
auto mock {std::make_shared<SysInfoNetworkWindowsWrapperMock>()};
6161
nlohmann::json networkInfo {};
62-
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::NetworkWindowsHelper::IPV6));
62+
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::IPV6));
6363
EXPECT_CALL(*mock, addressV6()).Times(1).WillOnce(Return(""));
6464
EXPECT_ANY_THROW(FactoryNetworkFamilyCreator<OSPlatformType::WINDOWS>::create(mock)->buildNetworkData(networkInfo));
6565
}
@@ -80,7 +80,7 @@ TEST_F(SysInfoNetworkWindowsTest, Test_IPV4)
8080
const std::string broadcast {"192.168.0.255"};
8181
const std::string dhcp {"8.8.8.8"};
8282
const std::string metrics {"25"};
83-
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::NetworkWindowsHelper::IPV4));
83+
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::IPV4));
8484
EXPECT_CALL(*mock, address()).Times(1).WillOnce(Return(address));
8585
EXPECT_CALL(*mock, netmask()).Times(1).WillOnce(Return(netmask));
8686
EXPECT_CALL(*mock, broadcast(_))
@@ -113,7 +113,7 @@ TEST_F(SysInfoNetworkWindowsTest, Test_IPV6)
113113
const std::string broadcast {"2001:db8:85a3:8d3:1319:8a2e:370:0000"};
114114
const std::string dhcp {"8.8.8.8"};
115115
const std::string metrics {"25"};
116-
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::NetworkWindowsHelper::IPV6));
116+
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::IPV6));
117117
EXPECT_CALL(*mock, addressV6()).Times(1).WillOnce(Return(address));
118118
EXPECT_CALL(*mock, netmaskV6()).Times(1).WillOnce(Return(netmask));
119119
EXPECT_CALL(*mock, broadcastV6(_))
@@ -147,7 +147,7 @@ TEST_F(SysInfoNetworkWindowsTest, Test_COMMON_DATA)
147147
const std::string MAC {"00:A0:C9:14:C8:29"};
148148
const uint32_t mtu {1500};
149149
const std::string gateway {"10.2.2.50"};
150-
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::NetworkWindowsHelper::COMMON_DATA));
150+
EXPECT_CALL(*mock, family()).Times(1).WillOnce(Return(Utils::COMMON_DATA));
151151
EXPECT_CALL(*mock, name()).Times(1).WillOnce(Return(name));
152152
EXPECT_CALL(*mock, type(_))
153153
.Times(1)

0 commit comments

Comments
 (0)