Fix: don't start session if no channel

[lttng-tools.git] / src / bin / lttng-sessiond / session.c

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 5f5c2a6ee08fe202cff46a1adf461ec3c6118d5f..07031a30a5c5bc6cf603b84847aac2a866919ede 100644 (file)
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -17,6 +17,7 @@
 
 #define _GNU_SOURCE
 #include <limits.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,7 +55,7 @@ static struct ltt_session_list ltt_session_list = {
  * The caller MUST acquire the session list lock before.
  * Returns the unique identifier for the session.
  */
-static unsigned int add_session_list(struct ltt_session *ls)
+static uint64_t add_session_list(struct ltt_session *ls)
 {
        assert(ls);
 
@@ -193,6 +194,16 @@ int session_create(char *name, uid_t uid, gid_t gid)
                goto error;
        }
 
+       ret = gethostname(new_session->hostname, sizeof(new_session->hostname));
+       if (ret < 0) {
+               if (errno == ENAMETOOLONG) {
+                       new_session->hostname[sizeof(new_session->hostname) - 1] = '\0';
+               } else {
+                       ret = LTTNG_ERR_FATAL;
+                       goto error;
+               }
+       }
+
        /* Init kernel session */
        new_session->kernel_session = NULL;
        new_session->ust_session = NULL;
@@ -219,8 +230,8 @@ int session_create(char *name, uid_t uid, gid_t gid)
         * up and, if valid, assign it to the session.
         */
 
-       DBG("Tracing session %s created with ID %u by UID %d GID %d", name,
-                       new_session->id, new_session->uid, new_session->gid);
+       DBG("Tracing session %s created with ID %" PRIu64 " by UID %d GID %d",
+                       name, new_session->id, new_session->uid, new_session->gid);
 
        return LTTNG_OK;