X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-4.c;h=a3290cb259cc28fd31cb2087391800b571200876;hp=d8aa73704f39deee40afbeee09b6f0efeb7f32fb;hb=7591bab11eceedc6a0d1e02fd6f85592267a63b5;hpb=d77dded285b058e4242c8a3d2233f80e725ceefc diff --git a/src/bin/lttng-relayd/cmd-2-4.c b/src/bin/lttng-relayd/cmd-2-4.c index d8aa73704..a3290cb25 100644 --- a/src/bin/lttng-relayd/cmd-2-4.c +++ b/src/bin/lttng-relayd/cmd-2-4.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2013 - Julien Desfossez * David Goulet + * 2015 - Mathieu Desnoyers * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License, version 2 only, as @@ -30,26 +31,24 @@ #include "lttng-relayd.h" int cmd_create_session_2_4(struct relay_connection *conn, - struct relay_session *session) + char *session_name, char *hostname, + uint32_t *live_timer, bool *snapshot) { int ret; struct lttcomm_relayd_create_session_2_4 session_info; - assert(conn); - assert(session); - ret = cmd_recv(conn->sock, &session_info, sizeof(session_info)); if (ret < 0) { ERR("Unable to recv session info version 2.4"); goto error; } - strncpy(session->session_name, session_info.session_name, - sizeof(session->session_name)); - strncpy(session->hostname, session_info.hostname, - sizeof(session->hostname)); - session->live_timer = be32toh(session_info.live_timer); - session->snapshot = be32toh(session_info.snapshot); + strncpy(session_name, session_info.session_name, + sizeof(session_info.session_name)); + strncpy(hostname, session_info.hostname, + sizeof(session_info.hostname)); + *live_timer = be32toh(session_info.live_timer); + *snapshot = be32toh(session_info.snapshot); ret = 0;