pegasus/src/Server/cimserver.cpp - diff

Return to cimserver.cpp CVS log

Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.68 and 1.69

version 1.68, 2002/08/27 19:58:56

version 1.69, 2002/08/29 00:27:52

Line 594

{

String configTimeout =

configManager->getCurrentValue("shutdownTimeout");

ArrayDestroyer<char> timeoutCString(configTimeout.allocateCString());

timeoutValue = strtol(configTimeout.getCString(), (char **)0, 10);

timeoutValue = strtol(timeoutCString.getPointer(), (char **)0, 10);

shutdownCIMOM(timeoutValue);

Line 642

Line 641

if (useSSL)

{

char* p = httpsPort.allocateCString();

char* end = 0;

Uint32 port = strtol(p, &end, 10);

CString portString = httpsPort.getCString();

Uint32 port = strtol(portString, &end, 10);

assert(end != 0 && *end == '\0');

delete [] p;

// Look up the WBEM-HTTPS port number

Line 656

Line 654

}

else

{

char* p = httpPort.allocateCString();

char* end = 0;

Uint32 port = strtol(p, &end, 10);

CString portString = httpPort.getCString();

Uint32 port = strtol(portString, &end, 10);

assert(end != 0 && *end == '\0');

delete [] p;

// Look up the WBEM-HTTP port number

Line 712

Line 709

serviceURL.append(host_name);

serviceURL.append(":");

serviceURL.append(address);

char *url = serviceURL.allocateCString();

// free(host_name);

#endif

Monitor monitor(true);

Line 775

Line 770

{

if( (time(NULL) - last ) > 60 )

{

if( discovery != NULL && url != NULL )

if( discovery != NULL && serviceURL.size() )

discovery->srv_reg_all(url,

discovery->srv_reg_all(serviceURL.getCString(),

"(namespace=root/cimv2)",

"service:cim.pegasus",

"DEFAULT",

Legend:

Removed from v.1.68
changed lines
	Added in v.1.69

No CVS admin address has been configured