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-htbtclient.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/proone-htbtclient.c') diff --git a/src/proone-htbtclient.c b/src/proone-htbtclient.c index cc3c05d..dae4734 100644 --- a/src/proone-htbtclient.c +++ b/src/proone-htbtclient.c @@ -2059,17 +2059,14 @@ static bool run_relay (const uint16_t msgid) { static bool run_recv_status (const uint16_t msgid) { prne_htbt_msg_head_t mh; - prne_htbt_status_t st; prne_htbt_init_msg_head(&mh); - prne_htbt_init_status(&st); prog_g.cmd_st.run.has_status = recv_mh(&mh, &msgid) && - recv_status(&st); + recv_status(&prog_g.cmd_st.run.st); prne_htbt_free_msg_head(&mh); - prne_htbt_free_status(&st); return prog_g.cmd_st.run.has_status; } @@ -2370,7 +2367,10 @@ static int cmdmain_upbin (void) { return 1; } } - if (!(run_setup(msgid) && run_recv_status(msgid))) { + if (!run_setup(msgid)) { + return 1; + } + if (!prog_g.cmd_st.run.has_status && !run_recv_status(msgid)) { return 1; } -- cgit