From db73931499290bc5fb46ceff47e47e5be3601be7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 13 May 2020 12:20:15 +0200 Subject: Removed Compiler_Features_08_Test from this mpc file, it is not in git anymore * ACE/tests/tests.mpc: --- ACE/tests/tests.mpc | 9 --------- 1 file changed, 9 deletions(-) (limited to 'ACE') diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 1b4b2324ea6..f604aa67a8b 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -614,15 +614,6 @@ project(Compiler_Features_07_Test) : acetest { } } -// This compiler feature is not supported on all compilers -project(Compiler_Features_08_Test) : acetest { - requires += dummy_label - exename = Compiler_Features_08_Test - Source_Files { - Compiler_Features_08_Test.cpp - } -} - project(Compiler_Features_09_Test) : acetest { exename = Compiler_Features_09_Test Source_Files { -- cgit v1.2.1 From 2d366e54e7a507b6b3dfa4c3c8bc29f55e62785e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 14 May 2020 10:01:29 +0200 Subject: Layout, const, logging, doxygen changes * ACE/ace/SSL/SSL_Asynch_Stream.cpp: * ACE/ace/SSL/SSL_Context.cpp: * ACE/examples/IPC_SAP/SSL_SAP/README: * ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h: * ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h: * ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp: * ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp: * ACE/tests/SSL/Bug_2912_Regression_Test.cpp: * ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: * ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h: * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp: --- ACE/ace/SSL/SSL_Asynch_Stream.cpp | 7 +--- ACE/ace/SSL/SSL_Context.cpp | 11 ++--- ACE/examples/IPC_SAP/SSL_SAP/README | 2 - ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h | 2 +- ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h | 49 +++++++++++----------- ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp | 5 +-- ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp | 5 +-- ACE/tests/SSL/Bug_2912_Regression_Test.cpp | 1 - ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp | 5 +-- ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h | 6 +-- 10 files changed, 35 insertions(+), 58 deletions(-) (limited to 'ACE') diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index b493e98a750..f084c5375e7 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -256,7 +256,6 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, ACE_TEXT ("- invalid handle")), -1); - // Get a proactor for/from the user. this->proactor_ = this->get_proactor (proactor, handler); this->ext_handler_ = & handler; @@ -407,8 +406,7 @@ ACE_SSL_Asynch_Stream::do_SSL_state_machine (void) { // this protected member should be called // with locked mutex_ - - int retval = this->do_SSL_handshake (); + int const retval = this->do_SSL_handshake (); if (retval == 0) // handshake in progress ? return 0; @@ -527,7 +525,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) -1); } - int status = ::SSL_get_error (this->ssl_, retval); + int const status = ::SSL_get_error (this->ssl_, retval); switch (status) { @@ -552,7 +550,6 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) return 1; } - bool ACE_SSL_Asynch_Stream::post_handshake_check (void) { diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index bbbfb632541..e0d6530f426 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -352,7 +352,6 @@ ACE_SSL_Context::filter_versions (const char* versionlist) return 0; } - bool ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) { @@ -360,7 +359,6 @@ ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) this->check_context (); - int result = 0; char name[MAXHOSTNAMELEN+1]; if (peerssl == 0 || host.get_host_name (name, MAXHOSTNAMELEN) == -1) @@ -379,13 +377,13 @@ ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl) int flags = X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT; size_t len = ACE_OS::strlen (name); - result = ::X509_check_host (cert, name, len, flags, peerarg); + int const result = ::X509_check_host (cert, name, len, flags, peerarg); if (ACE::debug ()) { ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SSL_Context::check_host ") - ACE_TEXT ("name <%s> returns %d, peer <%s>\n"), + ACE_TEXT ("name <%C> returns %d, peer <%s>\n"), name, result, peer)); } if (peer != 0) @@ -516,7 +514,6 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, return 0; } - int ACE_SSL_Context::private_key (const char *file_name, int type) @@ -598,8 +595,7 @@ ACE_SSL_Context::set_verify_peer (int strict, int once, int depth) { this->check_context (); - // Setup the peer verififcation mode. - + // Setup the peer verification mode. int verify_mode = SSL_VERIFY_PEER; if (once) verify_mode |= SSL_VERIFY_CLIENT_ONCE; @@ -615,7 +611,6 @@ ACE_SSL_Context::set_verify_peer (int strict, int once, int depth) ::SSL_CTX_set_verify_depth (this->context_, depth + 1); } - int ACE_SSL_Context::random_seed (const char * seed) { diff --git a/ACE/examples/IPC_SAP/SSL_SAP/README b/ACE/examples/IPC_SAP/SSL_SAP/README index 6e7f0b51e27..f47c084da13 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/README +++ b/ACE/examples/IPC_SAP/SSL_SAP/README @@ -1,5 +1,3 @@ - - This directory contains groups of client and server test programs that exercise the various C++ wrappers for SSL sockets. In general, the test programs do more or less the same thing -- the client establishes diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h index 66e030b51bc..db1ad45bf4c 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h @@ -73,7 +73,7 @@ private: // Sleep_Time value. enum {QUIT_STRING_SIZE = 128}; - char quit_string_[QUIT_STRING_SIZE]; + char quit_string_[QUIT_STRING_SIZE + 1]; // String that shuts down the client/server. size_t message_len_; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h index 073ca0f9cac..e445e35c147 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h @@ -10,80 +10,79 @@ #include "ace/SSL/SSL_SOCK_Stream.h" +/// Define the options for this test. class Options - // = TITLE - // Define the options for this test. { public: - Options (void); // Constructor. + Options (void); - ~Options (void); // Destructor. + ~Options (void); - int parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments. + int parse_args (int argc, ACE_TCHAR *argv[]); - const ACE_Time_Value &sleep_time (void) const; // Return the amount of time to sleep in order to implement the // proper transmission rates. + const ACE_Time_Value &sleep_time (void) const; - u_short port (void) const; // Port of the server. + u_short port (void) const; - const ACE_TCHAR *host (void) const; // Host of the server. + const ACE_TCHAR *host (void) const; - size_t threads (void) const; // Number of threads. + size_t threads (void) const; - const char *quit_string (void) const; // String that shuts down the client/server. + const char *quit_string (void) const; - ssize_t read (void *buf, size_t len, size_t &iterations); // Read from the appropriate location. + ssize_t read (void *buf, size_t len, size_t &iterations); - size_t message_len (void) const; // Returns the length of the message to send. + size_t message_len (void) const; - const void *message_buf (void) const; // Returns a pointer to the message. + const void *message_buf (void) const; - ACE_THR_FUNC thr_func (void); // Returns a pointer to the entry point into the thread that runs // the client test function. + ACE_THR_FUNC thr_func (void); private: - int init (void); // Initialize the message we're sending to the user and set up the // barrier. + int init (void); - char *shared_client_test (u_short port, - ACE_SSL_SOCK_Stream &cli_stream); // Performs the shared behavior of the oneway and twoway client // tests. + char *shared_client_test (u_short port, + ACE_SSL_SOCK_Stream &cli_stream); - static void *twoway_client_test (void *); // Performs the twoway test. + static void *twoway_client_test (void *); - static void *oneway_client_test (void *); // Performs the oneway test. + static void *oneway_client_test (void *); - const ACE_TCHAR *host_; // Host of the server. + const ACE_TCHAR *host_; - u_short port_; // Port of the server. + u_short port_; - ACE_Time_Value sleep_time_; // Sleep_Time value. + ACE_Time_Value sleep_time_; - size_t threads_; // Number of threads. + size_t threads_; - enum {QUIT_STRING_SIZE = 128}; - char quit_string_[QUIT_STRING_SIZE]; // String that shuts down the client/server. + enum {QUIT_STRING_SIZE = 128}; + char quit_string_[QUIT_STRING_SIZE + 1]; size_t message_len_; // Size of the message we send to the server. diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp index 07f599db404..b6cae2fe044 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp @@ -5,13 +5,10 @@ #include "ace/Handle_Set.h" #include "ace/Profile_Timer.h" #include "ace/OS_NS_sys_select.h" - #include "ace/SSL/SSL_SOCK_Acceptor.h" - - // Are we running verbosely? -static int verbose = 1; +static bool verbose = true; // Function entry point into the twoway server task. diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp index 2b23d67d8bc..012ac569d99 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp @@ -10,10 +10,8 @@ #include "ace/SSL/SSL_SOCK_Acceptor.h" - - // Are we running verbosely? -static int verbose = 0; +static bool verbose = false; static void run_server (ACE_THR_FUNC server, @@ -34,7 +32,6 @@ run_server (ACE_THR_FUNC server, } // Function entry point into the twoway server task. - static ACE_THR_FUNC_RETURN twoway_server (void *arg) { diff --git a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp index c713456137a..653b9ade93d 100644 --- a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp +++ b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp @@ -114,7 +114,6 @@ Client_Proactor_Task::svc (void) return 0; } - /** * Server's proactor */ diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp index 8008e7351ab..548c18f1e89 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp @@ -32,7 +32,6 @@ */ //============================================================================= - #include "../test_config.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" @@ -43,8 +42,6 @@ #include "ace/SSL/SSL_SOCK_Connector.h" #include "ace/SSL/SSL_SOCK_Acceptor.h" - - #if defined (ACE_HAS_THREADS) #include "Thread_Pool_Reactor_SSL_Test.h" @@ -104,7 +101,7 @@ parse_arg (int argc, ACE_TCHAR *argv[]) break; default: ACE_ERROR ((LM_ERROR, - "Usage: Thread_Pool_Reactor_Test [-r ]" + "Usage: Thread_Pool_Reactor_SSL_Test [-r ]" "\t[-s ] [-c ] [-d ]" "\t[-i ]" "[-n ]\n")); diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h index 64f251f2f62..6d96043f40f 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_TESTS_THREAD_POOL_REACTOR_TEST_SSL_H #define ACE_TESTS_THREAD_POOL_REACTOR_TEST_SSL_H @@ -23,11 +22,10 @@ #include "ace/Svc_Handler.h" +/// This class is the Svc_Handler used by . class Request_Handler : public ACE_Svc_Handler { - // = TITLE - // This class is the Svc_Handler used by . public: /// The default constructor makes sure the right reactor is used. Request_Handler (ACE_Thread_Manager *tm = 0); @@ -37,7 +35,7 @@ protected: virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask = 0); private: - size_t nr_msgs_rcvd_; + size_t nr_msgs_rcvd_; }; #endif /* ACE_TESTS_THREAD_POOL_REACTOR_TEST_SSL_H */ -- cgit v1.2.1 From 58be69d5e403512f57fe5812b9c934af3926695e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 14 May 2020 11:05:37 +0200 Subject: Doxygen changes * ACE/ace/SSL/SSL_SOCK_Stream.h: --- ACE/ace/SSL/SSL_SOCK_Stream.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ACE') diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.h b/ACE/ace/SSL/SSL_SOCK_Stream.h index c9a54fe98af..bce3cd9ec6f 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.h +++ b/ACE/ace/SSL/SSL_SOCK_Stream.h @@ -75,7 +75,7 @@ public: /// Destructor ~ACE_SSL_SOCK_Stream (void); - /// Send an n byte buffer to the ssl socket using the semantics of + /// Send an @a n byte buffer to the ssl socket using the semantics of /// send(3n). /** * ACE_SSL supports no flags for sending at this time. @@ -84,7 +84,7 @@ public: size_t n, int flags) const; - /// Recv an n byte buffer from the ssl socket using the semantics of + /// Recv an @a n byte buffer from the ssl socket using the semantics of /// recv(3n). /** * ACE_SSL supports MSG_PEEK, but no other flags at this time. @@ -93,17 +93,17 @@ public: size_t n, int flags) const; - /// Send an n byte buffer to the ssl socket using the semantics of + /// Send an @a n byte buffer to the ssl socket using the semantics of /// write(2). ssize_t send (const void *buf, size_t n) const; - /// Recv an n byte buffer from the ssl socket using the semantics of + /// Recv an @a n byte buffer from the ssl socket using the semantics of /// read(2). ssize_t recv (void *buf, size_t n) const; - /// Send an iovec of size n to the ssl socket. + /// Send an iovec of size @a n to the ssl socket. /** * Note that it is not possible to perform a "scattered" write with * the underlying OpenSSL implementation. As such, the expected @@ -136,8 +136,8 @@ public: const ACE_Time_Value *timeout) const; /** - * Wait up to timeout amount of time to receive up to n bytes into - * buf (uses the recv() call). If recv() times out -1 is returned + * Wait up to timeout amount of time to receive up to @a n bytes into + * @a buf (uses the recv() call). If recv() times out -1 is returned * with errno == ETIME. If it succeeds the number of bytes received * is returned. MSG_PEEK is the only supported flag. */ -- cgit v1.2.1 From a6374afe74fd0ceb059407571e3051125d6f14f7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 15 May 2020 16:21:09 +0200 Subject: Layout and doxygen changes * ACE/ace/SSL/SSL_Asynch_Stream.h: * ACE/ace/SSL/SSL_SOCK.h: * ACE/ace/SSL/SSL_SOCK_Acceptor.cpp: * ACE/ace/SSL/SSL_SOCK_Acceptor.h: * ACE/ace/SSL/SSL_SOCK_Connector.h: * ACE/ace/SSL/SSL_SOCK_Stream.h: --- ACE/ace/SSL/SSL_Asynch_Stream.h | 2 -- ACE/ace/SSL/SSL_SOCK.h | 3 --- ACE/ace/SSL/SSL_SOCK_Acceptor.cpp | 1 - ACE/ace/SSL/SSL_SOCK_Acceptor.h | 4 ---- ACE/ace/SSL/SSL_SOCK_Connector.h | 7 +------ ACE/ace/SSL/SSL_SOCK_Stream.h | 34 ++++++++++++++-------------------- 6 files changed, 15 insertions(+), 36 deletions(-) (limited to 'ACE') diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h index de2a9dc169b..7a965995a76 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.h +++ b/ACE/ace/SSL/SSL_Asynch_Stream.h @@ -373,7 +373,6 @@ private: ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &); protected: - /// Stream Type ST_CLIENT/ST_SERVER Stream_Type type_; @@ -447,7 +446,6 @@ protected: /// Mutex to protect work ACE_SYNCH_MUTEX mutex_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK.h b/ACE/ace/SSL/SSL_SOCK.h index 16e84af890f..29df1c85ce2 100644 --- a/ACE/ace/SSL/SSL_SOCK.h +++ b/ACE/ace/SSL/SSL_SOCK.h @@ -39,7 +39,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SSL_Export ACE_SSL_SOCK : public ACE_SOCK { public: - /** * Override ACE_SOCK base class implementations with these SSL * specific ones. @@ -61,7 +60,6 @@ public: //@} protected: - /// Default constructor is private to prevent instances of this class /// from being defined. ACE_SSL_SOCK (void); @@ -73,7 +71,6 @@ protected: * ACE_SSL_SOCK pointer/reference. */ ~ACE_SSL_SOCK (void); - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp index d790662af29..9ec3d58e9a2 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -23,7 +23,6 @@ ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void) ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor"); } - int ACE_SSL_SOCK_Acceptor::ssl_accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Time_Value *timeout) const diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.h b/ACE/ace/SSL/SSL_SOCK_Acceptor.h index 83f56510005..e71226be9fe 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.h +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.h @@ -49,7 +49,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SSL_Export ACE_SSL_SOCK_Acceptor : public ACE_SSL_SOCK { public: - /// Default constructor. ACE_SSL_SOCK_Acceptor (void); @@ -175,16 +174,13 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Complete SSL passive connection establishment. int ssl_accept (ACE_SSL_SOCK_Stream &new_stream, ACE_Time_Value *timeout) const; private: - /// The BSD-socket workhorse ACE_SOCK_Acceptor acceptor_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.h b/ACE/ace/SSL/SSL_SOCK_Connector.h index 4c862c9fbac..72917a0abb0 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.h +++ b/ACE/ace/SSL/SSL_SOCK_Connector.h @@ -53,9 +53,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_SSL_Export ACE_SSL_SOCK_Connector { - public: - /// Default constructor. ACE_SSL_SOCK_Connector (void); @@ -292,17 +290,14 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Complete non-blocking SSL active connection. int ssl_connect (ACE_SSL_SOCK_Stream &new_stream, const ACE_Time_Value *timeout); private: - /// The class that does all of the non-secure socket connection. - /// It is default contructed, and subsequently used by connect(). + /// It is default constructed, and subsequently used by connect(). ACE_SOCK_Connector connector_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.h b/ACE/ace/SSL/SSL_SOCK_Stream.h index bce3cd9ec6f..ed75a132747 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.h +++ b/ACE/ace/SSL/SSL_SOCK_Stream.h @@ -60,7 +60,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SSL_Export ACE_SSL_SOCK_Stream : public ACE_SSL_SOCK { public: - /// Constructor /** * @param context Pointer to @c ACE_SSL_Context instance containing @@ -147,8 +146,8 @@ public: const ACE_Time_Value *timeout) const; /** - * Wait to to timeout amount of time to send up to n bytes into - * buf (uses the send() call). If send() times out + * Wait to to timeout amount of time to send up to @a n bytes into + * @a buf (uses the send() call). If send() times out * a -1 is returned with errno == ETIME. If it succeeds the * number of bytes sent is returned. */ @@ -157,8 +156,8 @@ public: const ACE_Time_Value *timeout) const; /** - * Wait up to timeout amount of time to receive up to n bytes - * into buf (uses the recv() call). If recv() times + * Wait up to timeout amount of time to receive up to @a n bytes + * into @a buf (uses the recv() call). If recv() times * out a -1 is returned with @c errno == ETIME. If it succeeds the * number of bytes received is returned. */ @@ -166,18 +165,18 @@ public: size_t n, const ACE_Time_Value *timeout) const; - /// Send n varargs messages to the connected ssl socket. + /// Send @a n varargs messages to the connected ssl socket. ssize_t send (size_t n, ...) const; - /// Recv n varargs messages to the connected ssl socket. + /// Recv @a n varargs messages to the connected ssl socket. ssize_t recv (size_t n, ...) const; - /// Send n bytes, keep trying until n are sent. + /// Send @a n bytes, keep trying until n are sent. ssize_t send_n (const void *buf, int n) const; - /// Recv n bytes, keep trying until n are received. + /// Recv @a n bytes, keep trying until @a n are received. ssize_t recv_n (void *buf, int n) const; /** @@ -185,14 +184,14 @@ public: * for recv_n(), and no flags are supported for send_n(). */ //@{ - /// Send n bytes, keep trying until n are sent. + /// Send @a n bytes, keep trying until @a n are sent. ssize_t send_n (const void *buf, int n, int flags) const; - /// Recv n bytes, keep trying until n are sent. + /// Recv @a n bytes, keep trying until @a n are sent. ssize_t recv_n (void *buf, int n, int flags) const; /** - * Try to send exactly len bytes into buf (uses the send() call). + * Try to send exactly @a len bytes into @a buf (uses the send() call). * If send() blocks for longer than timeout the number of bytes * actually sent is returned with errno == ETIME. If a timeout does * not occur, send_n() return len (i.e., the number of bytes @@ -205,7 +204,7 @@ public: size_t *bytes_transferred = 0) const; /** - * Try to send exactly len bytes into buf (uses the send() call). + * Try to send exactly @a len bytes into @a buf (uses the send() call). * If send() blocks for longer than timeout the number of bytes * actually sent is returned with errno == ETIME. If a timeout does * not occur, send_n() return len (i.e., the number of bytes @@ -217,7 +216,7 @@ public: size_t *bytes_transferred = 0) const; /** - * Try to receive exactly len bytes into buf (uses the recv() call). + * Try to receive exactly @a len bytes into @a buf (uses the recv() call). * The ACE_Time_Value indicates how long to blocking trying to * receive. If timeout == 0, the caller will block until action is * possible, else will wait until the relative time specified in @@ -259,7 +258,6 @@ public: ssize_t recvv_n (iovec iov[], size_t n) const; - /** * Selectively close endpoints. */ @@ -293,7 +291,7 @@ public: /** * Return the address of the remotely connected peer (if there is - * one), in the referenced . Returns 0 if successful, else + * one), in the referenced ACE_Addr. Returns 0 if successful, else * -1. * * @note If the TCP connection has been completed but the SSL @@ -306,7 +304,6 @@ public: ACE_SOCK_Stream & peer (void); protected: - /// Underlying send() helper method common to all public send() /// methods. ssize_t send_i (const void *buf, @@ -321,18 +318,15 @@ protected: const ACE_Time_Value *timeout) const; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_SOCK_Stream &)) ACE_UNIMPLEMENTED_FUNC (ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &)) protected: - /// The SSL session. SSL *ssl_; /// The stream which works under the ssl connection. ACE_SOCK_Stream stream_; - }; ACE_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1 From 70a709c0eee50e73e049ec8c54df2e1c0270429f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 15 May 2020 20:28:59 +0200 Subject: Layout changes * ACE/ace/SSL/SSL_SOCK_Stream.cpp: * ACE/ace/SSL/SSL_SOCK_Stream.inl: --- ACE/ace/SSL/SSL_SOCK_Stream.cpp | 1 - ACE/ace/SSL/SSL_SOCK_Stream.inl | 1 - 2 files changed, 2 deletions(-) (limited to 'ACE') diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp index b8f6ba00cb8..113adf25a61 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp @@ -563,7 +563,6 @@ ACE_SSL_SOCK_Stream::get_remote_addr (ACE_Addr &addr) const // complete. Despite that fact, the SSL connection may not have // been completed. In such a case, a successful return from // get_remote_addr() would be misleading. - if (SSL_is_init_finished (this->ssl_)) { return this->ACE_SSL_SOCK::get_remote_addr (addr); diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.inl b/ACE/ace/SSL/SSL_SOCK_Stream.inl index c2a5bf2c8ba..7e9420bfb73 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.inl +++ b/ACE/ace/SSL/SSL_SOCK_Stream.inl @@ -101,7 +101,6 @@ ACE_SSL_SOCK_Stream::recv_i (void *buf, ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_i"); // NOTE: Caller must provide thread-synchronization. - int bytes_read = 0; ACE_HANDLE const handle = this->get_handle (); -- cgit v1.2.1