/* Communication structure to ltt-sessiond */
static struct lttcomm_session_msg lsm;
-static struct lttcomm_lttng_header llh;
+static struct lttcomm_lttng_msg llm;
/* Prototypes */
static int check_tracing_group(const char *grp_name);
}
/* Get header from data transmission */
- ret = recv_data_sessiond(&llh, sizeof(llh));
+ ret = recv_data_sessiond(&llm, sizeof(llm));
if (ret < 0) {
goto end;
}
/* Check error code if OK */
- if (llh.ret_code != LTTCOMM_OK) {
- ret = -llh.ret_code;
+ if (llm.ret_code != LTTCOMM_OK) {
+ ret = -llm.ret_code;
goto end;
}
- size = llh.payload_size;
+ size = llm.trace_name_offset + llm.data_size;
if (size == 0) {
goto end;
}
{
int ret;
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_uuid, *uuid);
ret = ask_sessiond(LTTNG_LIST_TRACES, (void **) traces);
if (ret < 0) {
goto end;
}
- uuid_copy(*session_id, llh.session_id);
+ uuid_copy(*session_id, llm.session_uuid);
end:
return ret;
{
int ret;
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_uuid, *uuid);
ret = ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
if (ret < 0) {
*/
void lttng_set_current_session_uuid(uuid_t *uuid)
{
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_uuid, *uuid);
}
/*
/* Are we in the tracing group ? */
ret = check_tracing_group(tracing_group);
- if (ret < 0) {
+ if (ret < 0 && getuid() != 0) {
if (sprintf(sessiond_sock_path, DEFAULT_HOME_CLIENT_UNIX_SOCK,
getenv("HOME")) < 0) {
return -ENOMEM;