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.56 and 1.78.2.2

version 1.56, 2005/01/27 18:57:28

version 1.78.2.2, 2006/03/07 18:45:46

Line 1

//%2004////////////////////////////////////////////////////////////////////////

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

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

Line 6

// 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 35

Line 39

// Alagaraja Ramasubramanian (alags_raj@in.ibm.com) for Bug#1090

// Amit Arora, IBM (amita@in.ibm.com) for Bug#2541

// Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com)

// Sean Keenan, Hewlett-Packard Company (sean.keenan@hp.com)

// Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) for Bug#2065

// David Dillard, Symantec Corp. (david_dillard@symantec.com)

// John Alex, IBM (johnalex@us.ibm.com) for Bug#3312

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

#include "Config.h"

#include "Constants.h"

#include <iostream>

#include "Socket.h"

#ifdef PEGASUS_PLATFORM_WIN32_IX86_MSVC

#ifdef PEGASUS_OS_TYPE_WINDOWS

#include <windows.h>

#else

# include <cctype>

Line 52

Line 59

# include <fcntl.h>

# include <netdb.h>

# include <netinet/in.h>

# include <netinet/tcp.h>

# include <arpa/inet.h>

# include <sys/socket.h>

# ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

# ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

# include <unistd.h>

# include <sys/un.h>

# endif

Line 71

Line 79

#include "OS400ConvertChar.h"

#endif

PEGASUS_USING_STD;

PEGASUS_NAMESPACE_BEGIN

static int MAX_CONNECTION_QUEUE_LENGTH = -1;

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

Line 91

Line 100

{

if (local)

{

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

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

address_size = sizeof(struct sockaddr_un);

#else

Line 104

Line 113

address_size = sizeof(struct sockaddr_in);

}

~HTTPAcceptorRep()

{

delete address;

}

struct sockaddr* address;

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

PEGASUS_SOCKLEN_T 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;

PEGASUS_SOCKET socket;

Array<HTTPConnection*> connections;

};

//------------------------------------------------------------------------------

// _setTCPNoDelay()

//------------------------------------------------------------------------------

inline void _setTCPNoDelay(PEGASUS_SOCKET socket)

{

// This function disables "Nagle's Algorithm" also known as "the TCP delay

// algorithm", which causes read operations to obtain whatever data is

// already in the input queue and then wait a little longer to see if

// more data arrives. This algorithm optimizes the case in which data is

// sent in only one direction but severely impairs performance of round

// trip servers. Disabling TCP delay is a standard technique for round

// trip servers.

int opt = 1;

setsockopt(socket, IPPROTO_TCP, TCP_NODELAY, (char*)&opt, sizeof(opt));

}

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

// HTTPAcceptor

Line 131

Line 157

Boolean localConnection,

Uint32 portNumber,

SSLContext * sslcontext,

Boolean exportConnection)

Boolean exportConnection,

ReadWriteSem* sslContextObjectLock)

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

_monitor(monitor),

_outputMessageQueue(outputMessageQueue),

Line 140

Line 167

_localConnection(localConnection),

_portNumber(portNumber),

_sslcontext(sslcontext),

_exportConnection(exportConnection)

_exportConnection(exportConnection),

_sslContextObjectLock(sslContextObjectLock)

{

Socket::initializeInterface();

Line 182

Line 210

HTTPAcceptor::~HTTPAcceptor()

{

destroyConnections();

unbind();

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

Socket::uninitializeInterface();

Line 192

Line 221

if (! message)

return;

PEGASUS_ASSERT(_rep != 0);

switch (message->getType())

{

case SOCKET_MESSAGE:

Line 201

Line 231

// If this is a connection request:

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

socketMessage->events | SocketMessage::READ)

socketMessage->events & SocketMessage::READ)

{

_acceptConnection();

}

Line 225

Line 255

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

{

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

Sint32 socket = connection->getSocket();

PEGASUS_SOCKET socket = connection->getSocket();

if (socket == closeConnectionMessage->socket)

{

Line 289

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 (_localConnection)

{

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

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

AF_UNIX;

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

Line 333

Line 364

else

{

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

_setTCPNoDelay(_rep->socket);

}

if (_rep->socket < 0)

Line 351

Line 384

// 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)

{

Line 392

Line 425

throw BindFailedException(parms);

}

// Bind socket to port:

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

{

Socket::close(_rep->socket);

Line 408

Line 443

throw BindFailedException(parms);

}

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

if ( _portNumber == 0 )

{

sockaddr_in buf;

PEGASUS_SOCKLEN_T 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_LOCAL_DOMAIN_SOCKET) && defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU)

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

if (_localConnection)

{

if (::chmod( PEGASUS_LOCAL_DOMAIN_SOCKET_PATH,

Line 487

Line 537

// close the socket

Socket::close(_rep->socket);

// Unlink Local Domain Socket Bug# 3312

if (_localConnection)

{

#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

}

else

{

Line 514

Line 577

/**

getOutstandingRequestCount - returns the number of outstanding requests.

Uint32 HTTPAcceptor::getOutstandingRequestCount()

Uint32 HTTPAcceptor::getOutstandingRequestCount() const

{

Uint32 count = 0;

if (_rep)

{

AutoMutex autoMut(_rep->_connection_mut);

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

{

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

count = connection->getRequestCount();

}

return count;

}

/**

getPortNumber - returns the port number used for the connection

Uint32 HTTPAcceptor::getPortNumber() const

{

return _portNumber;

}

void HTTPAcceptor::unbind()

{

if (_rep)

{

_portNumber = 0;

Socket::close(_rep->socket);

if (_localConnection)

{

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

::unlink(

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

#else

Line 556

Line 630

void HTTPAcceptor::destroyConnections()

{

if (_rep)

{

// For each connection created by this object:

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();

PEGASUS_SOCKET socket = connection->getSocket();

// Unsolicit SocketMessages:

Line 572

Line 646

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

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

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

delete connection;

}

_rep->connections.clear();

}

void HTTPAcceptor::_acceptConnection()

Line 592

Line 666

// Accept the connection (populate the address):

struct sockaddr* accept_address;

#if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)

PEGASUS_SOCKLEN_T address_size;

size_t address_size;

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

socklen_t address_size;

#else

int address_size;

#endif

if (_localConnection)

{

#ifdef PEGASUS_LOCAL_DOMAIN_SOCKET

#ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET

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

address_size = sizeof(struct sockaddr_un);

#else

Line 615

Line 683

address_size = sizeof(struct sockaddr_in);

}

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

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

delete accept_address;

Line 632

Line 700

}

// 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)

{

Line 651

Line 719

#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, _exportConnection));

// 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.

AutoPtr<MP_Socket> mp_socket(new MP_Socket(socket, _sslcontext, _exportConnection));

mp_socket->disableBlocking();

if (mp_socket->accept() < 0)

Sint32 socketAcceptStatus = mp_socket->accept();

mp_socket->enableBlocking();

if (socketAcceptStatus < 0)

{

PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2,

"HTTPAcceptor: SSL_accept() failed");

Line 666

Line 741

return;

}

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

HTTPConnection* connection = new HTTPConnection(_monitor, mp_socket,

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

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;

Line 690

Line 774

connection->_entry_index = index;

AutoMutex autoMut(_rep->_connection_mut);

_rep->connections.append(connection);

}

PEGASUS_NAMESPACE_END

Legend:

Removed from v.1.56
changed lines
	Added in v.1.78.2.2

No CVS admin address has been configured