remove compressed message types; modify message header to include

    compression status

1 files changed, 24 insertions, 10 deletions

diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index 1015ea834f6..a63605c7bf4 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -126,35 +126,49 @@ printHeader(ostream& s, BasicStream& stream)
 	    break;
 	}
 
-	case compressedRequestMsg:
+	case closeConnectionMsg:
 	{
-	    s << "(compressed request)";
+	    s << "(close connection)";
 	    break;
 	}
 
-	case compressedRequestBatchMsg:
+	case validateConnectionMsg:
 	{
-	    s << "(compressed batch request)";
+	    s << "(validate connection)";
 	    break;
 	}
 
-	case compressedReplyMsg:
+	default:
 	{
-	    s << "(compressed reply)";
+	    s << "(unknown)";
 	    break;
 	}
+    }
 
-	case closeConnectionMsg:
+    Byte compress;
+    stream.read(compress);
+    s << "\ncompression status = "  << static_cast<int>(compress) << ' ';
+
+    switch(compress)
+    {
+	case 0:
 	{
-	    s << "(close connection)";
+	    s << "(compression not used, not supported by sender)";
 	    break;
 	}
 
-	case validateConnectionMsg:
+	case 1:
 	{
-	    s << "(validate connection)";
+	    s << "(compression not used, supported by sender)";
 	    break;
 	}
+
+	case 2:
+	{
+	    s << "(compression used, supported by sender)";
+	    break;
+	}
+
 	default:
 	{
 	    s << "(unknown)";