diff mbox series

trace-cmd listen: Do not compress for v1 of the msg protocol

Message ID 20220521164745.54897f01@gandalf.local.home (mailing list archive)
State Accepted
Commit 41ddd3e8b422ddf06bcf205d110bad3d03e5cb8e
Headers show
Series trace-cmd listen: Do not compress for v1 of the msg protocol | expand

Commit Message

Steven Rostedt May 21, 2022, 8:47 p.m. UTC 
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>

The v1 of the msg protocol cannot handle compression being sent across
the network. Do not compress if the listener can only handle the v1 message
protocol.

Fixes: 3f8447b1e2f97 ("trace-cmd library: Add support for compression algorithms")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 tracecmd/trace-record.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index f8d2bad70566..c770f698019f 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -3780,19 +3780,18 @@  setup_connection(struct buffer_instance *instance, struct common_record_context
 		if (ret)
 			goto error;
 	} else {
+		/*
+		 * V3 can handle compression, but V1 can not.
+		 * Set the file version back to 6.
+		 */
+		ctx->file_version = FILE_VERSION_MIN;
+		ctx->compression = false;
 		network_handle = tracecmd_output_create_fd(msg_handle->fd);
 		if (!network_handle)
 			goto error;
 		if (tracecmd_output_set_version(network_handle, ctx->file_version))
 			goto error;
 
-		if (ctx->compression) {
-			if (tracecmd_output_set_compression(network_handle, ctx->compression))
-				goto error;
-		} else if (ctx->file_version >= FILE_VERSION_COMPRESSION) {
-			tracecmd_output_set_compression(network_handle, "any");
-		}
-
 		if (tracecmd_output_write_headers(network_handle, listed_events))
 			goto error;
 		tracecmd_set_quiet(network_handle, quiet);