*** empty log message ***

3 files changed, 22 insertions, 14 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index 424a25ea6d7..bd21f98126a 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,3 +1,11 @@
+Wed Dec  3 21:37:47 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record),
+	  netsvcs/lib/Client_Logging_Handler.cpp (send):
+	  Changed the code so that we now always send ACE_UINT32 bytes
+ 	  worth of data for the length field.  This ensures we're portable
+ 	  across platforms.  Thanks to Steven Coy for noticing this.
+
 Wed Dec 03 18:02:09 1997    <irfan@TWOSTEP>
 
 	* performance-tests/Synch-Benchmarks/Benchmark.cpp: Added template
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 9048092eae3..33c659f37c9 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -112,7 +112,9 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
   long length;
 
   // We need to use the ol' two-read trick here since TCP sockets
-  // don't support framing natively.
+  // don't support framing natively.  Note that the first call is just
+  // a "peek" -- we don't actually remove the data until the second
+  // call.
 
   switch (ACE_OS::recv (handle,
 			(char *) &length,
@@ -192,7 +194,7 @@ ACE_Client_Logging_Handler::send (ACE_Log_Record &log_record)
   else
     {
       long len = log_record.length ();
-      long encoded_len = htonl (len);
+      ACE_INT32 encoded_len = htonl (len);
 
       log_record.encode ();
 
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index e9637d65744..566eaef1f69 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -54,15 +54,13 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ho
 template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> int
 ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::handle_logging_record (void)
 {
-  ssize_t len;
+  ACE_INT32 len;
 
   // Perform two recv's to emulate record-oriented semantics.  Note
-  // that this code is not entirely portable since it relies on the
-  // fact that sizeof (ssize_t) is the same on both the sender and
-  // receiver side.  To correctly handle this is painful, and we leave
-  // it as an exercise for the reader ;-).
+  // that this code is portable as long as ACE_UNIT32 is always 32
+  // bits on both the sender and receiver side.
 
-  ssize_t n = this->peer ().recv (&len, sizeof len);
+  ssize_t n = this->peer ().recv ((void *) &len, sizeof len);
 
   switch (n)
     {
@@ -74,7 +72,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
       ACE_ERROR_RETURN ((LM_ERROR, "closing log daemon at host %s\n",
 			this->host_name ()), -1);
       /* NOTREACHED */
-    case sizeof (ssize_t):
+    case sizeof (ACE_INT32):
       {
 	ACE_Log_Record lp;
 	
@@ -93,11 +91,11 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
 	lp.decode ();
 
 	if (lp.length () == n)
-  {
-    receiver().log_record(this->host_name (), lp);
-    // Send the log record to the log message receiver for
-    // processing.
-  }
+          {
+            receiver().log_record(this->host_name (), lp);
+            // Send the log record to the log message receiver for
+            // processing.
+          }
 	else
 	  ACE_ERROR ((LM_ERROR, "error, lp.length = %d, n = %d\n",
 		     lp.length (), n));