diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-07-10 17:19:34 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-07-10 17:19:34 +0000 |
commit | 4a8a85161bc4c8bdae300f6e8d2af1b478592601 (patch) | |
tree | 4863c954d6a4c8d715071e804c29afd2b36ace41 | |
parent | fa328a79a15383f2c25d68577da3551d857225ae (diff) | |
download | ATCD-4a8a85161bc4c8bdae300f6e8d2af1b478592601.tar.gz |
ChangeLogTag:Sat Jul 10 10:18:30 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ace/SSL/SSL_Asynch_Stream.h | 8 | ||||
-rw-r--r-- | ace/SSL/SSL_SOCK_Stream.h | 11 |
3 files changed, 23 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index e4deb45e8a4..ffa8f910850 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jul 10 10:18:30 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ace/SSL/SSL_SOCK_Stream.h: + * ace/SSL/SSL_Asynch_Stream.h: + + Clarified "context" parameter copying semantics. + Thu Jul 10 09:38:44 2004 Frank Hunleth <frank@hunleth.com> * ace/config-openbsd.h: diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h index dd342a1b892..0c8a17cd600 100644 --- a/ace/SSL/SSL_Asynch_Stream.h +++ b/ace/SSL/SSL_Asynch_Stream.h @@ -71,8 +71,14 @@ public: ST_SERVER = 0x0002 }; - /// The constructor. + /** + * @param context Pointer to @c ACE_SSL_Context instance containing + * the OpenSSL @c SSL data structure to be associated + * with this @c ACE_SSL_SOCK_Stream. The @c SSL data + * structure will be copied to make it at least + * logically independent of the supplied @a context. + */ ACE_SSL_Asynch_Stream (Stream_Type s_type = ST_SERVER, ACE_SSL_Context * context = 0); diff --git a/ace/SSL/SSL_SOCK_Stream.h b/ace/SSL/SSL_SOCK_Stream.h index dddcced18cb..4d905e486e9 100644 --- a/ace/SSL/SSL_SOCK_Stream.h +++ b/ace/SSL/SSL_SOCK_Stream.h @@ -60,8 +60,15 @@ class ACE_SSL_Export ACE_SSL_SOCK_Stream : public ACE_SSL_SOCK public: /// Constructor + /** + * @param context Pointer to @c ACE_SSL_Context instance containing + * the OpenSSL @c SSL data structure to be associated + * with this @c ACE_SSL_SOCK_Stream. The @c SSL data + * structure will be copied to make it at least + * logically independent of the supplied @a context. + */ ACE_SSL_SOCK_Stream (ACE_SSL_Context *context = - ACE_SSL_Context::instance ()); + ACE_SSL_Context::instance ()); /// Destructor ~ACE_SSL_SOCK_Stream (void); @@ -150,7 +157,7 @@ public: /** * Wait up to timeout amount of time to receive up to n bytes * into buf (uses the recv() call). If recv() times - * out a -1 is returned with errno == ETIME. If it succeeds the + * out a -1 is returned with @c errno == ETIME. If it succeeds the * number of bytes received is returned. */ ssize_t recv (void *buf, |