#include <assert.h>
#include <common/error.h>
#include <lttng/action/action-internal.h>
+#include <lttng/action/group-internal.h>
#include <lttng/action/notify-internal.h>
#include <lttng/action/rotate-session-internal.h>
#include <lttng/action/snapshot-session-internal.h>
#include <lttng/action/start-session-internal.h>
#include <lttng/action/stop-session-internal.h>
-static const char *lttng_action_type_string(enum lttng_action_type action_type)
+LTTNG_HIDDEN
+const char *lttng_action_type_string(enum lttng_action_type action_type)
{
switch (action_type) {
case LTTNG_ACTION_TYPE_UNKNOWN:
return "UNKNOWN";
+ case LTTNG_ACTION_TYPE_GROUP:
+ return "GROUP";
case LTTNG_ACTION_TYPE_NOTIFY:
return "NOTIFY";
case LTTNG_ACTION_TYPE_ROTATE_SESSION:
}
}
-enum lttng_action_type lttng_action_get_type(struct lttng_action *action)
+enum lttng_action_type lttng_action_get_type(const struct lttng_action *action)
{
return action ? action->type : LTTNG_ACTION_TYPE_UNKNOWN;
}
-LTTNG_HIDDEN
-enum lttng_action_type lttng_action_get_type_const(
- const struct lttng_action *action)
-{
- return action->type;
-}
-
LTTNG_HIDDEN
void lttng_action_init(
struct lttng_action *action,
struct lttng_action **action)
{
ssize_t consumed_len, specific_action_consumed_len;
- const struct lttng_action_comm *action_comm;
action_create_from_payload_cb create_from_payload_cb;
+ const struct lttng_action_comm *action_comm;
+ const struct lttng_payload_view action_comm_view =
+ lttng_payload_view_from_view(
+ view, 0, sizeof(*action_comm));
if (!view || !action) {
consumed_len = -1;
goto end;
}
- action_comm = (const struct lttng_action_comm *) view->buffer.data;
+ if (!lttng_payload_view_is_valid(&action_comm_view)) {
+ /* Payload not large enough to contain the header. */
+ consumed_len = -1;
+ goto end;
+ }
+
+ action_comm = (const struct lttng_action_comm *) action_comm_view.buffer.data;
DBG("Create action from payload: action-type=%s",
lttng_action_type_string(action_comm->action_type));
create_from_payload_cb =
lttng_action_stop_session_create_from_payload;
break;
+ case LTTNG_ACTION_TYPE_GROUP:
+ create_from_payload_cb = lttng_action_group_create_from_payload;
+ break;
default:
ERR("Failed to create action from payload, unhandled action type: action-type=%u (%s)",
action_comm->action_type,