version 1.240, 2011/12/21 12:32:07
|
version 1.241, 2012/07/03 11:53:26
|
|
|
n); | n); |
ConfigManager::getInstance()->initCurrentValue(propName, String(startP, n)); | ConfigManager::getInstance()->initCurrentValue(propName, String(startP, n)); |
} | } |
|
static void _restrictListening( |
|
ConfigManager* configManager, |
|
const String &listenOn, |
|
const Uint32 &portNumberHttp, |
|
const Boolean useSSL) |
|
{ |
|
static Array<HostAddress> laddr = configManager ->getListenAddress( |
|
listenOn); |
|
for(Uint32 i = 0, n = laddr.size(); i < n; ++i) |
|
{ |
|
if(laddr[i].getAddressType() == HostAddress::AT_IPV6) |
|
{ |
|
#ifdef PEGASUS_ENABLE_IPV6 |
|
_cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION, |
|
portNumberHttp, useSSL, |
|
&laddr[i]); |
|
#endif |
|
} |
|
else if(laddr[i].getAddressType() == HostAddress::AT_IPV4) |
|
{ |
|
_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION, |
|
portNumberHttp, useSSL, |
|
&laddr[i]); |
|
} |
|
} |
|
} |
| |
///////////////////////////////////////////////////////////////////////// | ///////////////////////////////////////////////////////////////////////// |
// MAIN | // MAIN |
|
|
} | } |
} | } |
| |
|
String listenOn = configManager->getCurrentValue("listenAddress"); |
|
if(String::equalNoCase(listenOn, "All")) |
|
{ |
if (addIP6Acceptor) | if (addIP6Acceptor) |
{ | { |
_cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION, | _cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION, |
|
|
_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION, | _cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION, |
portNumberHttp, false); | portNumberHttp, false); |
} | } |
|
} |
|
else // Restricted listening |
|
{ |
|
_restrictListening( |
|
configManager, listenOn, portNumberHttp, false); |
|
} |
|
|
// The port number is converted to a string to avoid the | // The port number is converted to a string to avoid the |
// addition of localized characters (e.g., "5,988"). | // addition of localized characters (e.g., "5,988"). |
char scratchBuffer[22]; | char scratchBuffer[22]; |
|
|
throw InvalidPropertyValue("httpsPort", httpsPort); | throw InvalidPropertyValue("httpsPort", httpsPort); |
} | } |
} | } |
|
String listenOn = configManager->getCurrentValue("listenAddress"); |
|
if(String::equalNoCase(listenOn, "All")) |
|
{ |
if (addIP6Acceptor) | if (addIP6Acceptor) |
{ | { |
_cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION, | _cimServer->addAcceptor(HTTPAcceptor::IPV6_CONNECTION, |
|
|
_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION, | _cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION, |
portNumberHttps, true); | portNumberHttps, true); |
} | } |
|
} |
|
else //Restricted |
|
{ |
|
_restrictListening( |
|
configManager, listenOn, portNumberHttps, true); |
|
} |
|
|
// The port number is converted to a string to avoid the | // The port number is converted to a string to avoid the |
// addition of localized characters (e.g., "5,989"). | // addition of localized characters (e.g., "5,989"). |
char scratchBuffer[22]; | char scratchBuffer[22]; |