X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Furi.h;h=17b0419181d68dc6c2747555503bdb869f097b56;hp=d768e8724670d80759c8002a60b2c4acb81efde8;hb=14c4262b940630bbb75f68b8c2eaef2b134a62d9;hpb=a4b92340642035d1eafeb1eead0ad01f64d2007d

diff --git a/src/common/uri.h b/src/common/uri.h
index d768e8724..17b041918 100644
--- a/src/common/uri.h
+++ b/src/common/uri.h
@@ -20,6 +20,7 @@
 
 #include <netinet/in.h>
 #include <lttng/lttng.h>
+#include <common/macros.h>
 
 /* Destination type of lttng URI */
 enum lttng_dst_type {
@@ -65,17 +66,20 @@ struct lttng_uri {
 	enum lttng_uri_type utype;
 	enum lttng_stream_type stype;
 	enum lttng_proto_type proto;
-	in_port_t port;
-	char subdir[PATH_MAX];
+	uint16_t port;
+	char subdir[LTTNG_PATH_MAX];
 	union {
 		char ipv4[INET_ADDRSTRLEN];
 		char ipv6[INET6_ADDRSTRLEN];
-		char path[PATH_MAX];
+		char path[LTTNG_PATH_MAX];
 	} dst;
-};
+} LTTNG_PACKED;
 
 int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2);
 void uri_free(struct lttng_uri *uri);
 ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris);
+ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
+		struct lttng_uri **uris);
+int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size);
 
 #endif /* _LTT_URI_H */