X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=cb3b17cdd59c2e19bb254d983711d58e38fbb7ec;hp=fa5cb901e12505c2d71d6156fdd81f5701dec2e9;hb=41ed8e47358244890326cb14dfae889ed0adb1ba;hpb=a1ac8b97b00ab102166ceb2c978a18d261ebcc03

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index fa5cb901e..cb3b17cdd 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2157,6 +2157,10 @@ static void *thread_registration_apps(void *data)
 					ust_cmd = zmalloc(sizeof(struct ust_command));
 					if (ust_cmd == NULL) {
 						PERROR("ust command zmalloc");
+						ret = close(sock);
+						if (ret) {
+							PERROR("close");
+						}
 						goto error;
 					}
 
@@ -3267,8 +3271,34 @@ skip_domain:
 	}
 	case LTTNG_DISABLE_EVENT:
 	{
+
+		/*
+		 * FIXME: handle filter; for now we just receive the filter's
+		 * bytecode along with the filter expression which are sent by
+		 * liblttng-ctl and discard them.
+		 *
+		 * This fixes an issue where the client may block while sending
+		 * the filter payload and encounter an error because the session
+		 * daemon closes the socket without ever handling this data.
+		 */
+		size_t count = cmd_ctx->lsm->u.disable.expression_len +
+			cmd_ctx->lsm->u.disable.bytecode_len;
+
+		if (count) {
+			char data[LTTNG_FILTER_MAX_LEN];
+
+			DBG("Discarding disable event command payload of size %zu", count);
+			while (count) {
+				ret = lttcomm_recv_unix_sock(sock, data,
+				        count > sizeof(data) ? sizeof(data) : count);
+				if (ret < 0) {
+					goto error;
+				}
+
+				count -= (size_t) ret;
+			}
+		}
 		/* FIXME: passing packed structure to non-packed pointer */
-		/* TODO: handle filter */
 		ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.disable.channel_name,
 				&cmd_ctx->lsm->u.disable.event);
@@ -3766,7 +3796,35 @@ skip_domain:
 	}
 	case LTTNG_DATA_PENDING:
 	{
-		ret = cmd_data_pending(cmd_ctx->session);
+		int pending_ret;
+
+		/* 1 byte to return whether or not data is pending */
+		ret = setup_lttng_msg(cmd_ctx, 1);
+		if (ret < 0) {
+			goto setup_error;
+		}
+
+		pending_ret = cmd_data_pending(cmd_ctx->session);
+		/*
+		 * FIXME
+		 *
+		 * This function may returns 0 or 1 to indicate whether or not
+		 * there is data pending. In case of error, it should return an
+		 * LTTNG_ERR code. However, some code paths may still return
+		 * a nondescript error code, which we handle by returning an
+		 * "unknown" error.
+		 */
+		if (pending_ret == 0 || pending_ret == 1) {
+			ret = LTTNG_OK;
+		} else if (pending_ret < 0) {
+			ret = LTTNG_ERR_UNK;
+			goto setup_error;
+		} else {
+			ret = pending_ret;
+			goto setup_error;
+		}
+
+		*cmd_ctx->llm->payload = (uint8_t) pending_ret;
 		break;
 	}
 	case LTTNG_SNAPSHOT_ADD_OUTPUT: