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.20 and 1.27

version 1.20, 2001/06/12 13:10:28

version 1.27, 2001/06/19 23:53:41

Line 1

//%/////////////////////////////////////////////////////////////////////////////

// Permission is hereby granted, free of charge, to any person obtaining a

// Permission is hereby granted, free of charge, to any person obtaining a copy

// copy of this software and associated documentation files (the "Software"),

// of this software and associated documentation files (the "Software"), to

// to deal in the Software without restriction, including without limitation

// deal in the Software without restriction, including without limitation the

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// and/or sell copies of the Software, and to permit persons to whom the

// sell copies of the Software, and to permit persons to whom the Software is

// Software is furnished to do so, subject to the following conditions:

// furnished to do so, subject to the following conditions:

// The above copyright notice and this permission notice shall be included in

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// all copies or substantial portions of the Software.

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

// DEALINGS IN THE SOFTWARE.

//==============================================================================

Line 80

Line 77

#include <Pegasus/Common/System.h>

#if defined(PEGASUS_OS_TYPE_WINDOWS)

# include "cimserver_windows.cpp"

#elif defined(PEGASUS_OS_TYPE_UNIX)

Line 120

Line 118

{

static struct OptionRow optionsTable[] =

{

{"port", "8888", false, Option::WHOLE_NUMBER, 0, 0, "port",

{"port", "5988", false, Option::WHOLE_NUMBER, 0, 0, "port",

"specifies port number to listen on" },

{"trace", "false", false, Option::BOOLEAN, 0, 0, "t",

"turns on trace of Client IO to console "},

Line 148

Line 146

{"remove", "false", false, Option::BOOLEAN, 0, 0, "remove",

"Removes Pegasus as a Windows NT Service "},

{"debug", "false", false, Option::BOOLEAN, 0, 0, "d",

"Not Used "}

"Not Used "},

{"slp", "false", false, Option::BOOLEAN, 0, 0, "slp",

"Register Pegasus as a Service with SLP"}

};

const Uint32 NUM_OPTIONS = sizeof(optionsTable) / sizeof(optionsTable[0]);

Line 184

//////////////////////////////////////////////////////////////////////////

int main(int argc, char** argv)

{

// on Windows NT if there are no command-line options, run as a service

if (argc == 1 )

cim_server_service(argc, argv) ;

Line 303

Logger::clean(logsDirectory);;

}

// Option to Display the options table. Primarily

// a diagnostic tool.

if (om.valueEquals("options", "true"))

om.print();

// Leave this in until people get familiar with the logs.

cout << "Logs Directory = " << logsDirectory << endl;

Boolean useSLP = (om.valueEquals("slp", "true")) ? true: false;

char* address = portOption.allocateCString();

Line 316

Line 322

cout <<"Started..."

<< (pegasusIOTrace ? " Tracing to Display ": " ")

<< (pegasusIOLog ? " Tracing to Log ": " ")

<< (useSLP ? " SLP reg. " : " No SLP ")

<< endl;

// Option to Display the options table. Primarily

// a diagnostic tool.

if (om.valueEquals("options", "true"))

om.print();

// Put server start message to the logger

Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,

"Start $0 $1 port $2 $3 ",

"Start $0 $1 port $2 $3 $4",

PEGASUS_NAME,

PEGASUS_VERSION,

address,

(pegasusIOTrace ? " Tracing": " "));

(pegasusIOTrace ? " Tracing": " "),

(useSLP ? " SLP on " : " SLP off "));

// do we need to run as a daemon ?

String daemonOption;

Line 345

Line 348

{

Selector selector;

CIMServer server(&selector, pegasusHome);

server.setSLP(useSLP);

// bind throws an exception of the bind fails

server.bind(address);

Line 365

Line 369

return 0;

}

Legend:

Removed from v.1.20
changed lines
	Added in v.1.27

No CVS admin address has been configured