From patchwork Mon Sep 14 14:57:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1363671 Return-Path: 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::437; helo=mail-wr1-x437.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbsej735akgqexnf2q7q@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=XlE2nptJ; dkim-atps=neutral Received: from mail-wr1-x437.google.com (mail-wr1-x437.google.com [IPv6:2a00:1450:4864:20::437]) (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 4BqqG52X64z9sVw for ; Tue, 15 Sep 2020 00:57:16 +1000 (AEST) Received: by mail-wr1-x437.google.com with SMTP id o6sf6993896wrp.1 for ; Mon, 14 Sep 2020 07:57:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1600095433; cv=pass; d=google.com; s=arc-20160816; b=QOlVaJTUzgcHB6/nlwV0IxTiY+tD6MJDGyU2iF6ygAE0uM9/TWj+U9WZcFC+H15eM2 EBNOAqd/Ema8957FG+6Qufe8v4hjv8DJ5ZRzjkIjrjkEdulu8yJzrCy5PDwB3dIROr6X vEbqYpP+4A3zAkwmex7AA+1c/uFLHaAU+CXI1wBMI5vJG3bV/BDGr2HowOcrIoS4GQi7 ilL4DkoJb5y/TG4pKY+OkTGPKeIuAROT+BSbvI6HPdu8DtCqKS4X788TJKnqG+RnzZBy Wc00dJ9BE22zne/OYpaa1UEHOHj0Qczw8j6tsc6CGvFpZEyOmf1nb5q4rYdgqn/BmblT C6qA== 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=WDjAYla/F16KwVA4W4rCpDZpvtU9peFaAFnVEX8ckq4=; b=t4M07zS0swOZaAkdBrca68b6361HfGm9KwzgaiRjkAmmT9/mN92umCGxrfGiF0nel7 BkN5bwpbgp7qdyZmx1/4nD0UcCZwm4cT8Cn/w+By0qnQI/sLXLY9wYkCFA3BeIp0foAw 5nOaJ52xe2GX66nvaczEK6kbMQ8QdFNdztZeUu6DXjNK7F5DUtL/00MmXn6lJkysGDrQ Qda93JOM60PhmF5HouE7DPprPmS9tsvIZhOcdfEAL7v2pFeFDpXVL2Vum+txiXVdPzKS P9u0Qe7LA6Rp6ZUnRdOB0HMB2oNc2+PzJ461YC0WML0CyZOgce+neoyvx3TDsXu8U3fj NKmQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :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=WDjAYla/F16KwVA4W4rCpDZpvtU9peFaAFnVEX8ckq4=; b=XlE2nptJC9MXRASY90CREYwrNzl5nzcqtFRH2BxBe626grfw2bok2PWOnUcDswYjnS EPRurirDb8zPngL3BFqekIkdj2WYGCVgyW1relqkJAFp5xqmeM/dVKGUFJGBDHplLRim D9mvg4uiPVRjdSvdeQajX3fbDWZIgUkFDgwQq45wvDBUy8AnjcFOFDlARy0ft8Wge/7x HQIPvZ1UdOvuLKKA57fcWLGfFq9pB6jJ4oPVMlkxcxv5IccSMum8so/ydorE+JD/5o9y mWYlNQF7yN847rDJXCC75XUe/j8oLAFnr9lV3KCri+yajDsXSl7A3be2Lp0tCXmlCj/l 8jfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references: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=WDjAYla/F16KwVA4W4rCpDZpvtU9peFaAFnVEX8ckq4=; b=c2kSopmSNQS8DUDdTBzINqwAF/3kOcTrs9aImfRZv1f1YhN4PnTvhuRkgbXS2hYbCr XfWHEy37NxLP8Vr+LXJ6YJibkzWB2nK4na6LTrDImOfFODAxsbI3FMIL5jpuwu0vhrfK QCOdUXLIfxiQC8v9QRYOeXucJt1a9nleA0e0gVobUDTpfWBLheAFGWo8U0iB7gDNX5xr GO1fubpHb0dWPBwdotVZT/888Gg2Xf/7mQn8IxYqFHaYHplmGGZ3cFIS7sy7NCEjhDFM a8zZQCOKsqpGiQ9G1BkfjT0cRXfcw34ZGe1ZkrYK8rBW0wX63C6/1+mWME3dkkx/RRFG kS3w== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532+Y1YlHDGaqoQVb7ronx5B1ZYw0w57mIpdtCF5hkkciBvuORng 2/2+RjOxLaedAOflfDhemp8= X-Google-Smtp-Source: ABdhPJz3xnhj+isqYMvkpOfuh9A5rH9mrgfAHSUrqQnO4in5oOxjJqaW1Z3GmRApYPPNYklXijmQXg== X-Received: by 2002:a1c:1d52:: with SMTP id d79mr16389643wmd.82.1600095433181; Mon, 14 Sep 2020 07:57:13 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:e3c3:: with SMTP id k3ls8362342wrm.1.gmail; Mon, 14 Sep 2020 07:57:12 -0700 (PDT) X-Received: by 2002:a05:6000:124d:: with SMTP id j13mr17442788wrx.182.1600095432217; Mon, 14 Sep 2020 07:57:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600095432; cv=none; d=google.com; s=arc-20160816; b=qypNEFzo7qnm0HBC6MUhiwzwVbDjOtJdHSy4z/HzwzD+FHbwR6ui4Uw+huUpMeZmGT IAmtkg8io1AeduQbZtvW+gjbyF4KhbmhP6eJnSipEEMkUC0Gt4nUjmWyjcJd3mBGS5Y1 O7vftT9NPFKQNdv6MGKAIuxFRAnx2Wy7bfRpC2ub1ob/WoL7F8c/6SSXU26dgko+QaVj pitOjnO7tybcZKVcfA9zjjQZj9k0sTzkpqtpVcAXZWPnaRsln0QigZmFEy3hNrFR2hC5 weZGxojLNxbnfa42QNwudGkwps3fIFLLWeI9zCQqzLGbYXF5hgaENMdsda4/PeUKerwQ MIiA== 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=ATYmbPNVGvazgh/4maFoypTAt11VnE+yoYXh4es1sDc=; b=gR1FTHcnCjbebPfMgE9WC3zquPY4CDHTpFBQ+MhSmqPq2J460LMCaXP0zo4fRkFgQS N7jyzE9an7nhT8ATTNWXHi9zYafFVHiSQBZ+49vFK09jjlROQWqTbXGSyGite39hLEM1 A6ULf+D4/HgzrMUp5n+jdXIGZqkEgrnLhQRQMbseK/VGzYyjgIoHlHQN+gSXHRs26JSR Hcmcpu5HH5MOzP06wb/53o34TTL4TFV1Cy+xS2tdK11fl9/VeWrlF30b7V2COvg/uflw f/1KaP6JPxiUKSCLs6cKS14M74jIGVPtzLFsy3UUN7hOOnOi7peWiEURhvsiKW3F2DYS L4jg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id z62si336368wmb.0.2020.09.14.07.57.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2020 07:57:12 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 08EEvBFe022769 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Sep 2020 16:57:11 +0200 Received: from MD1ZFJVC.ad001.siemens.net ([139.22.42.140]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id 08EEv7pL008872; Mon, 14 Sep 2020 16:57:10 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH 04/14] channel_curl: Factor out channel reply log handling Date: Mon, 14 Sep 2020 16:57:02 +0200 Message-Id: <20200914145712.4989-4-christian.storm@siemens.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200914145712.4989-1-christian.storm@siemens.com> References: <20200914145712.4989-1-christian.storm@siemens.com> MIME-Version: 1.0 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.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: , Factor out channel reply log handling so that other channel methods like, e.g. channel_post_method() can use it. Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- corelib/channel_curl.c | 46 +++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index 4747107..4737037 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -712,6 +712,29 @@ static size_t put_read_callback(void *ptr, size_t size, size_t nmemb, void *data return n; } +static void channel_log_reply(channel_op_res_t result, channel_data_t *channel_data, + output_data_t *chunk) +{ + if (result != CHANNEL_OK) { + ERROR("Channel operation returned HTTP error code %ld.", + channel_data->http_response_code); + switch (channel_data->http_response_code) { + case 403: + case 404: + case 500: + DEBUG("The error message is: '%s'", chunk->memory); + break; + default: + break; + } + return; + } + if (channel_data->debug) { + TRACE("Channel operation returned HTTP status code %ld.", + channel_data->http_response_code); + } +} + static channel_op_res_t setup_reply_buffer(CURL *handle, write_callback_t *wrdata) { wrdata->outdata->memory = NULL; @@ -1141,26 +1164,11 @@ channel_op_res_t channel_get(channel_t *this, void *data) if (channel_data->nocheckanswer) goto cleanup_header; - if (result != CHANNEL_OK) { - ERROR("Channel operation returned HTTP error code %ld.", - channel_data->http_response_code); - switch (channel_data->http_response_code) { - case 403: - case 404: - case 500: - DEBUG("The error's message is: '%s'\n", outdata.memory); - break; - default: - break; - } - goto cleanup_header; - } - if (channel_data->debug) { - TRACE("Channel operation returned HTTP status code %ld.", - channel_data->http_response_code); - } + channel_log_reply(result, channel_data, &outdata); - result = parse_reply(channel_data, &outdata); + if (result == CHANNEL_OK) { + result = parse_reply(channel_data, &outdata); + } cleanup_header: outdata.memory != NULL ? free(outdata.memory) : (void)0;