(file) Return to HTTPAcceptor.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/HTTPAcceptor.cpp between version 1.1.2.12 and 1.24.6.2

version 1.1.2.12, 2001/12/12 20:17:46 version 1.24.6.2, 2003/02/12 00:42:48
Line 1 
Line 1 
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,
 // The Open Group, Tivoli Systems // The Open Group, Tivoli Systems
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
Line 25 
Line 25 
 // //
 // Modified By: // Modified By:
 //         Jenny Yu, Hewlett-Packard Company (jenny_yu@hp.com) //         Jenny Yu, Hewlett-Packard Company (jenny_yu@hp.com)
   //         Nag Boranna, Hewlett-Packard Company (nagaraja_boranna@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include "Config.h" #include "Config.h"
   #include "Constants.h"
 #include <iostream> #include <iostream>
 #include "Socket.h" #include "Socket.h"
  
 #ifdef PEGASUS_PLATFORM_WIN32_IX86_MSVC #ifdef PEGASUS_PLATFORM_WIN32_IX86_MSVC
 # include <winsock.h>  #include <windows.h>
 #else #else
 # include <cctype> # include <cctype>
   # ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
 # include <unistd.h> # include <unistd.h>
   #  include <sys/un.h>
   # endif
 # include <cstdlib> # include <cstdlib>
 # include <errno.h> # include <errno.h>
 # include <fcntl.h> # include <fcntl.h>
Line 50 
Line 55 
 #include "TLS.h" #include "TLS.h"
 #include "HTTPAcceptor.h" #include "HTTPAcceptor.h"
 #include "HTTPConnection.h" #include "HTTPConnection.h"
   #include "Tracer.h"
  
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
Line 61 
Line 67 
 // //
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
  
 struct HTTPAcceptorRep  class HTTPAcceptorRep
   {
   public:
       HTTPAcceptorRep(Boolean local)
       {
           if (local)
           {
   #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
               address = reinterpret_cast<struct sockaddr*>(new struct sockaddr_un);
               address_size = sizeof(struct sockaddr_un);
   #else
               PEGASUS_ASSERT(false);
   #endif
           }
           else
 { {
     struct sockaddr_in address;              address = reinterpret_cast<struct sockaddr*>(new struct sockaddr_in);
               address_size = sizeof(struct sockaddr_in);
           }
       }
   
       struct sockaddr* address;
   
   #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
      size_t address_size;
   #elif defined(PEGASUS_PLATFORM_AIX_RS_IBMCXX) || defined(PEGASUS_PLATFORM_LINUX_IX86_GNU) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU)
      socklen_t address_size;
   #else
      int address_size;
   #endif
   
     Sint32 socket;     Sint32 socket;
     Array<HTTPConnection*> connections;     Array<HTTPConnection*> connections;
 }; };
Line 74 
Line 108 
 // //
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
  
 HTTPAcceptor::HTTPAcceptor(Monitor* monitor, MessageQueue* outputMessageQueue)  HTTPAcceptor::HTTPAcceptor(Monitor* monitor,
     : _monitor(monitor), _outputMessageQueue(outputMessageQueue), _rep(0),                             MessageQueue* outputMessageQueue,
       _sslcontext(NULL)                             Boolean localConnection,
 {                             Uint32 portNumber,
     Socket::initializeInterface();  
 }  
   
 HTTPAcceptor::HTTPAcceptor(Monitor* monitor, MessageQueue* outputMessageQueue,  
                            SSLContext * sslcontext)                            SSLContext * sslcontext)
     : _monitor(monitor), _outputMessageQueue(outputMessageQueue), _rep(0),     : Base(PEGASUS_QUEUENAME_HTTPACCEPTOR),  // ATTN: Need unique names?
        _monitor(monitor),
        _outputMessageQueue(outputMessageQueue),
        _rep(0),
        _entry_index(-1),
        _localConnection(localConnection),
        _portNumber(portNumber),
       _sslcontext(sslcontext)       _sslcontext(sslcontext)
 { {
     Socket::initializeInterface();     Socket::initializeInterface();
Line 92 
Line 128 
 HTTPAcceptor::~HTTPAcceptor() HTTPAcceptor::~HTTPAcceptor()
 { {
     unbind();     unbind();
      // ATTN: Is this correct in a multi-HTTPAcceptor server?
     Socket::uninitializeInterface();     Socket::uninitializeInterface();
 } }
  
 void HTTPAcceptor::handleEnqueue()  void HTTPAcceptor::handleEnqueue(Message *message)
 { {
     Message* message = dequeue();  
   
     if (!message)     if (!message)
         return;         return;
  
Line 151 
Line 186 
     delete message;     delete message;
 } }
  
 const char* HTTPAcceptor::getQueueName() const  
   void HTTPAcceptor::handleEnqueue()
 { {
     return "HTTPAcceptor";     Message* message = dequeue();
   
      if (!message)
         return;
   
      handleEnqueue(message);
   
 } }
  
 void HTTPAcceptor::bind(Uint32 portNumber)  void HTTPAcceptor::bind()
 { {
     if (_rep)     if (_rep)
         throw BindFailed("HTTPAcceptor already bound");        throw BindFailedException("HTTPAcceptor already bound");
  
     _rep = new HTTPAcceptorRep;     _rep = new HTTPAcceptorRep(_localConnection);
   
     _portNumber = portNumber;  
  
     // bind address     // bind address
     _bind();     _bind();
Line 173 
Line 213 
  
 /** /**
  _bind - creates a new server socket and bind socket to the port address.  _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
      a domain socket is bound.
 */ */
 void HTTPAcceptor::_bind() void HTTPAcceptor::_bind()
 { {
  
     // Create address:     // Create address:
  
     memset(&_rep->address, 0, sizeof(_rep->address));     memset(_rep->address, 0, sizeof(*_rep->address));
     _rep->address.sin_addr.s_addr = INADDR_ANY;  
     _rep->address.sin_family = AF_INET;     if (_localConnection)
     _rep->address.sin_port = htons(_portNumber);     {
   #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
          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);
          ::unlink(reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);
   #else
          PEGASUS_ASSERT(false);
   #endif
      }
      else
      {
          reinterpret_cast<struct sockaddr_in*>(_rep->address)->sin_addr.s_addr =
              INADDR_ANY;
          reinterpret_cast<struct sockaddr_in*>(_rep->address)->sin_family =
              AF_INET;
          reinterpret_cast<struct sockaddr_in*>(_rep->address)->sin_port =
              htons(_portNumber);
      }
  
     // Create socket:     // Create socket:
  
      if (_localConnection)
      {
          _rep->socket = socket(AF_UNIX, SOCK_STREAM, 0);
      }
      else
      {
     _rep->socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);     _rep->socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
      }
  
     if (_rep->socket < 0)     if (_rep->socket < 0)
     {     {
         delete _rep;         delete _rep;
         _rep = 0;         _rep = 0;
         throw BindFailed("Failed to create socket");        throw BindFailedException("Failed to create socket");
     }     }
  
     //     //
Line 207 
Line 275 
     {     {
         delete _rep;         delete _rep;
         _rep = 0;         _rep = 0;
         throw BindFailed("Failed to set socket option");        throw BindFailedException("Failed to set socket option");
     }     }
  
     // Bind socket to port:     // Bind socket to port:
  
     if (::bind(_rep->socket,     if (::bind(_rep->socket, _rep->address, _rep->address_size) < 0)
         (struct sockaddr*)(void*)&_rep->address,  
         sizeof(_rep->address)) < 0)  
     {     {
         Socket::close(_rep->socket);         Socket::close(_rep->socket);
         delete _rep;         delete _rep;
         _rep = 0;         _rep = 0;
         throw BindFailed("Failed to bind socket to port");        throw BindFailedException("Failed to bind socket");
     }     }
  
     // Set up listening on the given port:     // Set up listening on the given socket:
  
     int const MAX_CONNECTION_QUEUE_LENGTH = 5;     int const MAX_CONNECTION_QUEUE_LENGTH = 5;
  
Line 231 
Line 297 
         Socket::close(_rep->socket);         Socket::close(_rep->socket);
         delete _rep;         delete _rep;
         _rep = 0;         _rep = 0;
         throw BindFailed("Failed to bind socket to port");        throw BindFailedException("Failed to bind socket");
     }     }
  
     // Register to receive SocketMessages on this socket:     // Register to receive SocketMessages on this socket:
  
     if (!_monitor->solicitSocketMessages(     if ( -1 == ( _entry_index = _monitor->solicitSocketMessages(
         _rep->socket,         _rep->socket,
         SocketMessage::READ | SocketMessage::EXCEPTION,         SocketMessage::READ | SocketMessage::EXCEPTION,
         getQueueId()))            getQueueId(),
             Monitor::ACCEPTOR)))
     {     {
         Socket::close(_rep->socket);         Socket::close(_rep->socket);
         delete _rep;         delete _rep;
         _rep = 0;         _rep = 0;
         throw BindFailed("Failed to solicit socket messaeges");        throw BindFailedException("Failed to solicit socket messaeges");
     }     }
 } }
  
Line 296 
Line 363 
     if (_rep)     if (_rep)
     {     {
         Socket::close(_rep->socket);         Socket::close(_rep->socket);
   
         if (_localConnection)
         {
   #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
            ::unlink(
                reinterpret_cast<struct sockaddr_un*>(_rep->address)->sun_path);
   #else
            PEGASUS_ASSERT(false);
   #endif
         }
   
         delete _rep;         delete _rep;
         _rep = 0;         _rep = 0;
     }     }
Line 316 
Line 394 
  
         // Destroy the connection (causing it to close):         // Destroy the connection (causing it to close):
  
         while (connection->refcount.value()) { }
         delete connection;         delete connection;
     }     }
  
Line 333 
Line 412 
  
     // Accept the connection (populate the address):     // Accept the connection (populate the address):
  
     sockaddr_in address;     struct sockaddr* accept_address;
   
 #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
     size_t n = sizeof(address);     size_t address_size;
   #elif defined(PEGASUS_PLATFORM_AIX_RS_IBMCXX) || defined(PEGASUS_PLATFORM_LINUX_IX86_GNU) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU)
      socklen_t address_size;
 #else #else
     int n = sizeof(address);     int address_size;
 #endif #endif
  
 #if defined(PEGASUS_PLATFORM_LINUX_IX86_GNU)     if (_localConnection)
     Sint32 socket = accept(     {
         _rep->socket, (struct sockaddr*)&address, (socklen_t *)&n);  #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
          accept_address = reinterpret_cast<struct sockaddr*>(new struct sockaddr_un);
          address_size = sizeof(struct sockaddr_un);
 #else #else
     Sint32 socket = accept(_rep->socket, (struct sockaddr*)&address, &n);         PEGASUS_ASSERT(false);
 #endif #endif
      }
      else
      {
          accept_address = reinterpret_cast<struct sockaddr*>(new struct sockaddr_in);
          address_size = sizeof(struct sockaddr_in);
      }
   
      Sint32 socket = accept(_rep->socket, accept_address, &address_size);
   
      delete accept_address;
  
     if (socket < 0)     if (socket < 0)
     {     {
         if (getenv("PEGASUS_TRACE"))         PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,
             cerr <<"HTTPAcceptor: accept() failed" << endl;                          "HTTPAcceptor: accept() failed");
   
         return;         return;
     }     }
  
     // Create a new conection and add it to the connection list:     // Create a new conection and add it to the connection list:
  
     MP_Socket * mp_socket = new MP_Socket(socket, _sslcontext);     MP_Socket * mp_socket = new MP_Socket(socket, _sslcontext);
     if (mp_socket->accept() < 0) {     if (mp_socket->accept() < 0)
         if (getenv("PEGASUS_TRACE"))     {
             cerr <<"HTTPAcceptor: SSL_accept() failed" << endl;         PEG_TRACE_STRING(TRC_HTTP, Tracer::LEVEL2,
                           "HTTPAcceptor: SSL_accept() failed");
         return;         return;
     }     }
  
     HTTPConnection* connection = new HTTPConnection(     HTTPConnection* connection = new HTTPConnection(
         _monitor, mp_socket, this, _outputMessageQueue);        _monitor, mp_socket, this, static_cast<MessageQueue *>(_outputMessageQueue));
  
     // Solicit events on this new connection's socket:     // Solicit events on this new connection's socket:
      int index;
  
     if (!_monitor->solicitSocketMessages(     if (-1 ==  (index = _monitor->solicitSocketMessages(
         socket,         socket,
         SocketMessage::READ | SocketMessage::EXCEPTION,         SocketMessage::READ | SocketMessage::EXCEPTION,
         connection->getQueueId()))            connection->getQueueId(), Monitor::CONNECTION)) )
     {     {
         delete connection;         delete connection;
         Socket::close(socket);         Socket::close(socket);
     }     }
  
     // Save the socket for cleanup later:     // Save the socket for cleanup later:
      connection->_entry_index = index;
  
     _rep->connections.append(connection);     _rep->connections.append(connection);
 } }

Legend:
Removed from v.1.1.2.12  
changed lines
  Added in v.1.24.6.2
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2