PentHertz
/
CommonLibs
mirror of https://github.com/PentHertz/CommonLibs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow IP:PORT in address lists 

Signed-off-by: Michael Iedema <michael.iedema@rangenetworks.com>
This commit is contained in:
Shaddi Hasan 2014-03-03 11:53:51 -08:00 committed by Michael Iedema
parent 6494b28899
commit df638854db
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Configuration.cpp
View File

@ -522,15 +522,32 @@ bool ConfigurationTable::isValidValue(const std::string& name, const std::string
case ConfigurationKey::MIPADDRESS: { case ConfigurationKey::MIPADDRESS: {
int startPos = -1; int startPos = -1;
uint endPos = 0; uint endPos = 0;
uint delimiter;
std::string ip;
int port = -1;
do { do {
startPos++; startPos++;
endPos = val.find(' ', startPos); endPos = val.find(' ', startPos);
port = -1;
if (ConfigurationKey::isValidIP(val.substr(startPos, endPos-startPos))) { if (ConfigurationKey::isValidIP(val.substr(startPos, endPos-startPos))) {
ret = true; ret = true;
} else { } else {
ret = false; delimiter = val.find(':');
break; if (delimiter != std::string::npos) {
ip = val.substr(startPos, delimiter);
std::stringstream(val.substr(delimiter+1, endPos)) >> port;
if (ConfigurationKey::isValidIP(ip) && 1 <= port && port <= 65535) {
ret = true;
} else {
ret = false;
break;
}
} else {
ret = false;
break;
}
} }
} while ((startPos = endPos) != (int)std::string::npos); } while ((startPos = endPos) != (int)std::string::npos);