Fix: common: poll: compat_poll_wait never finishes

[lttng-tools.git] / src / common / uri.h

diff --git a/src/common/uri.h b/src/common/uri.h
index 3ef6669e6097d6ead83f4fa95d2fb6dbed5fcbbf..ac1de9e0cbc2450f2592f54c46beb499321734c3 100644 (file)
--- a/src/common/uri.h
+++ b/src/common/uri.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  *
- * 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
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef URI_H
@@ -20,6 +10,7 @@
 
 #include <netinet/in.h>
 #include <lttng/lttng.h>
+#include <common/macros.h>
 
 /* Destination type of lttng URI */
 enum lttng_dst_type {
@@ -65,14 +56,14 @@ 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);