R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve NetAdr2 regex

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-13 20:59:41 +02:00
parent 70503bd975
commit ffa6eb55e8
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
r5dev/tier1/NetAdr2.cpp
View File

@ -225,12 +225,18 @@ bool CNetAdr2::SetFromSockadr(sockaddr_storage* s)
//-----------------------------------------------------------------------------
string CNetAdr2::GetBase(void) const
{
string svIpAdr = m_svip;
static std::regex rx("\\].*");
svIpAdr.erase(0, 1);
svIpAdr = std::regex_replace(svIpAdr, rx, "");
static std::regex rx("[^\\[]*.(.*)(\\]).*");
std::smatch smRegexMatches;
std::regex_search(m_svip, smRegexMatches, rx);
return svIpAdr;
if (smRegexMatches.size() > 0)
{
return smRegexMatches[1].str();
}
else
{
return "127.0.0.1";
}
}
//-----------------------------------------------------------------------------
@ -239,11 +245,18 @@ string CNetAdr2::GetBase(void) const
//-----------------------------------------------------------------------------
string CNetAdr2::GetBase(string svInAdr) const
{
static std::regex rx("\\].*");
svInAdr.erase(0, 1);
svInAdr = std::regex_replace(svInAdr, rx, "");
static std::regex rx("[^\\[]*.(.*)(\\]).*");
std::smatch smRegexMatches;
std::regex_search(svInAdr, smRegexMatches, rx);
return svInAdr;
if (smRegexMatches.size() > 0)
{
return smRegexMatches[1].str();
}
else
{
return "127.0.0.1";
}
}
//-----------------------------------------------------------------------------