dcrubro/columnlynx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Test - fixed session ip locking

Browse Source
This commit is contained in:
DcruBro
2025-12-02 17:00:13 +01:00
parent 0ba78d72ed
commit 265954d700
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/columnlynx/common/net/session_registry.hpp
View File

@@ -116,29 +116,35 @@ namespace ColumnLynx::Net {
uint32_t getFirstAvailableIP(uint32_t baseIP, uint8_t mask) const { uint32_t getFirstAvailableIP(uint32_t baseIP, uint8_t mask) const {
std::shared_lock lock(mMutex); std::shared_lock lock(mMutex);
uint32_t hostSpace = (1u << (32 - mask)) - 2; // Usable hosts uint32_t hostCount = (1u << (32 - mask));
uint32_t firstHost = 2;
uint32_t lastHost = hostCount - 2;
// Skip 0 (network) and 1 (server reserved), start at 2 for (uint32_t offset = firstHost; offset <= lastHost; offset++) {
for (uint32_t offset = 2; offset <= hostSpace; offset++) {
uint32_t candidateIP = baseIP + offset; uint32_t candidateIP = baseIP + offset;
if (mSessionIPs.find(candidateIP) == mSessionIPs.end()) { if (mIPSessions.find(candidateIP) == mIPSessions.end()) {
return candidateIP; return candidateIP;
} }
} }
return 0; // No available IPs return 0;
} }
// Lock an IP as assigned to a specific session
void lockIP(uint64_t sessionID, uint32_t ip) { void lockIP(uint64_t sessionID, uint32_t ip) {
std::unique_lock lock(mMutex); std::unique_lock lock(mMutex);
mSessionIPs[sessionID] = ip; mSessionIPs[sessionID] = ip;
mIPSessions[ip] = mSessions.find(sessionID)->second;
} }
// Unlock the IP associated with a given session
void deallocIP(uint64_t sessionID) { void deallocIP(uint64_t sessionID) {
std::unique_lock lock(mMutex); std::unique_lock lock(mMutex);
mSessionIPs.erase(sessionID);
auto it = mSessionIPs.find(sessionID);
if (it != mSessionIPs.end()) {
uint32_t ip = it->second;
mIPSessions.erase(ip);
mSessionIPs.erase(it);
}
} }
private: private: