Fix: allow empty URL for live session creation

[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl.c

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 94f075b460f2b9ed541e0610691cb18bfb1a67d0..100e587d9e206905b1327bfd790f5b8f1888a8ac 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -834,40 +834,43 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 
                lsm.u.enable.bytecode_len = sizeof(ctx->bytecode->b)
                                + bytecode_get_len(&ctx->bytecode->b);
-       }
-
-       /* Allocate variable length data */
-       if (lsm.u.enable.exclusion_count != 0) {
-               varlen_data = zmalloc(lsm.u.enable.bytecode_len
-                               + LTTNG_SYMBOL_NAME_LEN * exclusion_count);
-               if (!varlen_data) {
-                       ret = -LTTNG_ERR_EXCLUSION_NOMEM;
-                       goto varlen_alloc_error;
-               }
-               /* Put exclusion names first in the data */
-               while (exclusion_count--) {
-                       strncpy(varlen_data + LTTNG_SYMBOL_NAME_LEN * exclusion_count,
-                                       *(exclusion_list + exclusion_count),
-                                       LTTNG_SYMBOL_NAME_LEN);
-               }
-               /* Add filter bytecode next */
-               if (lsm.u.enable.bytecode_len != 0) {
-                       memcpy(varlen_data + LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count,
-                                       &ctx->bytecode->b,
-                                       lsm.u.enable.bytecode_len);
-               }
-       } else {
-               /* no exclusions - use the already allocated filter bytecode */
-               varlen_data = (char *)(&ctx->bytecode->b);
+               lsm.u.enable.expression_len = strlen(filter_expression) + 1;
+       }
+
+       varlen_data = zmalloc(lsm.u.enable.bytecode_len
+                             + lsm.u.enable.expression_len
+                             + LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+       if (!varlen_data) {
+               ret = -LTTNG_ERR_EXCLUSION_NOMEM;
+               goto varlen_alloc_error;
+       }
+       /* Put exclusion names first in the data */
+       while (exclusion_count--) {
+               strncpy(varlen_data + LTTNG_SYMBOL_NAME_LEN * exclusion_count,
+                       *(exclusion_list + exclusion_count),
+                       LTTNG_SYMBOL_NAME_LEN);
+       }
+       /* Add filter expression next */
+       if (lsm.u.enable.expression_len != 0) {
+               memcpy(varlen_data
+                       + LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count,
+                       filter_expression,
+                       lsm.u.enable.expression_len);
+       }
+       /* Add filter bytecode next */
+       if (lsm.u.enable.bytecode_len != 0) {
+               memcpy(varlen_data
+                       + LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count
+                       + lsm.u.enable.expression_len,
+                       &ctx->bytecode->b,
+                       lsm.u.enable.bytecode_len);
        }
 
        ret = lttng_ctl_ask_sessiond_varlen(&lsm, varlen_data,
                        (LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count) +
-                       lsm.u.enable.bytecode_len, NULL);
-
-       if (lsm.u.enable.exclusion_count != 0) {
-               free(varlen_data);
-       }
+                       lsm.u.enable.bytecode_len + lsm.u.enable.expression_len,
+                       NULL);
+       free(varlen_data);
 
 varlen_alloc_error:
        if (filter_expression) {
@@ -1569,16 +1572,20 @@ int lttng_create_session_live(const char *name, const char *url,
        lsm.cmd_type = LTTNG_CREATE_SESSION_LIVE;
        lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
 
-       size = uri_parse_str_urls(url, NULL, &uris);
-       if (size <= 0) {
-               ret = -LTTNG_ERR_INVALID;
-               goto end;
-       }
+       if (url) {
+               size = uri_parse_str_urls(url, NULL, &uris);
+               if (size <= 0) {
+                       ret = -LTTNG_ERR_INVALID;
+                       goto end;
+               }
 
-       /* file:// is not accepted for live session. */
-       if (uris[0].dtype == LTTNG_DST_PATH) {
-               ret = -LTTNG_ERR_INVALID;
-               goto end;
+               /* file:// is not accepted for live session. */
+               if (uris[0].dtype == LTTNG_DST_PATH) {
+                       ret = -LTTNG_ERR_INVALID;
+                       goto end;
+               }
+       } else {
+               size = 0;
        }
 
        lsm.u.session_live.nb_uri = size;