X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Furi.c;h=dd2d9e4eea4bd0379eac739d9589b7b55727a91b;hb=890d8fe47755c3bad936389cf48ffa141cff41c9;hp=4838372ee9eadd0f6730af6e5d059bd45b35d11f;hpb=28fcbaeb0c451fbc4e2c289de2ce1f29522239eb;p=lttng-tools.git diff --git a/src/common/uri.c b/src/common/uri.c index 4838372ee..dd2d9e4ee 100644 --- a/src/common/uri.c +++ b/src/common/uri.c @@ -15,7 +15,7 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -45,8 +45,10 @@ struct uri_proto { static const struct uri_proto proto_uri[] = { { .name = "file", .leading_string = "file://", .code = P_FILE, .type = 0, .dtype = LTTNG_DST_PATH }, { .name = "net", .leading_string = "net://", .code = P_NET, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 }, + { .name = "net4", .leading_string = "net4://", .code = P_NET, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 }, { .name = "net6", .leading_string = "net6://", .code = P_NET6, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV6 }, { .name = "tcp", .leading_string = "tcp://", .code = P_TCP, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 }, + { .name = "tcp4", .leading_string = "tcp4://", .code = P_TCP, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 }, { .name = "tcp6", .leading_string = "tcp6://", .code = P_TCP6, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV6 }, /* Invalid proto marking the end of the array. */ { NULL, NULL, 0, 0, 0 } @@ -199,7 +201,7 @@ int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size) } 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); }