Message ID | 20191209151010.17768-1-sbabic@denx.de |
---|---|
State | Accepted |
Headers | show
Return-Path: <swupdate+bncBCXPLOXJ6IKRBWOHXHXQKGQERX5T4OQ@googlegroups.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23a; helo=mail-lj1-x23a.google.com; envelope-from=swupdate+bncbcxploxj6ikrbwohxhxqkgqerx5t4oq@googlegroups.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="sc4GkK/j"; dkim-atps=neutral Received: from mail-lj1-x23a.google.com (mail-lj1-x23a.google.com [IPv6:2a00:1450:4864:20::23a]) (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 ozlabs.org (Postfix) with ESMTPS id 47WmpS0f1pz9sNH for <incoming@patchwork.ozlabs.org>; Tue, 10 Dec 2019 02:10:22 +1100 (AEDT) Received: by mail-lj1-x23a.google.com with SMTP id s8sf3415725ljo.10 for <incoming@patchwork.ozlabs.org>; Mon, 09 Dec 2019 07:10:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1575904217; cv=pass; d=google.com; s=arc-20160816; b=O8xX44BUgFt7oUpS3uk9NBp1+gWwKzqafMS1KOF7lmJTr2ENRgNqQ3tLBF8VPcHfO/ kz2RiNhdsesUujuPZwAyT8rO64XIKa4TJaz1TlEzpmy003AbqGGydQZRuclRf64c/Dqb 0otyeWNJcgRdq9k7J7b/gX6tVmjM0TiM/WT+tQTBS+xCxkQi8QqNsOkxoFJ0gn/htcqt rXgq8jnz0/VvhyOIg4rJvCnB7M7ICKLC+tZ1btR9sDx722gp6UhppRswpZIZOhmgDSly EbeOEv3Urx27s7QFF5prCRfK7866KOM9ZZWe6w52yS161Nix/s4Rw5hAPbcl4jtOLKb4 3cBg== 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:message-id:date:subject:cc:to:from :mime-version:sender:dkim-signature; bh=au2YjmK28F9awDHqBsDhg04yrVmqWgsxpVRCdo3SiLA=; b=lo9+IDm2Meo5mPpGRR9bVgRXNBjbN+TfSQZBC4Z4LWsxL3IJXwUaveLv6oYJAn5ZSL FaelOs4Icz1sl56qAfWy4yKmRmQzoWd4TblOzAkaipupQigOQcrhJDZ4Wje5FZucJW7C C9vk+d5UIlTmC9eLwocrVQgZ6kiKhjxdvw4XnVu+SIh2pEyTXmNxjFOti1mg1vq00Fby jYFNgrBxLHZvBFzTUZ0EXrDrotpnx1q/1364CBMeAmX6z5cCh6becTK/Pt1/Mp05FdWU y5ZdD4ketZf0+xhohTv7XQ6lcDYgKwy2+p2FRCasdyuAytp6DMYkED6vKDBAkDLUgYyN yaJQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=au2YjmK28F9awDHqBsDhg04yrVmqWgsxpVRCdo3SiLA=; b=sc4GkK/jYSo3mFpNUfEWXBCAypaTRAbdmqAxjazHsp7FNYXtBAQ+XtaLMcM+dQDaxD 70pQ5harG4Uour5apoRu57Qd9CIL6nJVjus8stYNGQowtlVqqplMuLMyqO+njxhuI60l /oBj6Va43GClPPySRD105+fvmAHbHSzMY8QQ697WCMRt51cHdWqyF5XM7N0gTsDw+C6K rrV7B/0zVkB2eKEO/7vYFlgPob3WZE6xO7Ehijlj1jcx/2hGn0Zm7h8/mIETog9URAiR i+QJO7wmoldKmKfKA8qJFRRGtZNC42NSIP/ndZIphSU/pI8a1i4mafHwqF3bfvH2JV2H gm7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id: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=au2YjmK28F9awDHqBsDhg04yrVmqWgsxpVRCdo3SiLA=; b=CjDi07z/dzz6oFOoVE1WEOJeZMPojo3MXaU4fjLQtFgXFIn2Tc6ttWxqSXUjsVEy3P wDaSx8Bg1IhbjZE5rV6L1Maw/ASvgzxxVIgJrJqQffglAt3MjEIXtm23H9ryQWx6hmDl hLZuS17Uc5YjeA3yhO72bfbATOW1YKZplLm20vzJ85I0jC/4hIpMKYB05uVcunhGkFEt ZnNDqMHLcK/WmENL/gnzl91auhyOVH+WqYXy1B2OGLqnVRJTTaf5N1Iy8C2PJD1IpdAk LpqiSq98hExGt5a6b1mZXiCtkgIv30bAMSwQOcyQguZd2py9johH94UJpR780nOjZt20 OwhA== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAW8jHY10x2knJoO3MSV9cJO69pYsSSeniyTveTYqg+i1RZ4g9tn HHsPVX+Zk4uoztHjDNkSzKU= X-Google-Smtp-Source: APXvYqyAmlJU5GgK8Yy4KZG2F+SzrkpVSv4wefsLOdTfa029oxfeQb1H854Nr9QGH1UzLa8F6WEJrg== X-Received: by 2002:ac2:4a89:: with SMTP id l9mr15485358lfp.121.1575904217787; Mon, 09 Dec 2019 07:10:17 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:1b6:: with SMTP id c22ls1986829ljn.14.gmail; Mon, 09 Dec 2019 07:10:16 -0800 (PST) X-Received: by 2002:a2e:99d0:: with SMTP id l16mr17580040ljj.1.1575904216929; Mon, 09 Dec 2019 07:10:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575904216; cv=none; d=google.com; s=arc-20160816; b=tvfZG+TP8QxRwQtCRKITt0Ltbd4X8DzgimgqoE2tb51x5y+DBXdMvQTink1Psd0bgj U9qHhX/eBdXi/iQfHToGAJA4UC8W9W+2dHybBogSXz9wVSPGA4B+KGrd825JA5aodMjV 9aWznGNwxagth1JVReAZXTh0bMdDfhCs5rVmek4OPKWEBVfaM8+2db5dTLQdtEWaMuqR jZASxrpi0H67rsC1VE3RbDYb9c+LtJM+NZOZWqlBtZ+YDM1AOFeFxJIOD9frKp+41etm J3FIdFSqRna6Zil4+i2DlG8zczl80Znmc/MHEnSIWB/xJaLTAH/2DV7Z5RQAsSnr2vZL SQdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=Hwdg//nnQzBRjanlnuNuAre8FF7bZpWoiyvR4+FKYwE=; b=NR0SRMBwDi51SXvNprYYS4X12fptlXYUHFUg5a8qP5twyOb2ijmyaNgQl7GEyvj7u5 j5U/jHh2ZXnIXN5wxFxvEKF3LH6zN/a8gSMjaV4dAWvhEiOSLykPYB9Uye+GphpE2K1d GficXS6YJfpxkXxzuho7vxWd5QOAq84TQ784fVWtgefdAuBEzl+oUH+cCEjcMZ2FTN1F 99tBvaRit9Q7lLlkr7PqfGcE6VmE/55oAW8wZV4KrkL94oYHYOr+wQ0CnzjFT1PZ52Ti 7ZCosOwiv6onrR7hJg6F+MsXivP9t5SySS1JVFyQ8RS/O7OPIrXMpwl3wwxAMmoJ6sOk JaJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id x5si3815ljh.5.2019.12.09.07.10.16 for <swupdate@googlegroups.com> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Dec 2019 07:10:16 -0800 (PST) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47WmpJ1qDTz1rjY9; Mon, 9 Dec 2019 16:10:16 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47WmpJ1ZzKz1qqkp; Mon, 9 Dec 2019 16:10:16 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id qgrvtDhRtWSC; Mon, 9 Dec 2019 16:10:15 +0100 (CET) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Mon, 9 Dec 2019 16:10:15 +0100 (CET) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 57DA04540419; Mon, 9 Dec 2019 16:10:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([IPv6:::1]) by localhost (mail.babic.homelinux.org [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id aOTaBWinghZp; Mon, 9 Dec 2019 16:10:12 +0100 (CET) Received: from papero.fritz.box (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id C3D1D45400CA; Mon, 9 Dec 2019 16:10:12 +0100 (CET) From: Stefano Babic <sbabic@denx.de> To: swupdate@googlegroups.com Cc: Stefano Babic <sbabic@denx.de> Subject: [swupdate] [PATCH] Webserver: drop multiplication factor for monitoring Date: Mon, 9 Dec 2019 16:10:10 +0100 Message-Id: <20191209151010.17768-1-sbabic@denx.de> X-Mailer: git-send-email 2.17.1 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: <swupdate.googlegroups.com> X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: <https://groups.google.com/group/swupdate/post>, <mailto:swupdate@googlegroups.com> List-Help: <https://groups.google.com/support/>, <mailto:swupdate+help@googlegroups.com> List-Archive: <https://groups.google.com/group/swupdate List-Subscribe: <https://groups.google.com/group/swupdate/subscribe>, <mailto:swupdate+subscribe@googlegroups.com> List-Unsubscribe: <mailto:googlegroups-manage+605343134186+unsubscribe@googlegroups.com>, <https://groups.google.com/group/swupdate/subscribe> |
Series |
Webserver: drop multiplication factor for monitoring
|
expand
|
diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index 2b71119..1d95556 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -394,7 +394,7 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) * Check if a multi-part was initiated */ if (nc->user_data && (watchdog_conn > 0) && - (difftime(now, nc->last_io_time) > 2 * watchdog_conn)) { + (difftime(now, nc->last_io_time) > watchdog_conn)) { struct file_upload_state *fus; /* Connection lost, drop data */
Commit 37089b0 introduces monitoring of the data connection when an update is started. The value passed with the "-t" parameter is then interpreted as timer value to check the connection, while a broken connection is recognized only if no data is received after the timer elapses at least two times. Drop the multiplication factor and check for incoming data when the timer elapses. Signed-off-by: Stefano Babic <sbabic@denx.de> --- mongoose/mongoose_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)