#include <string.h>
#include <unistd.h>
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
#include "liblttsessiondcomm.h"
#include "lttngerr.h"
/* Prototypes */
static int check_tracing_group(const char *grp_name);
-static int ask_sessiond(enum lttcomm_command_type lct, void **buf);
+static int ask_sessiond(enum lttcomm_sessiond_command lct, void **buf);
static int recv_data_sessiond(void *buf, size_t len);
static int send_data_sessiond(void);
static int set_session_daemon_path(void);
*
* Return size of data (only payload, not header).
*/
-static int ask_sessiond(enum lttcomm_command_type lct, void **buf)
+static int ask_sessiond(enum lttcomm_sessiond_command lct, void **buf)
{
int ret;
size_t size;
void *data = NULL;
+ ret = lttng_connect_sessiond();
+ if (ret < 0) {
+ goto end;
+ }
+
lsm.cmd_type = lct;
/* Send command to session daemon */
goto end;
}
- size = llm.size_payload;
+ size = llm.trace_name_offset + llm.data_size;
if (size == 0) {
goto end;
}
ret = size;
end:
- /* Reset lsm data struct */
+ lttng_disconnect_sessiond();
memset(&lsm, 0, sizeof(lsm));
return ret;
}
{
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, llm.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) {
*
* Set the session uuid for current lsm.
*/
-void lttng_set_current_session_uuid(char *uuid)
+void lttng_set_current_session_uuid(uuid_t *uuid)
{
- uuid_parse(uuid, lsm.session_id);
+ 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;