aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mds-clipboard.c206
-rw-r--r--src/mds-clipboard.h12
-rw-r--r--src/mds-echo.c7
-rw-r--r--src/mds-registry/mds-registry.c9
4 files changed, 213 insertions, 21 deletions
diff --git a/src/mds-clipboard.c b/src/mds-clipboard.c
index 1ea4ee9..9d7926a 100644
--- a/src/mds-clipboard.c
+++ b/src/mds-clipboard.c
@@ -26,6 +26,7 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <time.h>
#define reconnect_to_display() -1 /* TODO */
@@ -51,6 +52,61 @@ server_characteristics_t server_characteristics =
/**
+ * Delete entry only when needed
+ */
+#define CLIPITEM_AUTOPURGE_NEVER 0
+
+/**
+ * Delete entry when the client closes, or needed
+ */
+#define CLIPITEM_AUTOPURGE_UPON_DEATH 1
+
+/**
+ * Delete entry when a point in time has elapsed, or needed
+ */
+#define CLIPITEM_AUTOPURGE_UPON_CLOCK 2
+
+
+/**
+ * A clipboard entry
+ */
+typedef struct clipitem
+{
+ /**
+ * The stored content
+ */
+ char* content;
+
+ /**
+ * The length of the stored content
+ */
+ size_t length;
+
+ /**
+ * Time of planned death if `autopurge` is `CLIPITEM_AUTOPURGE_UPON_CLOCK`
+ */
+ struct timespec dethklok;
+
+ /**
+ * The client that issued the inclusion of this entry
+ */
+ uint64_t client;
+
+ /**
+ * Rule for automatic deletion
+ */
+ int autopurge;
+
+} clipitem_t;
+
+
+/**
+ * The number of levels in the clipboard
+ */
+#define CLIPBOARD_LEVELS 3
+
+
+/**
* Value of the ‘Message ID’ header for the next message
*/
static int32_t message_id = 1;
@@ -65,6 +121,21 @@ static mds_message_t received;
*/
static int connected = 1;
+/**
+ * The size of each clipstack
+ */
+static size_t clipboard_size[CLIPBOARD_LEVELS] = { 10, 1, 1 };
+
+/**
+ * The number of used elements in each clipstack
+ */
+static size_t clipboard_used[CLIPBOARD_LEVELS] = { 0, 0, 0 };
+
+/**
+ * The entries in each clipstack
+ */
+static clipitem_t* clipboard[CLIPBOARD_LEVELS];
+
/**
@@ -87,6 +158,7 @@ int __attribute__((const)) preinitialise_server(void)
*/
int initialise_server(void)
{
+ ssize_t i = 0;
const char* const message =
"Command: intercept\n"
"Message ID: 0\n"
@@ -96,9 +168,35 @@ int initialise_server(void)
if (full_send(message, strlen(message)))
return 1;
+
+ if (is_respawn)
+ {
+ const char* const crash_message =
+ "Command: clipboard-info\n"
+ "Event: crash\n"
+ "Message ID: 1\n"
+ "\n";
+
+ if (full_send(crash_message, strlen(crash_message)))
+ return 1;
+
+ message_id++;
+ }
+
server_initialised();
- mds_message_initialise(&received);
+ fail_if (mds_message_initialise(&received));
+
+ for (i = 0; i < CLIPBOARD_LEVELS; i++)
+ fail_if (xcalloc(clipboard[i], clipboard_size[i], clipitem_t));
+
return 0;
+
+ pfail:
+ xperror(*argv);
+ mds_message_destroy(&received);
+ while (--i >= 0)
+ free(clipboard[i]);
+ return 1;
}
@@ -133,7 +231,28 @@ int postinitialise_server(void)
*/
size_t marshal_server_size(void)
{
- return 2 * sizeof(int) + sizeof(int32_t) + mds_message_marshal_size(&received);
+ size_t i, j, rc = 2 * sizeof(int) + sizeof(int32_t) + mds_message_marshal_size(&received);
+ rc += 2 * CLIPBOARD_LEVELS * sizeof(size_t);
+ for (i = 0; i < CLIPBOARD_LEVELS; i++)
+ for (j = 0; j < clipboard_used[i]; j++)
+ {
+ clipitem_t clip = clipboard[i][j];
+ rc += sizeof(size_t) + sizeof(time_t) + sizeof(long) + sizeof(uint64_t) + sizeof(int);
+ rc += clip.length * sizeof(char);
+ }
+ return rc;
+}
+
+
+/**
+ * Wipe a memory area and free it
+ *
+ * @param s The memory area
+ * @param n The number of bytes to write
+ */
+static inline __attribute__((optimize("-O0"))) void wipe_and_free(void* s, size_t n)
+{
+ free(memset(s, 0, n));
}
@@ -145,11 +264,50 @@ size_t marshal_server_size(void)
*/
int marshal_server(char* state_buf)
{
+ size_t i, j;
+
buf_set_next(state_buf, int, MDS_CLIPBOARD_VARS_VERSION);
buf_set_next(state_buf, int, connected);
buf_set_next(state_buf, int32_t, message_id);
mds_message_marshal(&received, state_buf);
+ /* Removed entires from the clipboard that may not be marshalled. */
+ for (i = 0; i < CLIPBOARD_LEVELS; i++)
+ for (j = 0; j < clipboard_used[i]; j++)
+ {
+ clipitem_t clip = clipboard[i][j];
+
+ if (clip.autopurge == CLIPITEM_AUTOPURGE_NEVER)
+ continue;
+
+ wipe_and_free(clip.content, clip.length * sizeof(char));
+
+ memmove(clipboard[i] + j, clipboard[i] + j + 1, (clipboard_used[i] - j - 1) * sizeof(clipitem_t));
+ clipboard_used[i]--;
+ j--;
+ }
+
+ /* Marshal clipboard. */
+ for (i = 0; i < CLIPBOARD_LEVELS; i++)
+ {
+ buf_set_next(state_buf, size_t, clipboard_size[i]);
+ buf_set_next(state_buf, size_t, clipboard_used[i]);
+ for (j = 0; j < clipboard_used[i]; j++)
+ {
+ clipitem_t clip = clipboard[i][j];
+ buf_set_next(state_buf, size_t, clip.length);
+ buf_set_next(state_buf, time_t, clip.dethklok.tv_sec);
+ buf_set_next(state_buf, long, clip.dethklok.tv_nsec);
+ buf_set_next(state_buf, uint64_t, clip.client);
+ buf_set_next(state_buf, int, clip.autopurge);
+ memcpy(state_buf, clip.content, clip.length * sizeof(char));
+ state_buf += clip.length;
+
+ free(clip.content);
+ }
+ free(clipboard[i]);
+ }
+
mds_message_destroy(&received);
return 0;
}
@@ -167,18 +325,50 @@ int marshal_server(char* state_buf)
*/
int unmarshal_server(char* state_buf)
{
- int r;
+ size_t i, j;
+
+ for (i = 0; i < CLIPBOARD_LEVELS; i++)
+ clipboard[i] = NULL;
+
/* buf_get_next(state_buf, int, MDS_CLIPBOARD_VARS_VERSION); */
buf_next(state_buf, int, 1);
buf_get_next(state_buf, int, connected);
buf_get_next(state_buf, int32_t, message_id);
- r = mds_message_unmarshal(&received, state_buf);
- if (r)
+ fail_if (mds_message_unmarshal(&received, state_buf));
+
+ for (i = 0; i < CLIPBOARD_LEVELS; i++)
{
- xperror(*argv);
- mds_message_destroy(&received);
+ buf_get_next(state_buf, size_t, clipboard_size[i]);
+ buf_get_next(state_buf, size_t, clipboard_used[i]);
+ fail_if (xcalloc(clipboard[i], clipboard_size[i], clipitem_t));
+
+ for (j = 0; j < clipboard_used[i]; j++)
+ {
+ clipitem_t* clip = clipboard[i] + j;
+ buf_get_next(state_buf, size_t, clip->length);
+ buf_get_next(state_buf, time_t, clip->dethklok.tv_sec);
+ buf_get_next(state_buf, long, clip->dethklok.tv_nsec);
+ buf_get_next(state_buf, uint64_t, clip->client);
+ buf_get_next(state_buf, int, clip->autopurge);
+ fail_if (xmalloc(clip->content, clip->length, char));
+ memcpy(clip->content, state_buf, clip->length * sizeof(char));
+ state_buf += clip->length;
+ }
}
- return r;
+
+ return 0;
+ pfail:
+ xperror(*argv);
+ mds_message_destroy(&received);
+ for (i = 0; i < CLIPBOARD_LEVELS; i++)
+ if (clipboard[i] != NULL)
+ {
+ for (j = 0; j < clipboard_used[i]; j++)
+ free(clipboard[i][j].content);
+ free(clipboard[i]);
+ }
+ abort();
+ return -1;
}
diff --git a/src/mds-clipboard.h b/src/mds-clipboard.h
index 34a12e9..5fd2b93 100644
--- a/src/mds-clipboard.h
+++ b/src/mds-clipboard.h
@@ -15,22 +15,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MDS_MDS_ECHO_H
-#define MDS_MDS_ECHO_H
+#ifndef MDS_MDS_CLIPBOARD_H
+#define MDS_MDS_CLIPBOARD_H
#include "mds-base.h"
/**
- * Echo the received message payload
- *
- * @return Zero on success -1 on error or interruption,
- * errno will be set accordingly
- */
-int echo_message(void);
-
-/**
* Send a full message even if interrupted
*
* @param message The message to send
diff --git a/src/mds-echo.c b/src/mds-echo.c
index 25f1fa5..309c28d 100644
--- a/src/mds-echo.c
+++ b/src/mds-echo.c
@@ -107,8 +107,13 @@ int initialise_server(void)
if (full_send(message, strlen(message)))
return 1;
server_initialised();
- mds_message_initialise(&received);
+ fail_if (mds_message_initialise(&received));
+
return 0;
+ pfail:
+ xperror(*argv);
+ mds_message_destroy(&received);
+ return 1;
}
diff --git a/src/mds-registry/mds-registry.c b/src/mds-registry/mds-registry.c
index 58463af..957310e 100644
--- a/src/mds-registry/mds-registry.c
+++ b/src/mds-registry/mds-registry.c
@@ -112,8 +112,13 @@ int initialise_server(void)
reg_table.key_comparator = (compare_func*)string_comparator;
reg_table.hasher = (hash_func*)string_hash;
server_initialised();
- mds_message_initialise(&received);
- return 0;
+ fail_if (mds_message_initialise(&received));
+
+ return 0;
+ pfail:
+ xperror(*argv);
+ mds_message_destroy(&received);
+ return 1;
}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-02 16:36:02 +0000