Linux build fixes

LiberatorUSA · Oct 7, 2024 · 4f3e08e · 4f3e08e
1 parent be7e0b7
commit 4f3e08e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/platform/gucefCOMCORE/include/linux/gucefCOMCORE_CLinuxNetworkInterface.h b/platform/gucefCOMCORE/include/linux/gucefCOMCORE_CLinuxNetworkInterface.h
@@ -79,7 +79,7 @@ class CLinuxNetworkInterface : public CINetworkInterface
 
     virtual UInt32 GetNrOfIPAddresses( void ) const GUCEF_VIRTUAL_OVERRIDE;
 
-    virtual bool GetIPInfo( TIPInfoVector& ipInfo, bool includeUninitialized = false ) const GUCEF_VIRTUAL_OVERRIDE;
+    virtual bool GetIPInfo( TIPv4InfoVector& ipInfo, bool includeUninitialized = false ) const GUCEF_VIRTUAL_OVERRIDE;
 
     virtual bool IsDhcpUsedForIPv4( void ) const GUCEF_VIRTUAL_OVERRIDE;
 
@@ -130,14 +130,14 @@ class CLinuxNetworkInterface : public CINetworkInterface
     CIPv4Address m_secWins;
     CIPv4Address m_defGateway;
     CIPv4Address m_dhcpAddr;
-    CIPInfo m_curIpAddr;    // this is also in the ip address list but this is the address currently active.
+    CIPv4Info m_curIpAddr;  // this is also in the ip address list but this is the address currently active.
     UInt32 m_nicIndex;      // machine index of the adapter.
     UInt32 m_adapterType;	
     bool m_dhcpUsedforIpv4;
     bool m_dhcpUsedforIpv6;
     bool m_winsUsed;		
     THostAddressVector m_dnsAddresses;
-    CIPInfo::TIPv4InfoSet m_ipv4Addresses;
+    CIPv4Info::TIPv4InfoSet m_ipv4Addresses;
     TIPv4AddressVector m_gatewayList;
     time_t m_leaseObtained;
     time_t m_leaseExpires;

diff --git a/platform/gucefCOMCORE/src/linux/gucefCOMCORE_CLinuxNetworkInterface.cpp b/platform/gucefCOMCORE/src/linux/gucefCOMCORE_CLinuxNetworkInterface.cpp
@@ -351,7 +351,7 @@ class NetplanConfig
     CString interfaceName;
     CString setInterfaceName;
     CIPv4Address::TIPv4AddressSet ipv4DnsServers;
-    CIPInfo::TIPv4InfoSet ipv4Infos;
+    CIPv4Info::TIPv4InfoSet ipv4Infos;
 
     NetplanConfig( void )
         : usesDhcp4( false )
@@ -438,7 +438,7 @@ ParseNetplanFile( const CString& filePath                               ,
                             while ( v != addressesVars.end() )
                             {
                                 const CORE::CVariant& var = (*v);
-                                CIPInfo ipInfoForInterface;
+                                CIPv4Info ipInfoForInterface;
 
                                 if ( ipInfoForInterface.TrySetFromCIDRNotationString( var.AsString() ) )
                                 {
@@ -531,7 +531,7 @@ class NetworkManagerConfig
     CString interfaceName;
     CString setInterfaceName;
     CIPv4Address::TIPv4AddressSet ipv4DnsServers;
-    CIPInfo::TIPv4InfoSet ipv4Infos;
+    CIPv4Info::TIPv4InfoSet ipv4Infos;
 
     NetworkManagerConfig( void )
         : usesDhcp4( false )
@@ -1051,11 +1051,11 @@ CLinuxNetworkInterface::GetNrOfIPAddresses( void ) const
 /*-------------------------------------------------------------------------*/
 
 bool
-CLinuxNetworkInterface::GetIPInfo( TIPInfoVector& ipInfo, bool includeUninitialized ) const
+CLinuxNetworkInterface::GetIPInfo( TIPv4InfoVector& ipInfo, bool includeUninitialized ) const
 {GUCEF_TRACE;
 
 	MT::CObjectScopeLock lock( this );
-	CIPInfo::TIPv4InfoSet::const_iterator i = m_ipv4Addresses.begin();
+	CIPv4Info::TIPv4InfoSet::const_iterator i = m_ipv4Addresses.begin();
 	while ( i != m_ipv4Addresses.end() )
 	{
 		if ( includeUninitialized || 0 != (*i).ip.GetAddress() )