Skip to content

Commit 59bff06

Browse files
committed
Ipv4NetworkConfigurator: make generateUniqueHostAddress const
Add const qualifier to method and parameters to improve code safety and indicate that the method doesn't modify object state.
1 parent ff56ac4 commit 59bff06

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/inet/networklayer/configurator/ipv4/Ipv4NetworkConfigurator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ void Ipv4NetworkConfigurator::assignAddresses(Topology& topology)
505505
assignAddresses(topology.linkInfos);
506506
}
507507

508-
uint32_t Ipv4NetworkConfigurator::generateUniqueHostAddress(InterfaceInfo *compatibleInterface, uint32_t networkAddress, uint32_t networkNetmask, std::vector<uint32_t> &assignedInterfaceAddresses)
508+
uint32_t Ipv4NetworkConfigurator::generateUniqueHostAddress(const InterfaceInfo *compatibleInterface, uint32_t networkAddress, uint32_t networkNetmask, const std::vector<uint32_t> &assignedInterfaceAddresses) const
509509
{
510510
uint32_t interfaceAddress = compatibleInterface->address & ~networkNetmask;
511511
uint32_t interfaceAddressSpecifiedBits = compatibleInterface->addressSpecifiedBits;

src/inet/networklayer/configurator/ipv4/Ipv4NetworkConfigurator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class INET_API Ipv4NetworkConfigurator : public L3NetworkConfiguratorBase, publi
236236

237237
// helpers for address assignment
238238
static bool compareInterfaceInfos(InterfaceInfo *i, InterfaceInfo *j);
239-
uint32_t generateUniqueHostAddress(InterfaceInfo *compatibleInterface, uint32_t networkAddress, uint32_t networkNetmask, std::vector<uint32_t> &assignedInterfaceAddresses);
239+
uint32_t generateUniqueHostAddress(const InterfaceInfo *compatibleInterface, uint32_t networkAddress, uint32_t networkNetmask, const std::vector<uint32_t> &assignedInterfaceAddresses) const;
240240
void collectCompatibleInterfaces(const std::vector<InterfaceInfo *>& interfaces, /*in*/
241241
std::vector<InterfaceInfo *>& compatibleInterfaces, /*out, and the rest too*/
242242
uint32_t& mergedAddress, uint32_t& mergedAddressSpecifiedBits, uint32_t& mergedAddressIncompatibleBits,

0 commit comments

Comments
 (0)