aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-04-01 16:40:51 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-04-01 16:40:51 +0000
commit4d52a870b493c17172766db3d0a76cd8f0c3204c (patch)
treee0109cf0143deee112f3c8cf5c6a27c649b508f1 /server.c
parentdoc: foot.5: minor updates to 'tweaks' (diff)
conf: add app-id config option and --app-id command line option
Diffstat (limited to 'server.c')
-rw-r--r--server.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/server.c b/server.c
index 42116f27..37c17477 100644
--- a/server.c
+++ b/server.c
@@ -74,6 +74,7 @@ client_destroy(struct client *client)
/* TODO: clone server conf completely, so that we can just call
* conf_destroy() here */
free(client->conf.term);
+ free(client->conf.app_id);
free(client);
}
@@ -224,6 +225,19 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
goto shutdown;
}
+ CHECK_BUF(sizeof(uint16_t));
+ uint16_t app_id_len = *(uint16_t *)p; p += sizeof(app_id_len);
+
+ CHECK_BUF(app_id_len);
+ const char *app_id = (const char *)p; p += app_id_len;
+ LOG_DBG("app-id = %.*s", app_id_len, app_id);
+
+ if (app_id_len != strlen(app_id) + 1) {
+ LOG_ERR("app-id length mismatch: indicated = %hu, actual = %zu",
+ app_id_len - 1, strlen(app_id));
+ goto shutdown;
+ }
+
CHECK_BUF(sizeof(uint8_t));
const uint8_t maximized = *(const uint8_t *)p; p += sizeof(maximized);
@@ -259,6 +273,8 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
client->conf = *server->conf;
client->conf.term = strlen(term_env) > 0
? strdup(term_env) : strdup(server->conf->term);
+ client->conf.app_id = strlen(app_id) > 0
+ ? strdup(app_id) : strdup(server->conf->app_id);
client->conf.login_shell = login_shell;
if (maximized)