summaryrefslogtreecommitdiff
path: root/ACE/examples
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-05-14 10:01:29 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2020-05-14 10:01:29 +0200
commit2d366e54e7a507b6b3dfa4c3c8bc29f55e62785e (patch)
tree34bfe092eedb7f65647e9a204587d2656210a517 /ACE/examples
parentdb3c5ecbc94edb3feca008433aeeb34f9c289b2d (diff)
downloadATCD-2d366e54e7a507b6b3dfa4c3c8bc29f55e62785e.tar.gz
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:
Diffstat (limited to 'ACE/examples')
-rw-r--r--ACE/examples/IPC_SAP/SSL_SAP/README2
-rw-r--r--ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h2
-rw-r--r--ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h49
-rw-r--r--ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp5
-rw-r--r--ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp5
5 files changed, 27 insertions, 36 deletions
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)
{