From: David Goulet <dgoulet@efficios.com>
Date: Wed, 14 May 2014 13:28:15 +0000 (-0400)
Subject: Fix: add missing packed attribute to comm. struct.
X-Git-Tag: v2.5.0-rc1~44
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1179a48f3bc17e4c85e6583d7774e2d0671d8663;p=lttng-tools.git

Fix: add missing packed attribute to comm. struct.

Fixes #707

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index bbc7ce5a8..87bdfd293 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -233,7 +233,7 @@ struct lttcomm_session_msg {
 		/* Event data */
 		struct {
 			char channel_name[LTTNG_SYMBOL_NAME_LEN];
-			struct lttng_event event;
+			struct lttng_event event LTTNG_PACKED;
 			/* Length of following filter expression. */
 			uint32_t expression_len;
 			/* Length of following bytecode for filter. */
@@ -250,12 +250,12 @@ struct lttcomm_session_msg {
 		} LTTNG_PACKED enable;
 		/* Create channel */
 		struct {
-			struct lttng_channel chan;
+			struct lttng_channel chan LTTNG_PACKED;
 		} LTTNG_PACKED channel;
 		/* Context */
 		struct {
 			char channel_name[LTTNG_SYMBOL_NAME_LEN];
-			struct lttng_event_context ctx;
+			struct lttng_event_context ctx LTTNG_PACKED;
 		} LTTNG_PACKED context;
 		/* Use by register_consumer */
 		struct {
@@ -272,18 +272,18 @@ struct lttcomm_session_msg {
 			uint32_t size;
 		} LTTNG_PACKED uri;
 		struct {
-			struct lttng_snapshot_output output;
+			struct lttng_snapshot_output output LTTNG_PACKED;
 		} LTTNG_PACKED snapshot_output;
 		struct {
 			uint32_t wait;
-			struct lttng_snapshot_output output;
+			struct lttng_snapshot_output output LTTNG_PACKED;
 		} LTTNG_PACKED snapshot_record;
 		struct {
 			uint32_t nb_uri;
 			unsigned int timer_interval;	/* usec */
 		} LTTNG_PACKED session_live;
 		struct {
-			struct lttng_save_session_attr attr;
+			struct lttng_save_session_attr attr; /* struct already packed */
 		} LTTNG_PACKED save_session;
 	} u;
 } LTTNG_PACKED;