summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1a24165)
For a live session, the control and data URI are mandatory thus pass
NULL to the create session so we can set them afterwards by a set
consumer URL call.
net:// can't be used for control and data so this fixes the uri to url
string by printing "tcp://" instead of net:// which is more accurate and
the good way to actually print the URL to the user.
Fixes #767
Signed-off-by: David Goulet <dgoulet@efficios.com>
/* network destination */
if (live_timer_interval && live_timer_interval != UINT64_MAX) {
/* network destination */
if (live_timer_interval && live_timer_interval != UINT64_MAX) {
- const char *url = output.control_uri ?
- output.control_uri : output.data_uri;
-
- /* URL has to be provided, even if we'll overwrite it after. */
- ret = lttng_create_session_live(name, url, live_timer_interval);
+ /*
+ * URLs are provided for sure since the test above make sure that
+ * with a live timer the data and control URIs are provided. So,
+ * NULL is passed here and will be set right after.
+ */
+ ret = lttng_create_session_live(name, NULL, live_timer_interval);
} else {
ret = lttng_create_session(name, NULL);
}
} else {
ret = lttng_create_session(name, NULL);
}
} else {
ipver = (uri->dtype == LTTNG_DST_IPV4) ? 4 : 6;
addr = (ipver == 4) ? uri->dst.ipv4 : uri->dst.ipv6;
} else {
ipver = (uri->dtype == LTTNG_DST_IPV4) ? 4 : 6;
addr = (ipver == 4) ? uri->dst.ipv4 : uri->dst.ipv6;
- (void) snprintf(proto, sizeof(proto), "net%d", ipver);
+ (void) snprintf(proto, sizeof(proto), "tcp%d", ipver);
(void) snprintf(port, sizeof(port), ":%d", uri->port);
}
(void) snprintf(port, sizeof(port), ":%d", uri->port);
}