Port: Use LTTNG_HOST_NAME_MAX instead of HOST_NAME_MAX

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/lttng/constant.h b/include/lttng/constant.h
index edf4c3a8dd97d9b189aae0d4779418fe1f17dc09..d3bc8f4a594c2130fc32d87df17240daca0d9427 100644 (file)
--- a/include/lttng/constant.h
+++ b/include/lttng/constant.h
@@ -56,4 +56,6 @@
 
 #define LTTNG_NAME_MAX                         255
 
 
 #define LTTNG_NAME_MAX                         255
 

+#define LTTNG_HOST_NAME_MAX                    64
+

 #endif /* LTTNG_CONSTANT_H */
 #endif /* LTTNG_CONSTANT_H */

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 28e52696e568760c898cf7c49a8a79068f5a3add..53ffbddf0ac8c71cc1129e3b5e233bdb6564a95f 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1069,12 +1069,12 @@ static int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr,
        struct relay_session *session;
        struct lttcomm_relayd_status_session reply;
        char session_name[LTTNG_NAME_MAX];
        struct relay_session *session;
        struct lttcomm_relayd_status_session reply;
        char session_name[LTTNG_NAME_MAX];

-       char hostname[HOST_NAME_MAX];
+       char hostname[LTTNG_HOST_NAME_MAX];

        uint32_t live_timer = 0;
        bool snapshot = false;
 
        memset(session_name, 0, LTTNG_NAME_MAX);
        uint32_t live_timer = 0;
        bool snapshot = false;
 
        memset(session_name, 0, LTTNG_NAME_MAX);

-       memset(hostname, 0, HOST_NAME_MAX);
+       memset(hostname, 0, LTTNG_HOST_NAME_MAX);

 
        memset(&reply, 0, sizeof(reply));
 
 
        memset(&reply, 0, sizeof(reply));
 

diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index de1e44f0d7fd36410349a7c1f1ecbcac8bc3c76b..3ee1c45c3d24c93605605336fb7b5ac426e05afd 100644 (file)
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -40,7 +40,7 @@ struct relay_session {
         */
        uint64_t id;
        char session_name[LTTNG_NAME_MAX];
         */
        uint64_t id;
        char session_name[LTTNG_NAME_MAX];

-       char hostname[HOST_NAME_MAX];
+       char hostname[LTTNG_HOST_NAME_MAX];

        uint32_t live_timer;
 
        /* Session in snapshot mode. */
        uint32_t live_timer;
 
        /* Session in snapshot mode. */

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index 1152d28e907676aa6e06ed046ae62c5e5da977df..fa45de16a3794bd5b0a96cb0f5b9711882fb088c 100644 (file)
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -169,7 +169,7 @@ struct lttcomm_relayd_index {
  */
 struct lttcomm_relayd_create_session_2_4 {
        char session_name[LTTNG_NAME_MAX];
  */
 struct lttcomm_relayd_create_session_2_4 {
        char session_name[LTTNG_NAME_MAX];

-       char hostname[HOST_NAME_MAX];
+       char hostname[LTTNG_HOST_NAME_MAX];

        uint32_t live_timer;
        uint32_t snapshot;
 } LTTNG_PACKED;
        uint32_t live_timer;
        uint32_t snapshot;
 } LTTNG_PACKED;