int c, ret = 0, option_index = 0, retval = 0;
int orig_optopt = optopt, orig_optind = optind;
char *default_address, *optstring;
- const char *config_path = NULL;
+ char *config_path = NULL;
optstring = utils_generate_optstring(long_options,
sizeof(long_options) / sizeof(struct option));
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-f, --config");
} else {
+ free(config_path);
config_path = utils_expand_path(optarg);
if (!config_path) {
ERR("Failed to resolve path: %s", optarg);
}
exit:
+ free(config_path);
free(optstring);
return retval;
}
newsock = accept_relayd_sock(data_sock,
"Data socket to relayd");
} else {
- assert(pollfd == control_sock->fd);
+ LTTNG_ASSERT(pollfd == control_sock->fd);
type = RELAY_CONTROL;
newsock = accept_relayd_sock(control_sock,
"Control socket to relayd");
ret = -1;
goto send_reply;
}
- assert(!conn->session);
+ LTTNG_ASSERT(!conn->session);
conn->session = session;
DBG("Created session %" PRIu64, session->id);
} else if (conn->minor >= 4 && conn->minor < 11) {
char *group_by_session_path_name;
- assert(session->session_name[0] != '\0');
+ LTTNG_ASSERT(session->session_name[0] != '\0');
group_by_session_path_name =
backward_compat_group_by_session(
struct lttcomm_relayd_generic_reply reply;
struct relay_stream *stream;
- assert(recv_hdr);
- assert(conn);
+ LTTNG_ASSERT(recv_hdr);
+ LTTNG_ASSERT(conn);
DBG("Init streams for data pending");
struct relay_stream *stream;
size_t msg_len;
- assert(conn);
+ LTTNG_ASSERT(conn);
DBG("Relay receiving index");
ssize_t send_ret;
struct lttcomm_relayd_generic_reply reply;
- assert(conn);
+ LTTNG_ASSERT(conn);
DBG("Relay receiving streams_sent");
goto end;
}
- assert(conn->session->output_directory);
+ LTTNG_ASSERT(conn->session->output_directory);
chunk_status = lttng_trace_chunk_set_as_owner(chunk,
conn->session->output_directory);
if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
goto end;
}
- assert(ret > 0);
- assert(ret <= state->left_to_receive);
+ LTTNG_ASSERT(ret > 0);
+ LTTNG_ASSERT(ret <= state->left_to_receive);
state->left_to_receive -= ret;
state->received += ret;
struct ctrl_connection_state_receive_header *state =
&conn->protocol.ctrl.state.receive_header;
- assert(state->left_to_receive != 0);
+ LTTNG_ASSERT(state->left_to_receive != 0);
ret = conn->sock->ops->recvmsg(conn->sock,
reception_buffer->data + state->received,
goto end;
}
- assert(ret > 0);
- assert(ret <= state->left_to_receive);
+ LTTNG_ASSERT(ret > 0);
+ LTTNG_ASSERT(ret <= state->left_to_receive);
state->left_to_receive -= ret;
state->received += ret;
struct lttcomm_relayd_data_hdr header;
struct relay_stream *stream;
- assert(state->left_to_receive != 0);
+ LTTNG_ASSERT(state->left_to_receive != 0);
ret = conn->sock->ops->recvmsg(conn->sock,
state->header_reception_buffer + state->received,
goto end;
}
- assert(ret > 0);
- assert(ret <= state->left_to_receive);
+ LTTNG_ASSERT(ret > 0);
+ LTTNG_ASSERT(ret <= state->left_to_receive);
state->left_to_receive -= ret;
state->received += ret;
packet_chunk = lttng_buffer_view_init(data_buffer,
0, recv_size);
- assert(packet_chunk.data);
+ LTTNG_ASSERT(packet_chunk.data);
ret = stream_write(stream, &packet_chunk, 0);
if (ret) {
ctrl_conn = connection_get_by_sock(relay_connections_ht, pollfd);
/* If not found, there is a synchronization issue. */
- assert(ctrl_conn);
+ LTTNG_ASSERT(ctrl_conn);
if (ctrl_conn->type == RELAY_DATA) {
if (revents & LPOLLIN) {
}
goto put_ctrl_connection;
}
- assert(ctrl_conn->type == RELAY_CONTROL);
+ LTTNG_ASSERT(ctrl_conn->type == RELAY_CONTROL);
if (revents & LPOLLIN) {
enum relay_connection_status status;
if (data_conn->type == RELAY_CONTROL) {
goto put_data_connection;
}
- assert(data_conn->type == RELAY_DATA);
+ LTTNG_ASSERT(data_conn->type == RELAY_DATA);
if (revents & LPOLLIN) {
enum relay_connection_status status;