ChangeLogTag: Mon Dec 06 21:16:53 1999 Irfan Pyarali <irfan@cs.wustl.edu>

1 files changed, 62 insertions, 50 deletions

diff --git a/ace/SOCK_Stream.i b/ace/SOCK_Stream.i
index bef8d5c9c82..cb8b2d5f75e 100644
--- a/ace/SOCK_Stream.i
+++ b/ace/SOCK_Stream.i
@@ -47,91 +47,103 @@ ACE_SOCK_Stream::close_writer (void)
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_Stream::send_n (const void *buf, size_t len, int flags,
-			 const ACE_Time_Value *timeout)
-{
-  ACE_TRACE ("ACE_SOCK_Stream::send_n");
-  return ACE::send_n (this->get_handle (), buf, len, flags, timeout);
-}
-
-ASYS_INLINE ssize_t
-ACE_SOCK_Stream::recv_n (void *buf, size_t len, int flags,
-			 const ACE_Time_Value *timeout)
+ACE_SOCK_Stream::recv_n (void *buf,
+                         size_t len,
+                         int flags,
+                         const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::recv_n");
-  return ACE::recv_n (this->get_handle (), buf, len, flags, timeout);
+  return ACE::recv_n (this->get_handle (),
+                      buf,
+                      len,
+                      flags,
+                      timeout);
 }
 
-// Receive exactly BUF_SIZE bytes from file descriptor this->handle
-// into <buf>.  Keep trying until this many bytes are received.
-
 ASYS_INLINE ssize_t
-ACE_SOCK_Stream::recv_n (void *buf, int buf_size, int flags) const
+ACE_SOCK_Stream::recv_n (void *buf,
+                         size_t len,
+                         const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::recv_n");
-  return ACE::recv_n (this->get_handle (), buf, buf_size, flags);
+  return ACE::recv_n (this->get_handle (),
+                      buf,
+                      len,
+                      timeout);
 }
 
-// Send exactly N bytes from <buf> to <handle>.  Keeping trying
-// until this many bytes are sent.
-
 ASYS_INLINE ssize_t
-ACE_SOCK_Stream::send_n (const void *buf, int buf_size, int flags) const
+ACE_SOCK_Stream::recvv_n (iovec iov[],
+                          size_t n,
+                          const ACE_Time_Value *timeout) const
 {
-  ACE_TRACE ("ACE_SOCK_Stream::send_n");
-  return ACE::send_n (this->get_handle (), buf, buf_size, flags);
+  ACE_TRACE ("ACE_SOCK_Stream::recvv_n");
+  return ACE::recvv_n (this->get_handle (),
+                       iov,
+                       n,
+                       timeout);
 }
 
-// Receive exactly BUF_SIZE bytes from file descriptor
-// into BUF.  Keep trying until this many bytes are received.
-
 ASYS_INLINE ssize_t
-ACE_SOCK_Stream::recv_n (void *buf, int buf_size) const
+ACE_SOCK_Stream::send_n (const void *buf,
+                         size_t len,
+                         int flags,
+                         const ACE_Time_Value *timeout) const
 {
-  ACE_TRACE ("ACE_SOCK_Stream::recv_n");
-  return ACE::recv_n (this->get_handle (), buf, buf_size);
+  ACE_TRACE ("ACE_SOCK_Stream::send_n");
+  return ACE::send_n (this->get_handle (),
+                      buf,
+                      len,
+                      flags,
+                      timeout);
 }
 
-// Send exactly N bytes from BUF to THIS->SOK_FD.  Keeping trying
-// until this many bytes are sent.
-
 ASYS_INLINE ssize_t
-ACE_SOCK_Stream::send_n (const void *buf, int buf_size) const
+ACE_SOCK_Stream::send_n (const void *buf,
+                         size_t len,
+                         const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::send_n");
-  return ACE::send_n (this->get_handle (), buf, buf_size);
+  return ACE::send_n (this->get_handle (),
+                      buf,
+                      len,
+                      timeout);
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_Stream::sendv_n (const iovec iov[], size_t n) const
+ACE_SOCK_Stream::sendv_n (iovec iov[],
+                          size_t n,
+                          const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::sendv_n");
   return ACE::sendv_n (this->get_handle (),
                        iov,
-                       n);
-}
-
-// Recv an n byte message from the connected socket.
-
-ASYS_INLINE ssize_t
-ACE_SOCK_Stream::recvv_n (iovec iov[], size_t n) const
-{
-  ACE_TRACE ("ACE_SOCK_Stream::recvv_n");
-  // @@ Carlos, can you please update this to call the
-  // new ACE::recvv_n() method that you write?
-  return ACE_OS::recvv (this->get_handle (), iov, n);
+                       n,
+                       timeout);
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_Stream::send_urg (void *ptr, int len)
+ACE_SOCK_Stream::send_urg (const void *ptr,
+                           size_t len,
+                           const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::send_urg");
-  return ACE_OS::send (this->get_handle (), (char *) ptr, len, MSG_OOB);
+  return ACE::send (this->get_handle (),
+                    ptr,
+                    len,
+                    MSG_OOB,
+                    timeout);
 }
 
 ASYS_INLINE ssize_t
-ACE_SOCK_Stream::recv_urg (void *ptr, int len)
+ACE_SOCK_Stream::recv_urg (void *ptr,
+                           size_t len,
+                           const ACE_Time_Value *timeout) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::recv_urg");
-  return ACE_OS::recv (this->get_handle (), (char *) ptr, len, MSG_OOB);
+  return ACE::recv (this->get_handle (),
+                    ptr,
+                    len,
+                    MSG_OOB,
+                    timeout);
 }