From patchwork Mon Jan 30 11:35:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1733847 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::438; helo=mail-wr1-x438.google.com; envelope-from=swupdate+bncbaabbfgx32pamgqed3vp5ty@googlegroups.com; receiver=) Authentication-Results: legolas.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=ryFJ5j3l; dkim-atps=neutral Received: from mail-wr1-x438.google.com (mail-wr1-x438.google.com [IPv6:2a00:1450:4864:20::438]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P55j66K0Mz23j6 for ; Mon, 30 Jan 2023 22:35:53 +1100 (AEDT) Received: by mail-wr1-x438.google.com with SMTP id r1-20020adfa141000000b002be28fd4a7bsf1846033wrr.12 for ; Mon, 30 Jan 2023 03:35:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675078549; cv=pass; d=google.com; s=arc-20160816; b=hhLEqvtbVDHkM4x6VKjn74M317wggPJwBlc/raDGxZiwHthoJUDZib5MdqLiSjbpPL 8CR36qetceLB3beiUUd3W7+eMunY4reMmrcQ/otggerCjiOBwOXhnDyaHIAd/WdkCb2Z pTkH5zsJ+9qJ6AbePGRLmAnDoKa+/9XFTF0DtWF03zNTo5mlwAXHCR/II6gT9DhoYTmW 4qNifWjfriZEspUZuCsriqJwWEjHYaHU9oWnA7WeWdA7mUlv7R6f1hzdAFezex51utJD nO0FESIRPv4DayW3Z9h1efLSZYs0NEWf1/Xu7E7Gw0KNbb+sxahE26QniOS4INRJE7OL 6EWA== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=N4wj5XPoj6YP+MvVgug3MywczVYOuQe6wNKme6PqZtI=; b=Mv68v7nbOg2TehwprlgEuU2q7ltm9/pejE3BgCTdCHUflxDGCu0955iuNU2210H+5J rqsHmyNVQyBKyFhro5t45vs5v1CfNl3ZYZVLrBqSQWaOwJ8xyOwRMnkGiOm8A4lYIQNO Uuno42tIaCBF0QO7zozLbf38kFHqqcY4MZNSxJGY7EO+tgUEpFmQ5AABLoL9GC2KZisN g1y9RlKe0bO+3du7dg4oYW8NTUtZHhwk1XMzFbt2NVWd2aKJPkhkbaSLekLcLZD3UIfk 8mTfKSNwFnNR6YTai8jpF7hT5tyFEWaNmymmfmJEFjBjo1CyuRvSygHHLW1vyTdwz2q3 d4Vw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=N4wj5XPoj6YP+MvVgug3MywczVYOuQe6wNKme6PqZtI=; b=ryFJ5j3ldb8EnIQcqpmNQs38hotsaG8kTgD8fLH1hknfZgdcMkP+A1rSIepdndRpon ZJOE9pkcRs/tOnbKMJqEHuOJnhZVrGxH8irLD4uEboyCHS54Wyah97v3Ioo+1qsIIQmp qWOqL7XP8QZV9b9BNmp27DKVXnR8cDgc5yJtPvCTvYJZxsflb09QF4acBBsEJzAHAqfl 5Ti+bwAKvcPF6JFjBJIcR/zr721lwhRKv4ZmYTwcw/RD0TR/X/YsH3Tnf76tiZiwLS0S Yq2uJUeR4DZRdeKBJRTywJpEm71tlwTOEr5RgL0UcohIq4UYRLWEFui2AV3W4w+A48O5 rgRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=N4wj5XPoj6YP+MvVgug3MywczVYOuQe6wNKme6PqZtI=; b=2ze3ieTNu9eYiY1jmX3Yc0eOC5etTQklw2MVVhtrOyk5Pf8/+vJ9o6eYid75M1+wrg 95KbpVLo1XvJqGiITxawrc2mUK2X495zagDesjfwL1qqjLaKKkETmE5bQGVySio7DcrL yNL3GDyrZ0vJ0ZBhWsimLCT7B487KTwLWdDvvKaUrk/pEhDcwXYWPMGe6oPWSvwFsDxi AbZmlruqUnUDFsTLjkzXhIpuLjGoCfks3pAnK4q6Jml1aqp8STKBYcha5ZKTWoyGrTt/ ze2q6XEOy+GzQUEy3syHyfJhaUaLt+i4/qkFBHFzdGSzh+Fs1g4oVjW42VoTFmGHZAzV n89A== Sender: swupdate@googlegroups.com X-Gm-Message-State: AFqh2kpeR+kjrr4rFzY+cGLpwQdOIKS1mFTbIh6z4FA23CuYAmyscHug BMGg5rAIc/CrMVDypwZM16k= X-Google-Smtp-Source: AMrXdXtm6PJKpFpRmz61ibjhx49zEqsP0AO7UKG7W1QMp9xMegQ+9Nup8lQONaZaGA0jCr10IbkPGQ== X-Received: by 2002:adf:b64d:0:b0:2ba:ed1f:bc66 with SMTP id i13-20020adfb64d000000b002baed1fbc66mr2167545wre.305.1675078548823; Mon, 30 Jan 2023 03:35:48 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:e449:0:b0:2be:34f5:ab03 with SMTP id t9-20020adfe449000000b002be34f5ab03ls1156649wrm.3.-pod-prod-gmail; Mon, 30 Jan 2023 03:35:47 -0800 (PST) X-Received: by 2002:adf:dcc5:0:b0:2bf:de97:f3f8 with SMTP id x5-20020adfdcc5000000b002bfde97f3f8mr6753291wrm.28.1675078547627; Mon, 30 Jan 2023 03:35:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675078547; cv=none; d=google.com; s=arc-20160816; b=l/qkoK1PDh1Jcf6bKolr/u83tUkedCl+5wc7m4B2JGqzeb+egNUCAgBundi83X/rs/ sWkReE7lWsjCQdHhzGOjOTfTDD2oatviVJLvFJ7recjvZQeWCQlwX7ZugZzn3ICJU2QT rFVzy+MNFqhIqU67QhxcW+pgTdjk3Pub3vjuiBiyucaeN3O1KAB3GbtYPHIVnpMAuKYZ scUnIVDzdAH+dOpi847C352tFhf4wYhp0PDJY7YnkClyAuXobENzOt08RqMKmN2JHj1O nvy6I1yz09L2wtJrHliq5xRZsdpG+unOuQnspsEfLNrEAyaGtlFZjwFJsXal6bF4IF9G kReA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=SuaJySZC+O9+w62KcNJbL2a4UHXqMdzSRrC7rv8ckO0=; b=uWgpS6QPSQUycJYfQclCFcy+1pFlo/SojselbanPyFs2fL9QL6xyGaiKYNDG/xPEG/ n/pf5EV/2VzDOZj74NOHx5OUDRG5jhi3UPHTguemneaTeKuKxwk0OJUz9ClJovqPQNmz JIugeuLuB+UslRuo99yeusmmIePYjrMJCffTncZSnVScSLRvcRp1VjpcZE/yNO6L5uoy IesjB98bW0V99D185ruEFVO8uwf6G/3uR4+DmaRKxNofZeGD9MQ9gmO2hGlknMX0oaik pAli6pUpaGQRJfHrUXN5b16gkU0Ye0X2tnEmIlf4QlIzyEpLpD4xq8AFJobD0FDusaq/ 7pIw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id m18-20020adfdc52000000b002bfc35954dasi606911wrj.7.2023.01.30.03.35.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jan 2023 03:35:47 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 21445 invoked by uid 989); 30 Jan 2023 11:35:47 -0000 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: Daniel Braunwarth , Daniel Braunwarth Subject: [swupdate] [PATCH 1/3] mongoose: gracefully handle broken pipe errors Date: Mon, 30 Jan 2023 12:35:08 +0100 Message-Id: <20230130113510.142836-2-daniel@braunwarth.dev> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130113510.142836-1-daniel@braunwarth.dev> References: <20230130113510.142836-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) REPLY(-4) MID_CONTAINS_FROM(1) BAYES_HAM(-3) X-Rspamd-Score: -5.6 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/2.8.28) with ESMTPSA; Mon, 30 Jan 2023 12:35:47 +0100 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev 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: , In some sporadically appearing cases the IPC file descriptor has already been closed by the installer while still receiving further data. In this case the sending client is not receiving any response. Let's handle this by consuming the remaining data and let the installer handle the final installation result. Signed-off-by: Daniel Braunwarth Co-developed-by: Daniel Braunwarth Signed-off-by: Daniel Braunwarth --- mongoose/mongoose_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index 465bd51..a5471cc 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -615,7 +615,7 @@ static void upload_handler(struct mg_connection *nc, int ev, void *ev_data, if (written != mp->part.body.len) { if (written < 0) { if (errno != EAGAIN && errno != EWOULDBLOCK) { - if ((mp->part.body.len + fus->len) == mp->len) { + if (errno == EPIPE || (mp->part.body.len + fus->len) == mp->len) { /* * Simply consumes the data to unblock the sender */ From patchwork Mon Jan 30 11:35:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1733846 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::438; helo=mail-wr1-x438.google.com; envelope-from=swupdate+bncbaabbfgx32pamgqed3vp5ty@googlegroups.com; receiver=) Authentication-Results: legolas.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=pdT6eDBm; dkim-atps=neutral Received: from mail-wr1-x438.google.com (mail-wr1-x438.google.com [IPv6:2a00:1450:4864:20::438]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P55j666dvz23hg for ; Mon, 30 Jan 2023 22:35:53 +1100 (AEDT) Received: by mail-wr1-x438.google.com with SMTP id u10-20020a5d6daa000000b002bfc2f61048sf1859881wrs.23 for ; Mon, 30 Jan 2023 03:35:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675078549; cv=pass; d=google.com; s=arc-20160816; b=c+gKP3wu+OdSDpQqIn7micMOeEwsOaBYvICpKxcFwrjrHY8V2MaPCzj7jJfbhTTqi/ lZeCnau8OwKu4CAFD4Lm4O22D/REYbK9J6ouEcgmg/Fxq2mZes0+o5whLa145a/2xpES LUE7fn+0el5WB6lgRbghGP3JWjMdhGBCaKmxAuHICmZEQ5XW1CYIXc/jEmn9Xe2awGpd mB6lkR0qsgzeZK9HkMYbCqcw1eDB1D2e1gP58yDX/pVEM1SR6PjCcjNESla0gXDV3OTb sSAknQM8e74/fQGb5ynVNUO1RhN00lhfPvxGOp05L9vHi5WlbTKeO+5AKJiRPY2/flqH 1Yyw== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=dZsbUSBLjBnZST1keT7DS8mEztPaQcz6EEIrMSCWBFc=; b=u9R0rPmNDOZ9pFHOrIEl2D7ji7MWsI4rvSP8wrZD4eFRCVlgKukczbljpsHuIUdSnU 8ynwISH23o37el5Gy+lJNzBCJXZ+TpT0gtFC6qtGjt/JZXrDKExNM8YFoWZNTfwLgJYC ozs2+3PioYxQrYQ5nhxd7325eGo3gvpdtSFJUEhCsd3RiL7+2NemjMZP/E71y1bxhcL/ N77ivUOOl2T6PwFG4quaFEPG+TDY3Lfqdf5WnTNbClg7B7G5Jp7drsNSAm8rIt6vz8eV /7mSq1f9EirgVAhxPnchNzKbiHfUWqVDeWMAvG9W66MIUApzdioA4grOflJF3jn+Vaik uKzw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=dZsbUSBLjBnZST1keT7DS8mEztPaQcz6EEIrMSCWBFc=; b=pdT6eDBmQv5T6nvAbP2aUtfs45/F7vhDvJa+Epff54aC1+oWbk+MJ/d8qpZFyCTZn8 LgD9nSqFaBWQBhiWsN71M32ubMkutyiL6xKavSgMuvZQGIRz5U0S84DMbvusU2qyV/z8 HbwdZfdxy8wEtsDUJAuMHHi0z5f0mTnoQDO7dvCdBWU9Q0KQtV32Dnj1p1amKPZW0BlN 98RNK54CKGxwid6hXfpvTKWpAnKi4Nh10INLd4fdaYFQX0Yf44iMhZzK6XXwzM/fTdZU zFdkCM4wwotz/mxnT1WD1U2T2UD9frOdmtKwT+QkzxXi3zYNp9sDXlZkf0uiQFtBbt/r Wz5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=dZsbUSBLjBnZST1keT7DS8mEztPaQcz6EEIrMSCWBFc=; b=DMnfVV6INN0VmraDMEbam4obfGPyV1m9VkVOCKuo8wPZRl9GbAOGHlyZYB85fQVt7h 0o93w6ausbAtGT+xOfNNL31K810HGEz5n1YLU5TBufgpg1iJAO+cmY9Xq7GSiyhpX3ES 1t+fYSaMlzSqbHLrolAN7ohPBq+CCvdGob9SUMLyJq3ErHET+PeNxfkU8DPAhLbXeQ5j ut5vOtSxGnrMVwRRM4uaEua2G/tfMJPSTOv7i470C/g7mnOKPumiI2yYzNOTHtPd4tat i/A0ydnkc1DTjnzw9N52q+XGKvT4FG4ZRaQRaJiXgeesTyBHG1ykpPKXCgygAo0/E7Rk Gq9w== Sender: swupdate@googlegroups.com X-Gm-Message-State: AO0yUKWW4pse2qGsslBhjkj0e16o3eO9uL/tIREdQMMIp+QirxZ+6eTG k34nHn3VFGKdgucqPdJM8I0= X-Google-Smtp-Source: AK7set89+cH6gR9cDBEOgwvgb+S6Ve97WGqOcUtFNNeP/sVO2L7Nu1QPKa05KDrqdIR/SmTLmQjD3A== X-Received: by 2002:a05:600c:294b:b0:3dc:58f0:e94d with SMTP id n11-20020a05600c294b00b003dc58f0e94dmr166215wmd.30.1675078549202; Mon, 30 Jan 2023 03:35:49 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:ccf:b0:3dc:5674:6707 with SMTP id fk15-20020a05600c0ccf00b003dc56746707ls1627129wmb.2.-pod-canary-gmail; Mon, 30 Jan 2023 03:35:48 -0800 (PST) X-Received: by 2002:a05:600c:4494:b0:3dc:40a0:3853 with SMTP id e20-20020a05600c449400b003dc40a03853mr10372209wmo.11.1675078548080; Mon, 30 Jan 2023 03:35:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675078548; cv=none; d=google.com; s=arc-20160816; b=Lku3d/dEiO3ZAPvuAO5yBeh3sA10HmKPWPM2oou+XzzHh5bZDQoYXsp+3Be52w66/D kEp3rCvCyTru6hN2YkCCjtLiaL92Vb1Z5M55TqYoDeihvOFPs9WoDAZn5CI/P/XBWU6L cPibwhL0AH+tC/5pSElttnJkOazHndd2Yr1PVQnzA1TFp2J2GgyfaT1x+fZs9kEGswE/ 8s5dkAQLhmeIRsi2E54bveobren3HfjulZQ2XAcizQqiPP/59HVOK8t+QyWiMgrXEwQ3 SOFv+WARRrOwrgprcdXiSyDCh5/rfQhe6GKYpfYb7DCHMBrgF7bfWVQBwu4orDyCVrQ5 VNLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Hf5cW7mq88j73jX/Y/jDHnyndE1LfeRwuloYx6lnF44=; b=L6MiW2MPP36KndDo8aaAs81FkKo6njBd1E4pjKe13KBif3SlgQfYcLQhxq13pzpIr1 XJ1lpGph7/UsuItREJEidv0GcN7vo2tT2TtCJlVdKID+E1ICk7GOmM40EXo342K1YVMS WyC8Sjol0qvISHXCEmvvDjZvXsSAtJRYWEQjfUR3im0+eIdJGikyKP8D6uMZUTDabe9h 0Vw+K4teSAKnmSJwxUpS+o97A7cyimkwuRT4tJPIAvcebUqpMlbjBU16Y0N0Bhn27rvg V5DIaKxEuspvS4TkYlswZHiojevIirNMBEzH0P1lS1J4jjHiZE9Go4IBSBBInSR3adXo emaQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id bi21-20020a05600c3d9500b003dc43c78e98si438552wmb.0.2023.01.30.03.35.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jan 2023 03:35:47 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 21453 invoked by uid 989); 30 Jan 2023 11:35:47 -0000 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: Daniel Braunwarth , Daniel Braunwarth Subject: [swupdate] [PATCH 2/3] mongoose: invert if-else logic Date: Mon, 30 Jan 2023 12:35:09 +0100 Message-Id: <20230130113510.142836-3-daniel@braunwarth.dev> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130113510.142836-1-daniel@braunwarth.dev> References: <20230130113510.142836-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) REPLY(-4) MID_CONTAINS_FROM(1) BAYES_HAM(-2.999999) X-Rspamd-Score: -5.599999 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/2.8.28) with ESMTPSA; Mon, 30 Jan 2023 12:35:47 +0100 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev 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: , Signed-off-by: Daniel Braunwarth Co-developed-by: Daniel Braunwarth Signed-off-by: Daniel Braunwarth --- mongoose/mongoose_interface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index a5471cc..de5efb3 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -614,7 +614,9 @@ static void upload_handler(struct mg_connection *nc, int ev, void *ev_data, */ if (written != mp->part.body.len) { if (written < 0) { - if (errno != EAGAIN && errno != EWOULDBLOCK) { + if (errno == EAGAIN || errno == EWOULDBLOCK) + written = 0; + else { if (errno == EPIPE || (mp->part.body.len + fus->len) == mp->len) { /* * Simply consumes the data to unblock the sender @@ -625,8 +627,7 @@ static void upload_handler(struct mg_connection *nc, int ev, void *ev_data, fus->error_report = true; nc->is_draining = 1; } - } else - written = 0; + } } usleep(100); } From patchwork Mon Jan 30 11:35:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1733848 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::43f; helo=mail-wr1-x43f.google.com; envelope-from=swupdate+bncbaabbfox32pamgqenpxckqi@googlegroups.com; receiver=) Authentication-Results: legolas.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=oinrzr5x; dkim-atps=neutral Received: from mail-wr1-x43f.google.com (mail-wr1-x43f.google.com [IPv6:2a00:1450:4864:20::43f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P55j66MKmz23j8 for ; Mon, 30 Jan 2023 22:35:53 +1100 (AEDT) Received: by mail-wr1-x43f.google.com with SMTP id r6-20020adff106000000b002bfe5fb9649sf772690wro.14 for ; Mon, 30 Jan 2023 03:35:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675078549; cv=pass; d=google.com; s=arc-20160816; b=gCQRoFUsGzQgV4dBGg3LxBo+fDkMRqf7PUSDz9ycPXz3vznRmi6+PS/06mAeROVpZB r9olFCvJmhNDIUK9FwSnzRDV3Nk7SIYBDJCy3TWbI+ieVma1YxplPw/NrpAsNZkgy2BG N9CdY18uUr7Q1FAe54BBHgebFhYkITTmf6xbXSjsf1uJ61uJgnGyk9cAa+hOaEOUj/Bd iygdRY/hUW5WoIRwsP/Pk3zI0qm1oWdN8Ao8bkldqrAgF9ZTIt6Ek+rnt9Nwe2sPFmuJ 1lExg7hH6RzCpHyKsbbdTOVD8BpQDryixvQoItP5d9Sv+PDTWknUscXcafOXILYpelfg 7fNg== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=tM6AzPkd6FHa1Pj35qHWoBK1k7qVXN5R5nxF+5ISBcw=; b=vv1KXETJyYyw30pGZKlATR+k6F5w99Gg+1OrHfcBt4rYnNch3WS5rvbCpwgfm7KyXY kwINGBbC1OAcQoD9N3EIHK0GZl7CDVoB3kcsytLovqBykjQmlflhSI8CHExX3n5I7175 1i6ylsGMjS4GYYhbZHWoHcb/AxL1oYAHSsCgq0dMIc2DE2dir9CY9EP9JKuD3ju9s6vy qxYJaorIwGOuH44xsmICmbEyxmFUDiq+Gkkv0Da0HDKzS1Ng8VmVUWAFellvg3TthYYN TuLsACzkZ8kjRam6gPLPYcw3Xvl5fUc9lb1vX0Zaw/XqwOsFPT2QmZdg2xw2P0ejLTzW lLKA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=tM6AzPkd6FHa1Pj35qHWoBK1k7qVXN5R5nxF+5ISBcw=; b=oinrzr5xZ+c70URSDCrfOB9pu6behJw6FZJTo9AbGhYHPVRJhbENEqSrb1WBMWQ3eh BP9AwcVxwu2rQWLL+Kyyw5DcSO6L39vCTYuxveU76a9ypqDq4GuTkEgtfSPIr0t51JoY 7CZxis25sD1AocA/TdToSpItrfS88WCa45TOPp0Y0sbuQPazpjH8YAWe9j94P5wEqE3T I6qa8cJEHRz8jJHy6Vo46iZEK1gmIpTizTf53wIsBCxy0Mt6ct+JTZcVD0zcO7IHFJEn GUGppBWHVPSEzwjzIL4AHmCXKsBMyfkFxpb+ZVb+OftZ45udLX4gT9sJYcblwYWdqUaL X4TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=tM6AzPkd6FHa1Pj35qHWoBK1k7qVXN5R5nxF+5ISBcw=; b=fILyGwkKgqh0fnbgBHVkS3rJX8xn9fg3PuxmBZU2te0peQjzZ+MVEDTCVyq0c96lOM EbZj4xZfrMjWX7S/doAC033bfv4qUOE3EViw50hMqnQDaPKIX9+6fxLhPxIoCT3X5kTd dijkPJhei7a/TPe++c6UdcfgYFUO/8I6V3R5sunH41Zhbo0GWWnNOJqQ/iLi4Q1GBgQw jK4RRp++Y+PwEqA6zfc8VwxaUtns2GZoH5iLbNOuMU5EiAMUFBX3JiGCRj/qwQnR3pDl QL40ZghVZ9cz5Nv9CQR5rTwsmr4k8Bp9mPTrC7fwc1GhlOWDXnY5mqio9SsyXIPaoG3P Fn1Q== Sender: swupdate@googlegroups.com X-Gm-Message-State: AO0yUKU/pHrPCl47dlpXMr2N9dpoW6rmUWpf71KokP7+ILTx+wwoQz2/ EVeTAx1yKNxlxhK0MRgk00c= X-Google-Smtp-Source: AK7set/VGUJP70rTGh2vVXYLuX6bZxptzQrL0ReTQ+0duLrmmkLSuk0jxhPOtKUWR3+mToCa/kI3DQ== X-Received: by 2002:a5d:678a:0:b0:2bf:e3b8:5a76 with SMTP id v10-20020a5d678a000000b002bfe3b85a76mr192742wru.274.1675078549448; Mon, 30 Jan 2023 03:35:49 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:3b03:b0:3d9:bb72:6814 with SMTP id m3-20020a05600c3b0300b003d9bb726814ls2433315wms.3.-pod-control-gmail; Mon, 30 Jan 2023 03:35:48 -0800 (PST) X-Received: by 2002:a05:600c:a15:b0:3db:18a0:310f with SMTP id z21-20020a05600c0a1500b003db18a0310fmr46409863wmp.33.1675078548366; Mon, 30 Jan 2023 03:35:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675078548; cv=none; d=google.com; s=arc-20160816; b=sGQlEih4fJ3dbzd+GQWMqGuzsPqErBxWH4ZKxoNy6/dth4RMuecKP+iMQiUvCJfgHl ru0HIq84YAdSnTZYO3Lgyt6MkRquf9IlKLAutc7fMBLR+Pq12sTcyEv/XtLVW5HLhXp1 bOL4M8JhBDJtCUf2zqaceKF0yFFgj3GpuOWT4f0RAI87NJuhxY9RjLP85T83b4csjvUz MsWaoj2Fpwt7tjJHF603QVhqFK4lgeA2Vl8coblkrKjc1jOV2RPG2Dh2l66XZ6Wqex31 LhX2tHWgi4+/KlsAKzEQ0JKsvTq6K8nBHH8+xOwV4X7+hH+y/BFSrBIH9jT012rW8IH5 lT8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=2BZoxFBeL+xDgtlHLN6q0vdQqQin4fQQcF/xb3QMzaQ=; b=fvKhpbX7Hoxrb4leej7vIX1+TqB/RE/QDGHCivMRHRWB0X2t9u6Spp4Arj7TPEKhXM 0xH01DJK2/eHb+9VXuVOK9B6IRTRZ2+PtlG5Z9Jb+Je68y7+40WyN2sEzSO2qblrrbBj PnV/Ym0Qy6E0vz8ZndzaS3JdIeznNz5HnM3/deFsgOa7SYk4Oj2vNmXm6bF28gJJ0Dcu qUwfiiLz2/7wIqXKJqewkTUIisu0rnxE7FTWTeodq0UaWbXCcAPicV08BHevSiN/5+m6 fXin9ArIVIUViHwbYZILVArkSYe3C8zF3biLHbOpPgNgL3xjY8Z0Ghqn4qdGLer5Os6V KnxQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id e9-20020a05600c4e4900b003d9c73c820asi1120730wmq.3.2023.01.30.03.35.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jan 2023 03:35:48 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 21464 invoked by uid 989); 30 Jan 2023 11:35:48 -0000 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: Daniel Braunwarth , Daniel Braunwarth Subject: [swupdate] [PATCH 3/3] mongoose: fix indentation Date: Mon, 30 Jan 2023 12:35:10 +0100 Message-Id: <20230130113510.142836-4-daniel@braunwarth.dev> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130113510.142836-1-daniel@braunwarth.dev> References: <20230130113510.142836-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) REPLY(-4) MID_CONTAINS_FROM(1) BAYES_HAM(-2.999999) X-Rspamd-Score: -5.599999 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/2.8.28) with ESMTPSA; Mon, 30 Jan 2023 12:35:47 +0100 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev 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: , Signed-off-by: Daniel Braunwarth Co-developed-by: Daniel Braunwarth Signed-off-by: Daniel Braunwarth --- mongoose/mongoose_interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index de5efb3..4406c60 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -654,8 +654,8 @@ static void upload_handler(struct mg_connection *nc, int ev, void *ev_data, ipc_end(fus->fd); mg_http_reply(nc, 200, "%s", - "Content-Type: text/plain\r\n" - "Connection: close"); + "Content-Type: text/plain\r\n" + "Connection: close"); mg_send(nc, "\r\n", 2); mg_printf(nc, "Ok, %s - %d bytes.\r\n", mp->part.filename, (int) fus->len); nc->is_draining = 1;