From patchwork Tue Nov 30 12:21:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 1561625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=isZKArhv; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=GFTNdL/T; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::740; helo=mail-qk1-x740.google.com; envelope-from=swupdate+bncbcz3hh5gu4jbbofotcgqmgqe3h7f2pi@googlegroups.com; receiver=) Received: from mail-qk1-x740.google.com (mail-qk1-x740.google.com [IPv6:2607:f8b0:4864:20::740]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J3Lt71lTGz9t2p for ; Tue, 30 Nov 2021 23:21:17 +1100 (AEDT) Received: by mail-qk1-x740.google.com with SMTP id x5-20020a05620a0b4500b004679442640asf28310993qkg.20 for ; Tue, 30 Nov 2021 04:21:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1638274872; cv=pass; d=google.com; s=arc-20160816; b=uCluecYM2MO3UbL5zKr22guybZr1K/80qqIOXqGZcDbyQHQNytdepJohl/VX+lyjNS sXNUKX0Avr2SlerWbzrYT21XFpmAzC8ArvHPSkIqdu0iFp/KSzJnPN3bKr95KLCjWxLj KTN2vOcMgPbzRu3S6rOh30I21lnqTfmK0F9hFhw3vhIjb1E5QuNRRexdLTdOyY/v9/97 s851Ew2VlWx781gQv5MVwv5oaF87JxL+8MZotDLe49n67LJVne79BG53dVnB5JpLbrgg ue7DZjUWMyfOIWPQcpthE8lQXJ2BJLzqTJM/dQNydiY1AVnsrWQbcF64knZM/p3JOST8 v6BA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature:dkim-signature; bh=H335LAvGBrbyFvSpU2iQhHdAyXc0BLaEiKwqHQ5ppE8=; b=CRnA7kOd0fUjDHsIdNZ0brjaptsE5aGl/ppsPXk56W0dfz5VWmK3U62Q2iQVxSFTLl x+jov4AZi2WBBRztXujrOwk67LOV3GJBFCvJnRJlmrrHSqlRKSTBDnL0xrhB88/6Smib zSZgoJtRTRfW+02q5ydQ3W1UZvuddC7kbt7JoFVL2ocSbpKjz4Bilrk0tR/G0WSqA1sl 9emEuubr726Lok7XTWsGdSNatFqbHsGYgf31Ocs8CshpLo10RnwZnIjBoEMJGGmbYZrp bwSVdFzR7W4rbK693iPy6h5WvGOWbD85Xt3gCVVzQMYVSPu6kcPIFhzjh5tyxhRZVKiB EVFQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aizW46Oh; spf=pass (google.com: domain of jpewhacker@gmail.com designates 2607:f8b0:4864:20::32a as permitted sender) smtp.mailfrom=jpewhacker@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=H335LAvGBrbyFvSpU2iQhHdAyXc0BLaEiKwqHQ5ppE8=; b=isZKArhvbqlSEpyxrjmTK+XLTQ+8E3sf2Hvn8+zb3X1DZQ2UeOHNNIvhPWeJfshdoW Gct/QMBp4xuzd2+a2kboTEaXRSH5hnvUCQ9H+CFxdRbow9YLarN4dogkyBiZUeMO7+6L wDWbXRV5hqFlBo52161WjEZqiTZGyn8G/Vf9BHcN1ApLtRLIqV9qIi1b25IkbOf9GNqQ dImg3+BuhNaPIddMmb2UPNSlc33YWmGwFttm55M8v2sbOyhKDE7cfraVKq373MItquWy 8jOwc2FBeIoU4sNpf7V9MHXPPE5oblBNRPsAN9nSLYkkAgPJAk6EHFgqQHBGQA2Y6elL ABrQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=H335LAvGBrbyFvSpU2iQhHdAyXc0BLaEiKwqHQ5ppE8=; b=GFTNdL/Ts1GMMfDFvITDKFl802HQGhLe3g0FJB1fxyxH2nrQoLZkjXwvPD6bvjUcof xhq0EWGNBPgr7mI00oFmMFlc8ROBun36CTT5JyOByezQY+R9pXAJsn52o8ntnCe1zULj 8TOMVXandmYxO/pcGX0F0SqftpEMoYMw5eF+FCaPgFmg3eMIGhkqM9d96Suw9bp3LZ/n EKzBEL7OGRwEY7D/6o97X1H29+tB5I8t+C4b87P8qC/gR47HjZsxxdfUJVS5bDTjWYt3 u0ZPbrkhK8cYuzLxbq9VrTn83VsGSIqSQtJX7kzrjrqUF+ts4aAOXSXr8szWnPszd/e1 RgrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=H335LAvGBrbyFvSpU2iQhHdAyXc0BLaEiKwqHQ5ppE8=; b=aVLjZW19SDzZzujbtwJJiTC4nBj0BdIlCHUC/pq2IN2mSBn7ZjFdRC/mtam+5gESaw kwrfLuViHkMhuwTh8EdCEVVRd3k2zvHLiGbZNF7CZpb1P5iAzp5yc6cXQ/oqABqpapcU 1XQuWnx4hpqb51xN87/4oZRtq0M0JdtA4NHHt8yWgG4oS/R5NcxqnXKbQoy6EvKsHRjF cf+LF5LPI1bUeA8U4GOkZWBkyH4f3qeaA1r7vSpRCXIbGyPTywLhKoXf8n0wNt0axysy HlMQBel1+g+3M3Xc/OrT5iJd1girr0u6IrPwPc/A78MRwWj/nn8lr6BkUq1qdZSCgatx E0Cw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530ic76w0kjFp3sSxFriqaFrTTZum0LTqZA1gihQR/b7Un61A//8 TFf5KACSiAxB8lD8CsBLdSo= X-Google-Smtp-Source: ABdhPJzxAlb5ZJkwSxYOarPj/Z1MTe4CF5+tW0yqpm8TH/VGFEyv4HssnPc/m9UgqwNVDUebljeOGw== X-Received: by 2002:ad4:5c84:: with SMTP id o4mr50074606qvh.28.1638274872437; Tue, 30 Nov 2021 04:21:12 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:620a:4728:: with SMTP id bs40ls10774983qkb.8.gmail; Tue, 30 Nov 2021 04:21:12 -0800 (PST) X-Received: by 2002:a05:620a:424c:: with SMTP id w12mr36315501qko.563.1638274872106; Tue, 30 Nov 2021 04:21:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638274872; cv=none; d=google.com; s=arc-20160816; b=chCbfgNZsnpiVaQ50p7r6yz53zlD+N04zQEuBKUE3BFna5YC5pN6VZrybV0WXpPmcK MF/VdvArVzTQEWf8Tuuew2JYTnRWMthtL2eroLkYUso7BQH8d+rB32OUzTgB7ZSllSPT zNaJhaGeIuwYry08lqDmmevoZXheSuESrs0KVVW7R4Z+P7m44Nipa40XuEnp83bfAaTb Yi03LKO4J3dCUbHyx2/pRh4xbb9NthmQcikusiTUU2JUWdMuBtdnOOq4+TEFGMRpFGPD nALl+hzlycv55wbbtU5/8yuxUDLVK/WqnZagVGOcAKOeB8On1Vrerj3z1Dk64QDf/RiH Rv7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=fQj8TNJMUNzCyNP3XQG4kjPicWf43SU7PvDrYz3mxLM=; b=uFJ6qQt5AF+my2oWGBlWMHD5hvIgkWb+f03NakezTFAj4afK7ZTbgzKjzgphsXQ3ed 02GltwFZ1yMzqVV76MBMP8dc04ySHqxAPrCBqK5EQF352niMAE7HKBDG4CpZhgnKGj/I YJhZrzUG2FJSWzSlix03vO2WIIJNRY41qzBy1aEMb4UQwb44fOPrcDNi7yxPJ59EuAxj qDqRnPLZx6o96vf6j0IgP2IApukBrxJx2LMp9OahXlMjCKTW8BkPsJrtDY6LHppK10ZQ 3Z3VQf6fdzCLgfDfuUvoPPhGLkjgVtEHQqMQeF4II62Of6ClZ9KAEFYwvYXApjdOv4aT Zr5g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aizW46Oh; spf=pass (google.com: domain of jpewhacker@gmail.com designates 2607:f8b0:4864:20::32a as permitted sender) smtp.mailfrom=jpewhacker@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com. [2607:f8b0:4864:20::32a]) by gmr-mx.google.com with ESMTPS id d17si912080qtb.2.2021.11.30.04.21.12 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Nov 2021 04:21:12 -0800 (PST) Received-SPF: pass (google.com: domain of jpewhacker@gmail.com designates 2607:f8b0:4864:20::32a as permitted sender) client-ip=2607:f8b0:4864:20::32a; Received: by mail-ot1-x32a.google.com with SMTP id 47-20020a9d0332000000b005798ac20d72so29896765otv.9 for ; Tue, 30 Nov 2021 04:21:12 -0800 (PST) X-Received: by 2002:a9d:2216:: with SMTP id o22mr39887969ota.78.1638274871451; Tue, 30 Nov 2021 04:21:11 -0800 (PST) Received: from localhost.localdomain ([2605:a601:ac3d:c100:e3e8:d9:3a56:e27d]) by smtp.gmail.com with ESMTPSA id u136sm3616657oie.13.2021.11.30.04.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 04:21:11 -0800 (PST) From: Joshua Watt To: swupdate@googlegroups.com Cc: Joshua Watt Subject: [swupdate] [PATCH] mongoose: Only ignore PROGRESS status Date: Tue, 30 Nov 2021 06:21:06 -0600 Message-Id: <20211130122106.3624036-1-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Original-Sender: JPEWhacker@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aizW46Oh; spf=pass (google.com: domain of jpewhacker@gmail.com designates 2607:f8b0:4864:20::32a as permitted sender) smtp.mailfrom=jpewhacker@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , 2c32873 ("mongoose: Ignore PROGRESS messages") broke reporting of update progress because the PROGRESS messages can hold valid data besides the status. Update the code to only suppress sending the UNKNOWN status message, but still send the other messages. Signed-off-by: Joshua Watt Tested-by: Stefano Babic --- mongoose/mongoose_interface.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index 31548cc..7235d8d 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -229,10 +229,8 @@ static void *broadcast_progress_thread(void *data) if (ret != sizeof(msg)) return NULL; - if (msg.status == PROGRESS) - continue; - - if (msg.status != status || msg.status == FAILURE) { + if (msg.status != PROGRESS && + (msg.status != status || msg.status == FAILURE)) { status = msg.status; snescape(escaped, sizeof(escaped), get_status_string(msg.status));