pegasus/src/Pegasus/Common/HTTPAcceptor.cpp - diff

Return to HTTPAcceptor.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/HTTPAcceptor.cpp between version 1.31 and 1.88.6.1

version 1.31, 2003/08/06 13:49:25

version 1.88.6.1, 2006/11/03 05:04:20

Line 1

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

//%2006////////////////////////////////////////////////////////////////////////

// The Open Group, Tivoli Systems

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// IBM Corp.; EMC Corporation, The Open Group.

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; Symantec Corporation; The Open Group.

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

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

Line 21

Line 29

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

// Author: Mike Brasher (mbrasher@bmc.com)

// Modified By:

// Jenny Yu, Hewlett-Packard Company (jenny_yu@hp.com)

// Nag Boranna, Hewlett-Packard Company (nagaraja_boranna@hp.com)

// Dave Rosckes (rosckes@us.ibm.com)

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

#include "Config.h"

#include "Constants.h"

#include <iostream>

#include "Socket.h"

#ifdef PEGASUS_PLATFORM_WIN32_IX86_MSVC

#include <windows.h>

#else

# include <cctype>

# include <cstdlib>

# include <errno.h>

# include <fcntl.h>

# include <netdb.h>

# include <netinet/in.h>

# include <arpa/inet.h>

# include <sys/socket.h>

# ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

# include <unistd.h>

# include <sys/un.h>

# endif

#endif

#include "Network.h"

#include "Socket.h"

#include "TLS.h"

#include "HTTPAcceptor.h"

Line 59

Line 43

#include "Tracer.h"

#include <Pegasus/Common/MessageLoader.h> //l10n

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#include "EBCDIC_OS400.h"

#endif

PEGASUS_USING_STD;

PEGASUS_NAMESPACE_BEGIN

static int MAX_CONNECTION_QUEUE_LENGTH = -1;

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

// HTTPAcceptorRep

Line 76

Line 68

{

if (local)

{

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifndef PEGASUS_OS_TYPE_WINDOWS

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

address = reinterpret_cast<struct sockaddr*>(new struct sockaddr_un);

address_size = sizeof(struct sockaddr_un);

#else

PEGASUS_ASSERT(false);

#endif

}

else

{

Line 89

Line 84

address_size = sizeof(struct sockaddr_in);

}

~HTTPAcceptorRep()

{

delete address;

}

struct sockaddr* address;

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

SocketLength address_size;

size_t address_size;

#elif defined(PEGASUS_PLATFORM_AIX_RS_IBMCXX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || (defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) && !defined(SUNOS_5_6))

socklen_t address_size;

#else

int address_size;

#endif

Mutex _connection_mut;

Sint32 socket;

SocketHandle socket;

// Added for NamedPipe implementation for windows

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

NamedPipeServer* namedPipeServer;

#endif

Array<HTTPConnection*> connections;

};

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

// HTTPAcceptor

Line 115

Line 113

MessageQueue* outputMessageQueue,

Boolean localConnection,

Uint32 portNumber,

SSLContext * sslcontext)

SSLContext * sslcontext,

ReadWriteSem* sslContextObjectLock)

: Base(PEGASUS_QUEUENAME_HTTPACCEPTOR), // ATTN: Need unique names?

_monitor(monitor),

_outputMessageQueue(outputMessageQueue),

Line 123

Line 122

_entry_index(-1),

_localConnection(localConnection),

_portNumber(portNumber),

_sslcontext(sslcontext)

_sslcontext(sslcontext),

_sslContextObjectLock(sslContextObjectLock)

{

Socket::initializeInterface();

Platforms interpret the value of MAX_CONNECTION_QUEUE_LENGTH differently. Some platforms interpret

the value literally, while others multiply a fudge factor. When the server is under

stress from multiple clients with multiple requests, toggling this number may prevent clients from

being dropped. Instead of hard coding the value, we allow an environment variable to be set which

specifies a number greater than the maximum concurrent client connections possible. If this environment

var is not specified, then MAX_CONNECTION_QUEUE_LENGTH = 15.

//To engage runtime backlog queue length: uncomment the following block AND comment out the line MAX_CONNECTION_QUEUE_LENGTH = 15

if(MAX_CONNECTION_QUEUE_LENGTH == -1){

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

#pragma convert(37)

const char* env = getenv("PEGASUS_MAX_BACKLOG_CONNECTION_QUEUE");

EtoA(env);

#pragma convert(0)

#else

const char* env = getenv("PEGASUS_MAX_BACKLOG_CONNECTION_QUEUE");

#endif

if(!env){

MAX_CONNECTION_QUEUE_LENGTH = 15;

}else{

char *end = NULL;

MAX_CONNECTION_QUEUE_LENGTH = strtol(env, &end, 10);

if(*end)

MAX_CONNECTION_QUEUE_LENGTH = 15;

cout << " MAX_CONNECTION_QUEUE_LENGTH = " << MAX_CONNECTION_QUEUE_LENGTH << endl;

}

MAX_CONNECTION_QUEUE_LENGTH = 15;

}

HTTPAcceptor::~HTTPAcceptor()

{

destroyConnections();

unbind();

// ATTN: Is this correct in a multi-HTTPAcceptor server?

Socket::uninitializeInterface();

Line 140

Line 176

if (! message)

return;

PEGASUS_ASSERT(_rep != 0);

switch (message->getType())

{

case SOCKET_MESSAGE:

Line 149

Line 186

// If this is a connection request:

if (socketMessage->socket == _rep->socket &&

socketMessage->events | SocketMessage::READ)

socketMessage->events & SocketMessage::READ)

{

_acceptConnection();

}

else

{

// ATTN! this can't happen!

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::handleEnqueue: Invalid SOCKET_MESSAGE received.");

}

break;

}

// Added for NamedPipe implementation for windows

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

case NAMEDPIPE_MESSAGE:

{

NamedPipeMessage* namedPipeMessage = (NamedPipeMessage*)message;

if (((namedPipeMessage->namedPipe.getPipe()) == ( _rep->namedPipeServer->getPipe())) &&

(namedPipeMessage->events & NamedPipeMessage::READ))

{

_acceptNamedPipeConnection();

}

else

{

// ATTN! this can't happen!

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::handleEnqueue: Invalid NAMEDPIPE_MESSAGE received.");

}

break;

}

#endif

case CLOSE_CONNECTION_MESSAGE:

{

CloseConnectionMessage* closeConnectionMessage

= (CloseConnectionMessage*)message;

_rep->_connection_mut.lock(pegasus_thread_self());

AutoMutex autoMut(_rep->_connection_mut);

for (Uint32 i = 0, n = _rep->connections.size(); i < n; i++)

{

HTTPConnection* connection = _rep->connections[i];

Sint32 socket = connection->getSocket();

// Added for NamedPipe implementation for windows

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

if(!connection->isNamedPipeConnection())

{

#endif

SocketHandle socket = connection->getSocket();

if (socket == closeConnectionMessage->socket)

{

Line 180

Line 246

delete connection;

break;

}

// Added for NamedPipe implementation for windows

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

}

else

{

NamedPipe namedPipe = connection->getNamedPipe();

//NamedPipeMessage* namedPipeMessage = (NamedPipeMessage*)message;

if (namedPipe.getPipe() == closeConnectionMessage->namedPipe.getPipe())

{

_monitor->unsolicitPipeMessages(namedPipe);

_rep->connections.remove(i);

delete connection;

break;

}

_rep->_connection_mut.unlock();

}

#endif

}

break;

}

default:

// ATTN: need unexpected message error!

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::handleEnqueue: Invalid MESSAGE received.");

break;

};

Line 198

Line 285

Message* message = dequeue();

if (!message)

{

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::handleEnqueue(): No message on queue.");

return;

}

handleEnqueue(message);

Line 209

Line 300

if (_rep){

//l10n

//throw BindFailedException("HTTPAcceptor already bound");

String s0 = "HTTPAcceptor";

MessageLoaderParms parms("Common.HTTPAcceptor.ALREADY_BOUND",

"$0 already bound",

"HTTPAcceptor already bound");

s0);

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::bind: HTTPAcceptor already bound.");

throw BindFailedException(parms);

}

Line 226

Line 319

/**

_bind - creates a new server socket and bind socket to the port address.

If PEGASUS_LOCAL_DOMAIN_SOCKET is defined, the port number is ignored and

If PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET is not defined, the port number is ignored and

a domain socket is bound.

void HTTPAcceptor::_bind()

{

PEGASUS_ASSERT(_rep != 0);

// Create address:

memset(_rep->address, 0, sizeof(*_rep->address));

#if defined PEGASUS_OS_TYPE_WINDOWS

if (!_localConnection)

{

#endif

memset(_rep->address, 0, sizeof(*_rep->address));

#if defined PEGASUS_OS_TYPE_WINDOWS

}

#endif

if (_localConnection)

{

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

// Added for NamedPipe implementation for windows

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

# ifdef PEGASUS_OS_TYPE_WINDOWS

# ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "in HTTPAcceptor::_bind before calling _createNamedPipe() "

<< PEGASUS_STD(endl);

}

# endif

_createNamedPipe();

# ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "in HTTPAcceptor::_bind after calling _createNamedPipe() " << PEGASUS_STD(endl);

}

# endif

return;

# else // Other than Windows platform

reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_family =

AF_UNIX;

strcpy(reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path,

PEGASUS_LOCAL_DOMAIN_SOCKET_PATH);

#ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM

AtoE(reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);

#endif

::unlink(reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);

# endif

#else

PEGASUS_ASSERT(false);

#endif

Line 262

Line 386

if (_localConnection)

{

_rep->socket = socket(AF_UNIX, SOCK_STREAM, 0);

_rep->socket = Socket::createSocket(AF_UNIX, SOCK_STREAM, 0);

}

else

{

_rep->socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);

_rep->socket = Socket::createSocket(PF_INET, SOCK_STREAM, IPPROTO_TCP);

}

if (_rep->socket < 0)

Line 277

Line 402

//throw BindFailedException("Failed to create socket");

MessageLoaderParms parms("Common.HTTPAcceptor.FAILED_CREATE_SOCKET",

"Failed to create socket");

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_bind _rep->socket < 0");

throw BindFailedException(parms);

}

// set the close-on-exec bit for this file handle.

// any unix that forks needs this bit set.

#ifndef PEGASUS_PLATFORM_WIN32_IX86_MSVC

#if !defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_OS_VMS)

int sock_flags;

if( (sock_flags = fcntl(_rep->socket, F_GETFD, 0)) < 0)

{

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor: fcntl(F_GETFD) failed");

"HTTPAcceptor::_bind: fcntl(F_GETFD) failed");

}

else

{

sock_flags |= FD_CLOEXEC;

if (fcntl(_rep->socket, F_SETFD, sock_flags) < 0)

{

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor: fcntl(F_SETFD) failed");

"HTTPAcceptor::_bind: fcntl(F_SETFD) failed");

}

#endif

Line 319

Line 446

//throw BindFailedException("Failed to set socket option");

MessageLoaderParms parms("Common.HTTPAcceptor.FAILED_SET_SOCKET_OPTION",

"Failed to set socket option");

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_bind: Failed to set socket option.");

throw BindFailedException(parms);

}

// Bind socket to port:

if (::bind(_rep->socket, _rep->address, _rep->address_size) < 0)

{

Socket::close(_rep->socket);

Line 333

Line 464

//throw BindFailedException("Failed to bind socket");

MessageLoaderParms parms("Common.HTTPAcceptor.FAILED_BIND_SOCKET",

"Failed to bind socket");

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_bind: Failed to bind socket.");

throw BindFailedException(parms);

}

// Get the actual port value used if the caller specified a port value of 0.

if ( _portNumber == 0 )

{

sockaddr_in buf;

SocketLength bufSize = sizeof(buf);

if ( getsockname(_rep->socket, reinterpret_cast<sockaddr *>(&buf), &bufSize) == 0 )

{

_portNumber = ntohs(buf.sin_port);

}

// Change permissions on Linux local domain socket to allow writes by others.

#if !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET) && defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU)

if (_localConnection)

{

if (::chmod( PEGASUS_LOCAL_DOMAIN_SOCKET_PATH,

S_IRUSR | S_IWUSR | S_IXUSR |

S_IRGRP | S_IWGRP | S_IXGRP |

S_IROTH | S_IWOTH | S_IXOTH ) < 0 )

{

Socket::close(_rep->socket);

delete _rep;

_rep = 0;

//l10n

//throw BindFailedException("Failed to bind socket");

MessageLoaderParms parms("Common.HTTPAcceptor.FAILED_BIND_SOCKET",

"Failed to bind socket");

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_bind: Failed to set domain socket permissions.");

throw BindFailedException(parms);

}

#endif

// Set up listening on the given socket:

int const MAX_CONNECTION_QUEUE_LENGTH = 5;

//int const MAX_CONNECTION_QUEUE_LENGTH = 15;

if (listen(_rep->socket, MAX_CONNECTION_QUEUE_LENGTH) < 0)

{

Line 349

Line 522

//throw BindFailedException("Failed to bind socket");

MessageLoaderParms parms("Common.HTTPAcceptor.FAILED_BIND_SOCKET",

"Failed to bind socket");

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_bind: Failed to bind socket(1).");

throw BindFailedException(parms);

}

Line 367

Line 542

//throw BindFailedException("Failed to solicit socket messaeges");

MessageLoaderParms parms("Common.HTTPAcceptor.FAILED_SOLICIT_SOCKET_MESSAGES",

"Failed to solicit socket messaeges");

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_bind: Failed to solicit socket messages(2).");

throw BindFailedException(parms);

}

Line 380

Line 557

if (_rep)

{

// unregister the socket

_monitor->unsolicitSocketMessages(_rep->socket);

// ATTN - comment out - see CIMServer::stopClientConnection()

//_monitor->unsolicitSocketMessages(_rep->socket);

// close the socket

Socket::close(_rep->socket);

// Unlink Local Domain Socket Bug# 3312

if (_localConnection)

{

#ifndef PEGASUS_OS_TYPE_WINDOWS

# ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

"HTTPAcceptor::closeConnectionSocket Unlinking local connection." );

::unlink(

reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);

# else

PEGASUS_ASSERT(false);

# endif

#endif

}

else

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::closeConnectionSocket failure _rep is null." );

}

Line 396

Line 595

{

_bind();

}

else

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::reopenConnectionSocket failure _rep is null." );

}

/**

reconnectConnectionSocket - creates a new server socket.

void HTTPAcceptor::reconnectConnectionSocket()

{

if (_rep)

{

// unregister the socket

_monitor->unsolicitSocketMessages(_rep->socket);

// close the socket

Socket::close(_rep->socket);

// Unlink Local Domain Socket Bug# 3312

if (_localConnection)

{

#ifndef PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

"HTTPAcceptor::reconnectConnectionSocket Unlinking local connection." );

::unlink(

reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);

#else

PEGASUS_ASSERT(false);

#endif

}

// open the socket

_bind();

}

else

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::reconnectConnectionSocket failure _rep is null." );

}

/**

getOutstandingRequestCount - returns the number of outstanding requests.

Uint32 HTTPAcceptor::getOutstandingRequestCount()

Uint32 HTTPAcceptor::getOutstandingRequestCount() const

{

Uint32 count = 0;

if (_rep)

_rep->_connection_mut.lock(pegasus_thread_self());

{

AutoMutex autoMut(_rep->_connection_mut);

if (_rep->connections.size() > 0)

{

HTTPConnection* connection = _rep->connections[0];

count = connection->getRequestCount();

}

_rep->_connection_mut.unlock();

}

return count;

}

/**

getPortNumber - returns the port number used for the connection

Uint32 HTTPAcceptor::getPortNumber() const

{

return _portNumber;

}

void HTTPAcceptor::setSocketWriteTimeout(Uint32 socketWriteTimeout)

{

_socketWriteTimeout = socketWriteTimeout;

}

void HTTPAcceptor::unbind()

{

if (_rep)

{

_portNumber = 0;

Socket::close(_rep->socket);

if (_localConnection)

{

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

# ifndef PEGASUS_OS_TYPE_WINDOWS

::unlink(

reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);

# endif

#else

PEGASUS_ASSERT(false);

#endif

}

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

if (!_localConnection)

{

#endif

delete _rep;

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

}

#endif

_rep = 0;

}

else

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::unbind failure _rep is null." );

}

void HTTPAcceptor::destroyConnections()

{

if (_rep)

{

// For each connection created by this object:

_rep->_connection_mut.lock(pegasus_thread_self());

AutoMutex autoMut(_rep->_connection_mut);

for (Uint32 i = 0, n = _rep->connections.size(); i < n; i++)

{

HTTPConnection* connection = _rep->connections[i];

Sint32 socket = connection->getSocket();

// Added for NamedPipe implementation for windows

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

if(!connection->isNamedPipeConnection())

{

#endif

SocketHandle socket = connection->getSocket();

// Unsolicit SocketMessages:

_monitor->unsolicitSocketMessages(socket);

// Added for NamedPipe implementation for windows

// Destroy the connection (causing it to close):

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

while (connection->refcount.value()) { }

}

else

{

NamedPipe namedPipe = connection->getNamedPipe();

_monitor->unsolicitPipeMessages(namedPipe);

}

#endif

while (connection->refcount.get()) { }

delete connection;

}

_rep->connections.clear();

_rep->_connection_mut.unlock();

}

void HTTPAcceptor::_acceptConnection()

Line 468

Line 750

PEGASUS_ASSERT(_rep != 0);

if (!_rep)

return;

// Accept the connection (populate the address):

struct sockaddr* accept_address;

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

SocketLength address_size;

size_t address_size;

#elif defined(PEGASUS_PLATFORM_AIX_RS_IBMCXX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || (defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) && !defined(SUNOS_5_6))

socklen_t address_size;

#else

int address_size;

#endif

if (_localConnection)

{

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifndef PEGASUS_OS_TYPE_WINDOWS

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

accept_address = reinterpret_cast<struct sockaddr*>(new struct sockaddr_un);

address_size = sizeof(struct sockaddr_un);

#else

PEGASUS_ASSERT(false);

#endif

}

else

{

Line 497

Line 772

address_size = sizeof(struct sockaddr_in);

}

Sint32 socket = accept(_rep->socket, accept_address, &address_size);

SocketHandle socket = accept(_rep->socket, accept_address, &address_size);

if (socket == PEGASUS_SOCKET_ERROR)

{

// the remote connection is invalid, destroy client address.

delete accept_address;

if (socket < 0)

// TCPIP is down reconnect this acceptor

if(getSocketError() == PEGASUS_NETWORK_TCPIP_STOPPED)

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"Socket has an IO error. TCP/IP down. Try to reconnect." );

reconnectConnectionSocket();

return;

}

Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE,

"HTTPAcceptor - accept() failure. errno: $0"

,errno);

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor: accept() failed");

return;

}

String ipAddress;

if (_localConnection)

{

ipAddress = "localhost";

}

else

{

unsigned char* sa = reinterpret_cast<unsigned char*>(

&reinterpret_cast<struct sockaddr_in*>(

accept_address)->sin_addr.s_addr);

char ipBuffer[32];

sprintf(ipBuffer, "%u.%u.%u.%u", sa[0], sa[1], sa[2], sa[3]);

ipAddress = ipBuffer;

}

delete accept_address;

// set the close on exec flag

#ifndef PEGASUS_PLATFORM_WIN32_IX86_MSVC

#if !defined(PEGASUS_OS_TYPE_WINDOWS) && !defined(PEGASUS_OS_VMS)

int sock_flags;

if( (sock_flags = fcntl(socket, F_GETFD, 0)) < 0)

{

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor: fcntl(F_GETFD) failed");

}

else

Line 525

Line 830

sock_flags |= FD_CLOEXEC;

if (fcntl(socket, F_SETFD, sock_flags) < 0)

{

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor: fcntl(F_SETFD) failed");

}

#endif

Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE,

PEG_LOGGER_TRACE((Logger::STANDARD_LOG, System::CIMSERVER, 0,

"HTTPAcceptor - accept() success. Socket: $1"

"HTTPAcceptor - accept() success. Socket: $1" ,socket));

,socket);

AutoPtr<MP_Socket> mp_socket(new MP_Socket(

socket, _sslcontext, _sslContextObjectLock));

mp_socket->setSocketWriteTimeout(_socketWriteTimeout);

// Create a new conection and add it to the connection list:

// Perform the SSL handshake, if applicable. Make the socket non-blocking

// for this operation so we can send it back to the Monitor's select() loop

// if it takes a while.

MP_Socket * mp_socket = new MP_Socket(socket, _sslcontext);

mp_socket->disableBlocking();

if (mp_socket->accept() < 0)

Sint32 socketAcceptStatus = mp_socket->accept();

mp_socket->enableBlocking();

if (socketAcceptStatus < 0)

{

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor: SSL_accept() failed");

mp_socket->close();

return;

}

HTTPConnection* connection = new HTTPConnection(

// Create a new connection and add it to the connection list:

_monitor, mp_socket, this, static_cast<MessageQueue *>(_outputMessageQueue));

HTTPConnection* connection = new HTTPConnection(_monitor, mp_socket,

ipAddress, this, static_cast<MessageQueue *>(_outputMessageQueue));

if (socketAcceptStatus == 0)

{

PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,

"HTTPAcceptor: SSL_accept() pending");

connection->_acceptPending = true;

}

// Solicit events on this new connection's socket:

int index;

if (-1 == (index = _monitor->solicitSocketMessages(

socket,

connection->getSocket(),

SocketMessage::READ | SocketMessage::EXCEPTION,

connection->getQueueId(), Monitor::CONNECTION)) )

{

// ATTN-DE-P2-2003100503::TODO::Need to enhance code to return

// an error message to Client application.

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_acceptConnection: Attempt to allocate entry in _entries table failed.");

delete connection;

Socket::close(socket);

return;

}

// Save the socket for cleanup later:

connection->_entry_index = index;

AutoMutex autoMut(_rep->_connection_mut);

_rep->connections.append(connection);

}

// Added for NamedPipe implementation for windows

#if defined PEGASUS_OS_TYPE_WINDOWS && !defined(PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET)

void HTTPAcceptor::_createNamedPipe()

{

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "Entering HTTPAcceptor::_createNamedPipe()." << PEGASUS_STD(endl);

}

#endif

_rep->namedPipeServer = new NamedPipeServer(PEGASUS_NAMEDPIPE_PATH);

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "in HTTPAcceptor::_createNamedPipe() after calling the pipe server constructor" << PEGASUS_STD(endl);

}

{

AutoMutex automut(Monitor::_cout_mut);

cout << "Named pipe...in _createNamedPipe..." << _rep->namedPipeServer->getPipe() << endl;

}

#endif

// Register to receive Messages on Connection pipe:

if ( -1 == ( _entry_index = _monitor->solicitPipeMessages(

*_rep->namedPipeServer,

NamedPipeMessage::READ | NamedPipeMessage::EXCEPTION,

getQueueId(),

Monitor::ACCEPTOR)))

{

::CloseHandle(_rep->namedPipeServer->getPipe());

delete _rep;

_rep = 0;

//l10n

MessageLoaderParms parms("Common.HTTPAcceptor.FAILED_SOLICIT_SOCKET_MESSAGES",

"Failed to solicit socket messaeges");

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_bind: Failed to solicit pipe messages(2).");

throw BindFailedException(parms);

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut); //added

PEGASUS_STD(cout) << "in HTTPAcceptor::_createNamedPipe() _monitor->solicitSocketMessages failed"

<< PEGASUS_STD(endl);

}

#endif

}

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout) << "Leaving HTTPAcceptor::_createNamedPipe()." << PEGASUS_STD(endl);

}

#endif

return;

}

void HTTPAcceptor::_acceptNamedPipeConnection()

{

PEGASUS_ASSERT(_rep != 0);

if (!_rep)

return;

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

cout <<"In HTTPAcceptor::_acceptNamedPipeConnection " << endl;

}

#endif

NamedPipeServerEndPiont nPSEndPoint = _rep->namedPipeServer->accept();

// Register to receive Messages on Connection pipe:

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

cout << " In _acceptNamedPipeConnection -- after calling namedPipeServer->accept()" << endl;

}

#endif

HTTPConnection* connection = new HTTPConnection(_monitor, nPSEndPoint,

this, static_cast<MessageQueue *>(_outputMessageQueue),false);

// Solicit events on this new connection's socket:

int index;

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

cout << endl << connection->getNamedPipe().getName() << " has a this as a QueueID " <<

connection->getQueueId() << endl;

}

#endif

if (-1 == (index = _monitor->solicitPipeMessages(

connection->getNamedPipe(),

NamedPipeMessage::READ | NamedPipeMessage::EXCEPTION,

connection->getQueueId(), Monitor::ACCEPTOR)) )

{

// ATTN-DE-P2-2003100503::TODO::Need to enhance code to return

// an error message to Client application.

Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor::_acceptPipeConnection: Attempt to allocate entry in _entries table failed.");

delete connection;

return;

}

// Save the socket for cleanup later:

connection->_entry_index = index;

_rep->_connection_mut.lock(pegasus_thread_self());

AutoMutex autoMut(_rep->_connection_mut);

_rep->connections.append(connection);

_rep->_connection_mut.unlock();

#ifdef PEGASUS_LOCALDOMAINSOCKET_DEBUG

{

AutoMutex automut(Monitor::_cout_mut);

PEGASUS_STD(cout)

<< "in HTTPAcceptor::_acceptNamedPipeConnection() at the end" << PEGASUS_STD(endl);

}

#endif

}

#endif

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.31
changed lines
	Added in v.1.88.6.1

No CVS admin address has been configured