From patchwork Fri Oct 22 19:24:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Mena X-Patchwork-Id: 1545092 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=dr5hvWRJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::23f; helo=mail-oi1-x23f.google.com; envelope-from=swupdate+bncbaabb2u7zsfqmgqewkbahoy@googlegroups.com; receiver=) Received: from mail-oi1-x23f.google.com (mail-oi1-x23f.google.com [IPv6:2607:f8b0:4864:20::23f]) (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 4HbZ6P3dD0z9sSf for ; Sat, 23 Oct 2021 06:24:29 +1100 (AEDT) Received: by mail-oi1-x23f.google.com with SMTP id o11-20020aca5a0b000000b00291d010cda7sf2932660oib.7 for ; Fri, 22 Oct 2021 12:24:29 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1634930666; cv=pass; d=google.com; s=arc-20160816; b=PTGTPLU2HYNutrMsYzSPfL24FgyQcTEMh3avGI1LgV9ICCaegQ51FJ1HTCzRqJUIZL NLFj5N1EKIY/9D1sXFo18gqt06B/OBB3XsHEzmjIimrv3beArtB8p/YFj0I4KH0ckxvf rdrMAc+ntctKqjBQXpLMYlwOsd1f3TAllsgk7hra+gAoqO0JS3h8BQPorxSdE/oAsRZI ri0iwNKTzlB/3yqzrEId56J0tqV4p/3+Y8gpVTbwWKu2fvh+Q+EGYXz14Zb9mSSVMePg QUvHdcluxDOx2Dd2y67ncHqhJ5r9UNCqT5hEuosxA4S1gXvs4rL1OZAOVd7z5zkoKHNM GrVg== ARC-Message-Signature: i=3; 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; bh=DFWHtwlt+NoCmTWO2rchW6jAIvAQFFqBQeEnUxfwzM8=; b=jgzuWVUrb7zSh2OJv6PWYKnHu58Yd+6CFe4kb99yrDi3SdINIfAdM81qlrArdXV1xO xBPda4xyzNPf4n8E748GJT/A0SDo/BVIz8FUOsvalZWhe/l4rJGwPNnP2Ve4GXJfyBYy +GsXQDg1efXFG5A3ukKvvpsev+bwhFJOyUSyVEvGT7OgMtXV1cs1gbIwjwMZ3LwUELIB 5fp1zINy5yZhTNe/jlsd1pLB+7T3baqVWy8wQ9up1YFuucctBKDGWDvspgecDr6lmlK7 01gY2bJ1v41pxuWSV3Hr/zASieuomjKodQFkAZl3gN9kJmVIOKG3ERY5ZXIceQ8YKzHL F6iw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@outlook.com header.s=selector1 header.b=YdhUZNKx; arc=pass (i=1); spf=pass (google.com: domain of martin.mena@outlook.com designates 40.92.20.76 as permitted sender) smtp.mailfrom=martin.mena@outlook.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.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=DFWHtwlt+NoCmTWO2rchW6jAIvAQFFqBQeEnUxfwzM8=; b=dr5hvWRJOp/IZCSEUOqtE2emOZX1DH0+oLqTiv4CDy2JyfJ3vI3NNp5JFKd76xVSPI egK9Lz2xa+AYMszLrot2lNP8bh/MhrQNxnLxqdtLrUgSw1IwDIMfZPDMXLcf45LSXzRW h2JFPPQoHdvGTI4BbUxzXO/tpo/szpw+SRa0c24IkBrvWt2vUyK6BpIHE8eHE/FiDBXK G2rAUY9Lx1YLOc3hwHr9jI+NWMVRWqqTdQF0Y6hfWe/EoxONLRdW38b6K3dlsG/5W6C1 8BqqEq5q7WkTh+B+bz1YFJKi4PVbJ2Q4GEC55qhcWtAuu+pKk94ugr1o2xn0FkdSdTDB 5Tdg== 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=DFWHtwlt+NoCmTWO2rchW6jAIvAQFFqBQeEnUxfwzM8=; b=rSX7g0hmAfOn+96ODekgkAGe2aQCF1N32R7xDFVcnRoFXW0pwpYq9MNITAyNwBcCwD LHb68NZla0G5tRDlCaV5CQxAJzPzZOksZsVMR+E//CyoPEl+vAcHCevmlRRcHyo+sBLO Zc7O8/+HeGgYU5zjXLpxWmkcnXXyBo9eumI+hIf22/0sQafR88ozvKOth22Gdq4Xg2Cx bF09FepcgJTMOCkLHbPQrDl2lk07pzLtU8UUC4JXSWU+W9NfSp6YBfBGh9ZjxOkxfUz8 uUe3wEyQ1VQvJxlHSFhUsI+tHXGku87lGZjTrru69oM0vew/F7ODDIBcwYSqTeVicxsh bbIQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM5312S01xLK3QrQqR6nttoxJWmwYndZrYFcSauwoMQs3rMPaIsKBd 4SCq1ObL4EDNLTrQ3n6gluc= X-Google-Smtp-Source: ABdhPJzNp7zB9vq3Z3zFbKK1EWQ2Dq4zFpmNosxAxwmJP0jZpIE43/lah9WN3Ha84o/Um6MvE0I4cA== X-Received: by 2002:a9d:ec6:: with SMTP id 64mr1090564otj.156.1634930666325; Fri, 22 Oct 2021 12:24:26 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:aca:43d6:: with SMTP id q205ls2931378oia.2.gmail; Fri, 22 Oct 2021 12:24:26 -0700 (PDT) X-Received: by 2002:a05:6808:23c4:: with SMTP id bq4mr11518475oib.147.1634930665942; Fri, 22 Oct 2021 12:24:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634930665; cv=pass; d=google.com; s=arc-20160816; b=K648kVgvO+ahjpv0cHpHvmrgl/G/VlSrK4NFMk3JCceoMOBq5kAURhpW6bLR5R7Rlg Gdm5MTQB/1Nwo1zJbuhCzwWMKbH9FBeawt9tM2Jmi7eU+b+7kH+DZZJLCNrzY92pfq0u 9PxDEkFRUtM4n4rIeLOLTCuwP0fG9kEjtM1O/MPq1NTBVhQVpCEvKOUvaARxQVZvBl7J qb75gUvfxjg4/TdCka4ogpt0ogy38v4yy3y+7EYb9YPYjniIhX4wPtB8bRQROhVGnH4R uDEc9qydTBM+efs6JujaPbLSJ4U/20MR9aR53P0aM9DaMITLTkGM9ojVidbUSVcjcS1O WpVA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=O0ZoVKWDO6fKOhAShD84BzrYtdsV8Gb833v+XggyeRw=; b=q9/i5G7FABNcgz9/Ztx836UhxiANthj9aGWlT1umfHSzk++eiS/DPtWuPNf4UNDzPM K9pJ3UCZbIEtaJjA+OE+sawSQ4YkPcEFkvYGJJBVsYz4OqB77yCJ+2kx9EtKFPbgTJbH Vw49FPLIqf0Fd3vTSdt2aY6cMtpllTL6EFoTszXwGXu1JGzad9Y10JdstohMo3KIFt2v LTQgwQqK0/r3C+yVJKa/mN/3hEngTNOniq6PE7T+7FfCiOGKkcQZZY7yKa3Pf+6EyA5T th24mwQUg0J6hn8D2iW7pJcxwzTPm6Cp1jIA09JcN/LNPcNl91xacrTNge14OldIfQvV ZF1Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@outlook.com header.s=selector1 header.b=YdhUZNKx; arc=pass (i=1); spf=pass (google.com: domain of martin.mena@outlook.com designates 40.92.20.76 as permitted sender) smtp.mailfrom=martin.mena@outlook.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11olkn2076.outbound.protection.outlook.com. [40.92.20.76]) by gmr-mx.google.com with ESMTPS id w42si622603ott.4.2021.10.22.12.24.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Oct 2021 12:24:25 -0700 (PDT) Received-SPF: pass (google.com: domain of martin.mena@outlook.com designates 40.92.20.76 as permitted sender) client-ip=40.92.20.76; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GEnEg5F2dRAxmeikQluhtSyKQET15Q/sxUI1LtDmxB2Pbm6eEMhWLqLc6v8Qp9oaw+Xu5HIOYEVSiGp2PiaSQfLlhNKC5vWOZa1VOFR0eS7sBiWzwrhY8hYysn0JpQPM2/pdB2fxV6rSzrnIlHJx0tY5Lz6vfLjdcCm6K7b8WR1UmR8nIHJcdeTlvTh7FVLnxk1Tf0dQQP2NdWQs5QH47GFrT54uqC76qYgrD9dx6Lp3s4E4XzfU2pINhzsZ/SqXIZTXtMKNU5cKUB5RO6wmEYR2z8D477nk4A8QAsCEHjr3Ha5NAmZONr52skbToXp83v46ZtuUzK18s98MONE4VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=O0ZoVKWDO6fKOhAShD84BzrYtdsV8Gb833v+XggyeRw=; b=c0NfatQMjQ6MulHaMnsLGBd3r7Y7XByeHADxXwS6tftgoBtucFBHfH+WbSq0Q01qzbXR7GQ6SRSjUfC20Z89OhOdCu0bUeCUCedHrt0Ka5iMrF6hZyGqDuwbMiMUnNJ6dvPyei+xH1UC1kU2eSJY959clwDxNuUSXdIZTojt6isr6EFn+wb39HADXeSZ20vY79QuW/NaZ6SDJ9mZTME/KSBlP6P7MbuBLQCf1R9ttQ3GbLTO9RKuEVyErT1rID/nWvCkCGqgaPhhINFQZa25wZ/De1hgMIed98/9+8UGBLN8JFEclqWLmAhLkz7pvH3GDUq2+z3DZseOCpMUfHL7lQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DM5PR07MB3514.namprd07.prod.outlook.com (2603:10b6:4:67::33) by DM6PR07MB8173.namprd07.prod.outlook.com (2603:10b6:5:1be::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16; Fri, 22 Oct 2021 19:24:25 +0000 Received: from DM5PR07MB3514.namprd07.prod.outlook.com ([fe80::91c0:5e88:cce:4383]) by DM5PR07MB3514.namprd07.prod.outlook.com ([fe80::91c0:5e88:cce:4383%4]) with mapi id 15.20.4628.018; Fri, 22 Oct 2021 19:24:25 +0000 From: Martin Mena To: swupdate@googlegroups.com Cc: Martin Mena Subject: [swupdate] [PATCH] channel_curl: keep retrying file download after connection lost Date: Fri, 22 Oct 2021 15:24:06 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [X42O592D/ZsPMsQaQZ7tt4COpOxsppkr] X-ClientProxiedBy: YQBPR0101CA0255.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:68::16) To DM5PR07MB3514.namprd07.prod.outlook.com (2603:10b6:4:67::33) X-Microsoft-Original-Message-ID: <20211022192406.5870-1-martin.mena@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from KBLU.localdomain (24.203.249.23) by YQBPR0101CA0255.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:68::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15 via Frontend Transport; Fri, 22 Oct 2021 19:24:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 95850bbf-f56d-4619-55bb-08d995918ec8 X-MS-Exchange-SLBlob-MailProps: CaK+F7me6Cmeq3E7QT2qz7YH4/FHYQ63fpG6HYdOvtGXiXoT2QoUSxry+y4Z/J2zUF1QCg/lb0FK2cGCcbWmxhhRyZmvbif5pf02uICZeeIYCLhWxXw2vcQ5B48c2NZw18UHl66HVUE7zA2Z5mBCRptAdck0UQ+2mkDidMoil+YYvLzBLCyEiQgwMPiyHhSc5U7NBvG3vtA4IkQw3io9Fcaf4LilbLQwHzleJ3CyjvMSb/ROrP98yVPy/YSNSHTHvAVhbrkpeXJwFC7k2Nu7eqATc5FS/ZycRT1KqnV7CMYu7kfGyrS43JQOC/8fVzudqJrGhO//xbOtsHGoyHpopszYDaAt42JH68+byAW1isekeHOZCTyWBlifxradUwcVFkgL7buHA2fjX7q/QIK9hHx8+Hq7qgeNGlLS0jd1cCkWp8Cj1KOTbVDQ94+7Pgniossib75TE7TYhy39moAhtJQswOSlE1HuJ5MrDlAp4vBMX3FZStqTBppt1Ffm6md55p+ZQ9GgqlonHrwvaWC09vL7P18O08S+8C+tUuX6eIuVailQoMDkjWUxJki72GKLvYEuG7iWLKo23S8LfodKN3cYTBrdeCFlFKtgtuREZNZZMaGm7BQ05ionhjU26PempBVJxQSCFIc4xxq4YSJhiBWEf3GAsC5hj5JBePKmnU89Wc9AiTxkHEbOYZN4nZerieEODYkk6DM0SGpoVN5ws1qWrhkzfMPg2+q6cuAuTU1/tPywL0koyQ== X-MS-TrafficTypeDiagnostic: DM6PR07MB8173: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yhg6mvoUHpCYZm0X7rvN2df3YlPeWUZf0eHy/ruKRo44GLsEcWPjvCbFIoHswaYB5pfjaZCeXqe8HIkQKl52S9RlS7sO54AuJiLGjyJVGtDnCzkwydEPfr0j7br/bpVTbVtQ21nrj37Xamm19SdZFpqBD+af91MOStzuNuu5Wdta9yR+aCr/hM+A8c+N86kZVZP37qz7MgJ8gfY5EO1PqBnMuJ4csOwzDuXCbW+Er0kn2tWfQxTpLGbpkRZuxXujg/ScroabN4T5Q78NscqRK/XPkNxiST2Xbzxyu81LTsJJ63zZE+WfHo/EufVeen4eGKh1Yed/nS+wXGAFpBQUMkGZV44HEdwpbAC+omSI1JP0jIpD/k5JezwOrplt/KhBEnpUC9+nIt+mvYnMRd99zNKr3My/Ngo+MTbuEEoex6oGBveBMwmNCmXqkNbIedNjfbN7POAg94OVcxOj9DyPCmsoLyKkSvaMISs+Rof8vvDGiUt3EcudGIMkjiMDlqxQ+wy7lo8/C+jAngmPokWyAmxx3qs/PHgDVfgt/GzkPQE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ltxjV08q7tck4PC5B9fq1j36YRBSKlGzfS7i98ZxZSRDpL61iHi1LF8cm/66r/0/i8aQFu7VJiBW2yAEmCKyhz1FRvOj2w9B0r+g1kZy2LCG0xeb/8XoS2tCt5BL6Q6uDHnKPFalA0SVlQPmAyZXxUsutQ7mbbZlEVfU/lBk4nXt9LaaJENLF2YGvEUe+luPMX1ACNExHrYv/5mJytlad/qk33T8wnRMcsxzmT7k7l0pY21T0W4UMyRHoN2JeclTJhMa63nyTRzfxvyep1C8307OnI7RPlCePlRTxVC5MUzF9z5a478ejpYiukgGzg+eIy5AGKN8Ft9JsvljFlXXaSn/dvpvkDBaYU+aT000Q5lAxP+YvQsCR0iBiKunE0LNf77eS9rhzxiCfqR0i5UJ8JQR25xRjIjrl1GLUVlOjhOkI6wQvYq0G6/d26VKyNWIlvYSfK9skIGilmhdU3wUz2N7L5VHHT4BjSjBiZdyED6s1vSIZRExOwD138eBHcdst1P5O9C9947YU5EKMBZ2niPVlRuye+FXsRgGV1e5zP98dhHfD5Td5U4gyyjawNFpJC/bUkldmvR4YpkXkHvqcYIMO7WWYqGjywtd9CFEU7xWU55VT486irsJ63I/OsnQcriDQVLvPWFGbsgL4wpyaXz+rotC5kcCLPS4LTaqztJF2uOdNeVn0zBQ3ll0xox9gxh7nDN8bEV/ILGEaEA1lPqW7o22+jc8htiaYeKZYRfRcW8YGGPKYL/PLMKTrh8PdaodvGqhUNKXUM9UNSlxMJAvsQCD/lQx2DeUazx1CDYpcHqDv1QoRFAkkrV10QmN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95850bbf-f56d-4619-55bb-08d995918ec8 X-MS-Exchange-CrossTenant-AuthSource: DM5PR07MB3514.namprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2021 19:24:25.0854 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-UserPrincipalName: martin.mena@outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB8173 X-Original-Sender: martin.mena@outlook.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@outlook.com header.s=selector1 header.b=YdhUZNKx; arc=pass (i=1); spf=pass (google.com: domain of martin.mena@outlook.com designates 40.92.20.76 as permitted sender) smtp.mailfrom=martin.mena@outlook.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.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: , This prevents the local cache from being deleted when the connection to the server is not reliable, which allows large files to be downloaded in multiple sessions. Signed-off-by: Martin Mena Acked-by: Stefano Babic --- corelib/channel_curl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index fba773b..4fbec5a 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -1230,7 +1230,14 @@ channel_op_res_t channel_get_file(channel_t *this, void *data) curlrc = curl_easy_perform(channel_curl->handle); result = channel_map_curl_error(curlrc); - if ((result != CHANNEL_OK) && (result != CHANNEL_EAGAIN)) { + if (result == CHANNEL_ENONET) { + WARN("Lost connection. Retrying after %d seconds.", + channel_data->retry_sleep); + if (sleep(channel_data->retry_sleep) > 0) { + TRACE("Channel's sleep got interrupted, " + "retrying nonetheless now."); + } + } else if ((result != CHANNEL_OK) && (result != CHANNEL_EAGAIN)) { ERROR("Channel operation returned error (%d): '%s'", curlrc, curl_easy_strerror(curlrc)); goto cleanup_file;