diff options
Diffstat (limited to 'ace/UPIPE_Acceptor.cpp')
| -rw-r--r-- | ace/UPIPE_Acceptor.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp index 4b106b4a4be..c7fa930f284 100644 --- a/ace/UPIPE_Acceptor.cpp +++ b/ace/UPIPE_Acceptor.cpp @@ -1,3 +1,4 @@ +// UPIPE_Acceptor.cpp // $Id$ #include "ace/UPIPE_Acceptor.h" @@ -12,8 +13,6 @@ ACE_RCSID(ace, UPIPE_Acceptor, "$Id$") #include "ace/UPIPE_Acceptor.inl" #endif /* __ACE_INLINE__ */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor) void @@ -41,7 +40,7 @@ ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor (void) int ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr, - int reuse_addr) + int reuse_addr) { ACE_TRACE ("ACE_UPIPE_Acceptor::open"); return this->ACE_SPIPE_Acceptor::open (local_addr, reuse_addr); @@ -57,7 +56,7 @@ ACE_UPIPE_Acceptor::close (void) // General purpose routine for accepting new connections. ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr, - int reuse_addr) + int reuse_addr) : mb_ (sizeof (ACE_UPIPE_Stream *)) { ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor"); @@ -70,9 +69,9 @@ ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr, int ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, - ACE_UPIPE_Addr *remote_addr, - ACE_Time_Value *timeout, - int restart, + ACE_UPIPE_Addr *remote_addr, + ACE_Time_Value *timeout, + int restart, int reset_new_handle) { ACE_TRACE ("ACE_UPIPE_Acceptor::accept"); @@ -81,7 +80,7 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, ACE_SPIPE_Stream new_io; if (this->ACE_SPIPE_Acceptor::accept (new_io, remote_addr, - timeout, restart) == -1) + timeout, restart) == -1) return -1; else { @@ -101,20 +100,20 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, // ACE_UPIPE_Stream to our ACE_UPIPE_Stream. if (ACE_OS::read (new_stream.get_handle (), - (char *) &remote_stream, - sizeof remote_stream) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("read stream address failed"))); + (char *) &remote_stream, + sizeof remote_stream) == -1) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_LIB_TEXT ("read stream address failed"))); else if (new_stream.stream_.link (remote_stream->stream_) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("link streams failed"))); + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_LIB_TEXT ("link streams failed"))); // Send a message over the new streampipe to confirm acceptance. else if (new_stream.send (&mb_, 0) == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("linked stream.put failed"))); + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_LIB_TEXT ("linked stream.put failed"))); // Close down the new_stream at this point in order to conserve // handles. Note that we don't need the SPIPE connection @@ -124,6 +123,4 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, } } -ACE_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_HAS_THREADS */ |