diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-02-29 07:06:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-29 07:06:12 -0600 |
| commit | a2e1c850c4ea40056b80b11f2e3d06b49b2a6f71 (patch) | |
| tree | 671d43b706b003b3bbcafa1e042a7a30ff78aef2 /src/shim | |
| parent | 5609a0a8f71ac064dc4b6643e6d55573f5b14623 (diff) | |
| parent | 70e1df1b5fcb3b1791cca320ed45b71e01e1ffda (diff) | |
| download | vyos-1x-a2e1c850c4ea40056b80b11f2e3d06b49b2a6f71.tar.gz vyos-1x-a2e1c850c4ea40056b80b11f2e3d06b49b2a6f71.zip | |
Merge pull request #2659 from jestabro/remove-trivial-redundancies
configdep: T5839: remove trivially redundant config dependency calls
Diffstat (limited to 'src/shim')
| -rw-r--r-- | src/shim/vyshim.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/shim/vyshim.c b/src/shim/vyshim.c index cae8b6152..41723e7a4 100644 --- a/src/shim/vyshim.c +++ b/src/shim/vyshim.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 VyOS maintainers and contributors + * Copyright (C) 2020-2024 VyOS maintainers and contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 or later as @@ -49,6 +49,7 @@ #define GET_SESSION "cli-shell-api --show-working-only --show-show-defaults --show-ignore-edit showConfig" #define COMMIT_MARKER "/var/tmp/initial_in_commit" +#define QUEUE_MARKER "/var/tmp/last_in_queue" enum { SUCCESS = 1 << 0, @@ -77,6 +78,7 @@ int main(int argc, char* argv[]) int ex_index; int init_timeout = 0; + int last = 0; debug_print("Connecting to vyos-configd ...\n"); zmq_connect(requester, SOCKET_PATH); @@ -101,10 +103,16 @@ int main(int argc, char* argv[]) return ret; } + if (access(QUEUE_MARKER, F_OK) != -1) { + last = 1; + remove(QUEUE_MARKER); + } + char error_code[1]; debug_print("Sending node data ...\n"); - char *string_node_data_msg = mkjson(MKJSON_OBJ, 2, + char *string_node_data_msg = mkjson(MKJSON_OBJ, 3, MKJSON_STRING, "type", "node", + MKJSON_BOOL, "last", last, MKJSON_STRING, "data", &string_node_data[0]); zmq_send(requester, string_node_data_msg, strlen(string_node_data_msg), 0); |