From patchwork Mon Sep 14 14:57:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1363683 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::237; helo=mail-lj1-x237.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbt4j735akgqev66ngfi@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=p6xj8d7o; dkim-atps=neutral Received: from mail-lj1-x237.google.com (mail-lj1-x237.google.com [IPv6:2a00:1450:4864:20::237]) (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 4BqqGG1gnDz9sVx for ; Tue, 15 Sep 2020 00:57:25 +1000 (AEST) Received: by mail-lj1-x237.google.com with SMTP id 184sf5763449ljf.14 for ; Mon, 14 Sep 2020 07:57:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1600095440; cv=pass; d=google.com; s=arc-20160816; b=mrJ2UpyF07L6bC3xYzCSCDjvVWUcCZyFwFn+8jEXbjw3sJ9ffklxTwXYuipZYlZai1 LyngIy/w7kiUBzV42qA3FP7s+wQIhCRp6ldTKTvcP2NF3sgpLp0xIC8Rw5x9+gSr45cG qX97dKeZIN7GiyPju8ttppdXjXqUID/3gFCUNmqjbior2lJ8rnMAGRAzt9yrlo+pKnj3 9x/HBmDHc6Xoe+rvrNMExIdCxTuc1aS8YznBvq/DCfXVtOHdv4gE+xfEw+7zdeBkB0/P C3Pmnb3JtNWH8NUEV3UXg2nzluxIKRS7JbZBVgwxsiXgc05WwA3rwxh460zufUsPyKrI +4xw== 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=A4EORirjlm0psxjAIdmMoLaRq1haNsMT8qYHQU1zWuI=; b=N10Q1eypUcwtYo8eCek4vAd5QeuzppjzIhVRtIXmLTCJRdQ1L7bzM8+7HKxrpiFSxg 5Yc3jqy0ZY1mm0lzOTJsDtQKJVN9+2/zXmQth1TOX+oBuqIC2bDQpVZBVIrLi0h8l/i3 hRFGH7VNtJkJfhyVp5bchyPbyhV3Lzw40IF80Cxsf11ivv3YtxCb7yIUhdjW2q+spQOn I8K+3+nKeLkdb7HmYFeolqJcPAOmm/gbagYNHpdGWD0WmTj78SLVjaalFzBdAjGIRaRv 3G+hvB5sMqqeiBncoazfM2MXQOqB0ZMwbqNjrfu3iA/NICJODDtWuM7XwKy2scRscOI1 4g3w== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 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=A4EORirjlm0psxjAIdmMoLaRq1haNsMT8qYHQU1zWuI=; b=p6xj8d7o/2PDukfbLHLX5QdZHW0qySkeU5WM5uK5cfDTI2uXkKqpV+6w+da6p9MNxu pjEfyYKNLeOR/uj+Wi8jbjDIRGZxNGHKmJutT84SESbDXSRLIbxk14okiT48821CHYfY WSVuo01bIDfFcB5ERKghncpBg/WE4inFQjT4FaiEUjurO/KRoLdhEnCb78M0FY+Td8R8 uhIpyfeef8HGGv41cGXnAF+ZCnXwVhlIeM9k5yR/Vz1gqhSdU2DNnmnGjajLl3gUZzGE N6ShzR5JrVkgU2kF3mgQu03JpLh8+V/nMo8DY5gjTApsGIQrmWs6NQlQvWa0UZBjv+xX hqBw== 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=A4EORirjlm0psxjAIdmMoLaRq1haNsMT8qYHQU1zWuI=; b=g+sGtsT4rPlB4lrMrZdm38rre1AjLgkuk4P6f8/N5a9JNa+XkxEBWE8iL87tWhkym1 zFbpzTIJO3mAyXdL16M/ifKqV1902aeEwAS6KYja6iUTLGdMUPkU7+4gSuSZEZkXn8gJ LXBe4FUy/OvV8AwXtB/KPz10A7R6/YiQa2mIWCc/b5fKni2dJoWBXswjl8i5LFgCozhq zAbiBm2JG6lxSBMmLfbpBTdAypxgGvVLNV5V1Wvn8Ea3Uumo4P9Xc/EPWYkSVp3rkyg0 Dw4u3LvvktN+4iCIyxyBchk/Ll7XpIkBrc8Ltif3OGZUn3enzVM3TzfOxy9Xx7Vq85Zu nKPw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532EXIpci9M9VCcy3JMuyT04xTXJhM01CZhHRldcqx7J1sJub1NM SlPqfmYTd+xHY1qlvN57ovY= X-Google-Smtp-Source: ABdhPJzvk/2fbTz7wCaUj7llJz7kNFS+VPiDf+bOolSZSY7y9uePJoG3KcMsMfFEKyOofSaV0UWxzA== X-Received: by 2002:a19:7604:: with SMTP id c4mr5358484lff.132.1600095440190; Mon, 14 Sep 2020 07:57:20 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:555:: with SMTP id q21ls1439809ljp.3.gmail; Mon, 14 Sep 2020 07:57:17 -0700 (PDT) X-Received: by 2002:a2e:a550:: with SMTP id e16mr5693625ljn.125.1600095437716; Mon, 14 Sep 2020 07:57:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600095437; cv=none; d=google.com; s=arc-20160816; b=xqjwmZl7eGT0eqUc22gybax3t4L8B2NQcc1LwxgMjU7ugNleTha0Df0tsSO4E9uniB 0duWYWlrJ5T0LyDbvffVa4kUNA2qcVLyz7fvx7OJmudk4r7V9Cn/kz1Nx7Vn6XX0p9tV F0+qpeHbyWiyhchivavRuasHqz1iqMWvuF8AtsrnhD8QARiDAUvlvphQS5oUElcqYk+T KW7sSmX/Ucjbi2VSohNGIZhF21usjOi5XmFm+XyZ49AgKQAzEcDH6EpfyvV8J84MxDQJ sAFpY798GtmZdl6wPgfmBXt84vRYPFocbdD8h9qNfK0xsKnH4kMECAcseP2/fX9LV+DG rTtA== 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=Ouiv3odJOeVkWSIMWudZt77y/mRD0OdVwbhcBaXg/Jk=; b=l+bexx/6t/Z9zSyOD50qipnpuq9vSAOziU9nLs8qw+a/3Ni0M3C9HZ+LrChflAbmCL Tf5k39DjQi45TfiY8TbgH+ymANnCrCV9RgfcZWHlIvgrxWvuOrT20CuJQ5Ip9Qz3r6kr 6VGOQjqPtQhZ3epRKKhvffFjnf8x1gAAMlxcwkZRNcL63eu4WFSrmN9O2OuLjKwsthhC /ifTMjQtWkeILZRIO1P3IwycSPZQIje7koRaEmEwx55QtNL+YgcotXDTFjqze68oBODc b6vNVuFr2+EfuWYIO0kGXZ0N6NpZmeO7i3Vj7q0WP+3qaT/USjbXyv0T3q7vb1nvRyVg 5ZMQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id 11si260132lfl.4.2020.09.14.07.57.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2020 07:57:17 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 08EEvGfK004646 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Sep 2020 16:57:16 +0200 Received: from MD1ZFJVC.ad001.siemens.net ([139.22.42.140]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id 08EEv7pR008872; Mon, 14 Sep 2020 16:57:16 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH 10/14] suricatta: Adapt to CHANNEL_PARSE_NONE Date: Mon, 14 Sep 2020 16:57:08 +0200 Message-Id: <20200914145712.4989-10-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.14 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: , Adapt suricatta modules to CHANNEL_PARSE_NONE instead of CHANNEL_PARSE_RAW where CHANNEL_PARSE_RAW was used but the response body actually not. Signed-off-by: Christian Storm --- suricatta/server_general.c | 2 +- suricatta/server_hawkbit.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/suricatta/server_general.c b/suricatta/server_general.c index e346295..57c09a8 100644 --- a/suricatta/server_general.c +++ b/suricatta/server_general.c @@ -106,7 +106,7 @@ static channel_data_t channel_data_defaults = {.debug = false, #ifdef CONFIG_SURICATTA_SSL .usessl = true, #endif - .format = CHANNEL_PARSE_RAW, + .format = CHANNEL_PARSE_NONE, .nocheckanswer = true, .nofollow = true, .strictssl = true}; diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index 05337f4..95a0a8b 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -316,6 +316,7 @@ server_op_res_t server_send_cancel_reply(channel_t *channel, const int action_id channel_data_reply.url = url; channel_data_reply.request_body = json_reply_string; channel_data_reply.method = CHANNEL_POST; + channel_data_reply.format = CHANNEL_PARSE_NONE; result = map_channel_retcode(channel->put(channel, (void *)&channel_data_reply)); cleanup: @@ -325,11 +326,6 @@ cleanup: if (json_reply_string != NULL) { free(json_reply_string); } - if (channel_data_reply.json_reply != NULL && - json_object_put(channel_data_reply.json_reply) != - JSON_OBJECT_FREED) { - ERROR("JSON object should be freed but was not."); - } /* * Send always a notification @@ -433,6 +429,7 @@ server_send_deployment_reply(channel_t *channel, } channel_data.url = url; channel_data.request_body = json_reply_string; + channel_data.format = CHANNEL_PARSE_NONE; channel_data.method = CHANNEL_POST; result = map_channel_retcode(channel->put(channel, (void *)&channel_data)); @@ -445,10 +442,6 @@ cleanup: if (json_reply_string != NULL) { free(json_reply_string); } - if (channel_data.json_reply != NULL && - json_object_put(channel_data.json_reply) != JSON_OBJECT_FREED) { - ERROR("JSON object should be freed but was not."); - } return result; }