From patchwork Tue Jan 26 13:14:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431676 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::63b; helo=mail-ej1-x63b.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbunmycaamgqectv2aay@googlegroups.com; receiver=) 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=baJrAhCX; dkim-atps=neutral Received: from mail-ej1-x63b.google.com (mail-ej1-x63b.google.com [IPv6:2a00:1450:4864:20::63b]) (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 4DQ6hj5KJVz9s1l for ; Wed, 27 Jan 2021 00:17:09 +1100 (AEDT) Received: by mail-ej1-x63b.google.com with SMTP id m4sf4887731ejc.14 for ; Tue, 26 Jan 2021 05:17:09 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667026; cv=pass; d=google.com; s=arc-20160816; b=qXUoXvz/tOF2ZgZO/Yxtog7zwo61hyqWDyhBMXFduQEsKYD7vwb5qIyPdEbQroWRmy 9masqosLQEVlQBYkNwE/srjsCTVtUQEKpHK1FeqLTtGG0f99cUC73AfFyFi9AWL2yH1S qPhF3OkTZwm7KE8NvM56/Qpap1/CBJ9cF9GXP5pJudzmdBI04cIz5qKJeLsAtfA1BwzL ufEYUm4rxblHygwobtn0j3nOo4UOoQXiXjX++Cb6/Y+IfFrC4bNML6a+38ayC+0KZcHD XWOZ0bL2JFnK20BzYjABJKb2SjKgzvnmjtNO8KnrPrqME40x57tD83HvadOKU1GHXljy SKTA== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=+C/MhoobtyZBgk2n3aJeW3LdSkhAhplUJqyh9TMJCtE=; b=lFopI/6Leg7IDNamxm/hIvVelGI/0wm9gxxh1FfcPL0OdQHfJUczcyl08VYKoAtHSm Ic5g+DBbCMn/XkM22zHRTivCvq7E5CukpZoUjLvNJ/2Jnyx/CHtDGUonb9GPjWuSg464 trJDfs0Pa8WphWA6ksPMbfaT6YvaN4hY8ISrBDRT73rGmolgTEHKeKZg7sEN42ZzsAqg cwL5nvRb/onHNC3c+e4dZjBdbSoCDstWiUbLqsAOuXbnYI/aoaC2ErfkDlZIXvW1kirG 8Jxwi07ojKK2Lb9sPEUIylVCDypWTkxOOp3/qzi1WluRLMHzHMopcXSYLJMclFWIypOw 7R6w== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="WEQpvj/g"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.58 as permitted sender) smtp.mailfrom=michael.adler@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=+C/MhoobtyZBgk2n3aJeW3LdSkhAhplUJqyh9TMJCtE=; b=baJrAhCXI8x40r/15Ril2T/ZLpoEdDmQZ9lup15H9D6SF/YyqrI33P2WrwZP8YZdzu rwQRdxEpyBAu1sOHsBODUStxgO8jy6AYvZg+S6pvpoIV/DTtw1wnn/8r5wOd9+6lntDq 2Ko1hS9VLIwDkBD8DOnH/7xFaYWsEhtcvm8FJgdoiubdJMcEpIXK3csRuWF1JQHSO9du TZmy7z30gV1LBxnCFnSSkHv9yEP3mHdWv0NWWN5ESzUPlXmReGhD3FMBVG8ipjoWB3xP ci+sUu1fWOX9tKSuEtYm21EDyWpU/oJDcaObst2MZUK3JYtZ15vyRiEBMlaIwc4IgsNO X8FQ== 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=+C/MhoobtyZBgk2n3aJeW3LdSkhAhplUJqyh9TMJCtE=; b=hXDOyJmz1Gj/glrHdJznsX8IdQxqL6FOFkcloRYIkaky10a7jMPKZIQE6jU5GG8J6g +LUCjStpbX7ZKqBiglEQZJbRkom6p00jQDqSfij9grRL232sK4bXJv6jLUP4Sbxa44MG Kes9HXQttcqrFdpzeMCDj9aCGg9gia4z6RzE2Y+2JDcxLfENnSrbY82iUsYGjbJONs/w PI1/7GSyQ6ffxEs2A8/S4p3oDBZIk8W+XkRXVMBn0u/J4J4FGa/JFfp9u7sqsO5v+jLw PrstzCQjNDsL+dWvDFpxrafbl28Wn6WqKAz9RIFnTRi6gbSQGGkBwghjiXrjtBDSQhnO +ZzQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM5336CrEDt+B7JoD3Lt4qSaVttvobZvOWAmyj5Anr+5+3DMWUUhN+ gP5GJFWBjbsvUnqQC43HGQs= X-Google-Smtp-Source: ABdhPJz8RoB2nx0a5mpg2hAJV+8b4msCxo76hrsjVl/ABjDMxm3EbY7rsbxPqM/1ZthOEgvXgvKjMA== X-Received: by 2002:a05:6402:4391:: with SMTP id o17mr4586766edc.196.1611667026250; Tue, 26 Jan 2021 05:17:06 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:906:994c:: with SMTP id zm12ls946092ejb.11.gmail; Tue, 26 Jan 2021 05:17:05 -0800 (PST) X-Received: by 2002:a17:906:abd7:: with SMTP id kq23mr1492539ejb.292.1611667025298; Tue, 26 Jan 2021 05:17:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667025; cv=pass; d=google.com; s=arc-20160816; b=Ser9zCnwll6Dya2T3YvBAEQkrFOwgKHP11jmuEKDzbmbeYoxvyAx9p3nkXZCcFyfmf 69fKqFkI6HVo4PdUcPIEEeoHSIBnuyVWcHlHyDs/N+TGMYM2Qy+EAZbHaQ48KushhvWY j0WF8g+8nmBXDVrVW6Y1h5lL3oPn4Fme34o5bggVHfjeSbQnN8tUYDdZKoil7HBYdpyo PXXOw44e2sW7jdO2v1OwztowxZVkcO38D+Vj7sfG7IXhqjHyKOg/le4rsaGCbYxHZBPl IaW+pD5txsDL9gnRDApaKlvBWtorYCBri0fpAqu/1gLcIQbxhYxj3bFmtINXiedNQC++ IQ9Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=EfFAjs4hWqu4wqEGyhbKTeXZOuEVZAbrh4Azs+ssmds=; b=qVLaM4eGBAybp/sME2olRLVADzN5Rq4SUzPlropWy48G7HA2TRss16+jDXbMcTQzPc ZfW32b52yTi1YMTb4qM/xHMGeR9tzkk79/3drVpzgfST/fTJwG5Pj5qfhAObqgmOEOvb k+5yrTABHK+IxksCS00nUhvIV6m7b3Vy7BkqZvxUTSlIJpFdTCgH+cLC80OZYIInJrNZ 6wNFI//H0lgBpmz8vtyWlpHUyG1VbADY2peRyHElULdlkxlqibAEH/PfVyq9SY99kmVl N7y8vYOvrOGqFsM9j4qSHwMfqP+4PQrSoZvdK9X7XxC4yxXDZuzEK2QtZNnsSfyj5LHq 70zg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="WEQpvj/g"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.58 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2058.outbound.protection.outlook.com. [40.107.22.58]) by gmr-mx.google.com with ESMTPS id m5si752801edr.1.2021.01.26.05.17.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:17:05 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.58 as permitted sender) client-ip=40.107.22.58; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d16jIil0Hr3AAAM5oG+o6MaR/8I7rlC4/pq35uQyl22J9N0ORJtIFY1E7xZEJcVMUOBP5yOZUxjmdwf2J4GLb1QFQGIbs2w/WBKS9rh8pha3sn6gRaHMg2KnCM527pu85/YMfPDsPkGRCsCWwAKWpayG7Z/ywfJtVep9mq42dK6nMyG7vvsKNz+nQO2nv5LCfs0pIUjBR5en/JR0ska8qQtDC2XeN+MGmFWJVAN4J5Hd/LpPDO6MG4BEa4saw7KmSYX+Gw3rR2jf56JPSGCnzVsANOKBz1TT6FieeAHzVmZkuHS8w1m9/OsVOXzUG0ajTKBuQpBWEWSRz1WaVtVFtA== 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-SenderADCheck; bh=EfFAjs4hWqu4wqEGyhbKTeXZOuEVZAbrh4Azs+ssmds=; b=WB5QNgiKZmCp/5zUJrGVnr2Zib1BtPH5EbfqBRNcD+GPLXGBWvCMag+dyQi2b/NG0lOc6Otv9gqYxRff+6IhYHyX/YuZWBTleZ/yrCspbUlVv/xdXjW5Zjq6Lpyr9JvmalDRmhFwhY2D286DEHgOHZqQ1dq5FXXoE2tj+sXahIJM20qORRUCT60SquIi9kHIQRELFtPSdYLS3/V5fNFdHZv9r5KlmoTJh3cBfiPx+XxQ6QJCThDBCZSM0DhP/MGqHxSr30VqxyTLfGILndTqsLXwG5VzObZ/XgUtznbZSkieh9fLO/3tn4MdZw+AicINVpxeuEb8M4iOqmXAZ61yTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM9PR10MB4611.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:269::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Tue, 26 Jan 2021 13:17:04 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:17:04 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 1/9] Enable tracing for early start up code Date: Tue, 26 Jan 2021 14:14:04 +0100 Message-Id: <20210126131412.3567-2-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0020.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::30) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0020.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Tue, 26 Jan 2021 13:17:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a9d2a7ae-123f-4b83-6dcc-08d8c1fcaca6 X-MS-TrafficTypeDiagnostic: AM9PR10MB4611: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jWlTKOexonXoRTUmzChADh4rQqQ3km0wLcOpijkSnCK7k9pn0gmhWblH+fo5EEdr+6PtvH7Z7QKSmfnztDCZhvHAE6iqrTXX/ZgqzvYEVE8/0XfIMwsSh9ZrXGcNoc+oQq61/XhsvCGlV0eZKSU0PrK0HIw0bcfOIJ9sAOn/Is5B+XFsarFF2iMkYCP5e8dCGja7yfIcLwoadr4ZZeo/AJT1BLRqcTrzJ0JZmKXi25jBelyIAxAfIi+jH/7jepdTWZHEMr5fWGilMCtz76G0IDEG7oUIvGb0OEOYRC8hY6e7OMN+JyQlDKAKK7a6OV9V1xlWCNIpIphfiYi+li0JQo7N1qLQQgFeC6WHKyhIzftBumyuu0uEqmE+DWYAtSdaMUlPyBS14et8yNHYxQrt5g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(39860400002)(396003)(376002)(346002)(136003)(86362001)(66476007)(956004)(36756003)(66556008)(66946007)(8676002)(5660300002)(2616005)(6486002)(186003)(107886003)(1076003)(16526019)(44832011)(478600001)(6496006)(26005)(2906002)(8936002)(83380400001)(4326008)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: AfII+U+iFc2tWwDd5jLQovHWC/DHf3A3zWrXzl34zJpjLUH+VwBSsp5taPkL/QBrkkkWvjKr+GNR4cRC1c++HERJS2ItzBf2ctwb37KQ/VpZvQXr5mRT12iJXKqBpSng4g678WE6kUvEriN+Mz/MU1P+j3jh6H+lj4t0BbHE/lpfs2PbZua/qemwO33ahP9o9Q8HR06XCIpEFt0zR+EJRIAcmPCUKT3oYo4MCVvvuETRGr4nwXIiruAtq6qa34hNEspofCgaartuAXz+FPwqqtaLKv2oqUomvX5XPeLYXN1u2fDcLhaPiOO/NtuF8xqEKLqF2n/Wds20RopzYyvQyqFS3K2ObqNjbcgYgttW79KBEvik+XvAqeiHm+TS+XTcug6fimegrZKVuNX+YWfTcpIVwvDE2mrqAlq4O3DWa/9R0gZsntxImgvrJRFrRml1y4bd3Gq+/HpBc116BuKNR3fQe1P03x1xGf0YF6Us0GeOqDim7Lp4NU7K/lmzTpZo6xH8JDYs8mntDpGPYuJO2TB+e2D5pVsJPYVYlZ2VGmMPl650GN/ZkfdClKAPjipO9u6WMguO7H531dZQZWZxCEIOB5npGc71QuOcGTcFEgQhn8ykE9Y3MGzp3JeMNeCytlZ3akjasekT6TCiiLC/rcN1xDpxqqn3NWpBxST71T3Y79GyTL6PY3G8ttcfllgump3OvRLri0EdsFo6uJBFZyr+cry55elKRw5LBxcrblqWQrNRLwbs+x2006RbHbWvSf9JARj1bSh1pyMmATTDykKbHZGJFxee+imqRZvbiIh9ENINWZaGif6B2zv/4IGhBhEKPpvUXAulQlHZWMcbx6D0DZ6O2eRUmeQZBhYD/GtZvvn2RV82fD+uNasTZuXZEUXwDBl/C8yW3QNBI16Yx68s1NOLFicRos9KjLpF8lPC7CEoU1J4d4gdiz+GvB36A4wiiFuiJt05BFXSPZhMpg/QlO/tk6+JFfUtqw27u9msMDLbi3QpT7bYBTu7WCjrjs7AaEu/X3qCuQpPO91mVfRlqLgmrc8BxUiCabEgLPzq4GUVumnEtVFa536FBV4Q X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9d2a7ae-123f-4b83-6dcc-08d8c1fcaca6 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:17:04.6592 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Z+vELI44xHqn75VqPeACkoMa5sDAMyrtKLumFxpZduBulot6qd2ZN4enc7tLQr3c+v9Qjklu2tUSsQ0roljb26QUfLdjkxcHHvxkSOdbt6M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4611 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="WEQpvj/g"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.58 as permitted sender) smtp.mailfrom=michael.adler@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: , The current behavior is to set the log level in the *second* getopt_long(3) parsing stage of SWUpdate. In other words, all log messages with a finer granularity (e.g. INFO) which are created *before* reaching the second getopt parsing stage are dropped since the default log level is ERROR. This makes it (unneccesarily) difficult to debug issues in the swupdate.cfg parsing code. To allow for config overloading, we continue to parse the loglevel a second time after loading and parsing swupdate.cfg. Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/swupdate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/swupdate.c b/core/swupdate.c index 4f008e0..788981e 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -516,6 +516,12 @@ int main(int argc, char **argv) case 'f': cfgfname = sdup(optarg); break; + case 'l': + loglevel = strtoul(optarg, NULL, 10); + break; + case 'v': + loglevel = TRACELEVEL; + break; case '0': printf("%s", BANNER); exit(EXIT_SUCCESS); From patchwork Tue Jan 26 13:14:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431671 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::23f; helo=mail-lj1-x23f.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbtvmycaamgqeqqtxnei@googlegroups.com; receiver=) 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=CrSLG648; dkim-atps=neutral Received: from mail-lj1-x23f.google.com (mail-lj1-x23f.google.com [IPv6:2a00:1450: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 ozlabs.org (Postfix) with ESMTPS id 4DQ6hf20q5z9rx6 for ; Wed, 27 Jan 2021 00:17:05 +1100 (AEDT) Received: by mail-lj1-x23f.google.com with SMTP id m25sf1475961ljj.9 for ; Tue, 26 Jan 2021 05:17:05 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667022; cv=pass; d=google.com; s=arc-20160816; b=y5yPoVNcme+vU/hiCYva3+zxH4lO9njcpctsdKRAaP5CkDYX0MFl9oU5hc1xs3oYkf S83UikkIOAQGwFZ+X9eEZtx+Xl6tH8eh7yEcx/u72WPFuzTiXEtxgWf05+B2RRmTwmdY zeHHIpvnpD4UC7oz6Nfqk5SIZiHUknyEtbTBGIhDk5y21X64Coh70elBWBFoL+R1HmN+ aPmEf+6YmdsDfbmTJsBNtwueHS2C23KP29x1ElGkP2HLJkn7E9MMZZGxOe1V6nZ9ypm3 xqDJTDE8p5RcdB4QfDCcLr3qE9Fv4/i6SqjOuYNHmLgyGkWlQy8qaMUH35OVALdlRLUH /h+w== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=0sSsZL/5bk/ZfYWdnKatPnReAnQ9iuzMoBYco4w8FLE=; b=asNKYlC0XTU8UlDc3qgUb+p1uWDOor29QZzS9CSyva6sB9DXeCC/LGGVIYXIROIEA3 Nus7w/ZMkzakN+PbdfVlMBXhkGAgXsQSXtcOeM6kbhmBXZNn6Xj4PQJETGVAspARqlmR YwovwrTihrM1nJ7/y0gSmv/idhTmtn/4MSIW84XOVEV8cswKqOpppVBKe3BuHunzfvC1 m42l/r2WpiztGPrP3odj9TdSqFO8EOM15UGyeUJNkakK9BdWH5Wo3HzqJfUnyz7ixiCj jPVqyZG7EZvS+A//5sjQJ3aSJRVYJoXcg5UCJzC+TxXm2Y60YD73uqEUhTxkuN82k/aU 8sSg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=WG0zrgdY; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.8.58 as permitted sender) smtp.mailfrom=michael.adler@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=0sSsZL/5bk/ZfYWdnKatPnReAnQ9iuzMoBYco4w8FLE=; b=CrSLG648COxwnBJVXWiBPrwA2MfhecvCOve9QHePJuqC9xaIXSZVb70gGlJQu11EqJ 1Uc59C0115eNTYNuEGJUBw1nLacGzR37DfVdAYWBau0rIpgwCzVU5yFio7jZD4Ga/Baz OTYVCiaz331PAO7MQxK30XheN0uLMER0mHMQK8ZbzXdUokgZETQEHU8Egf9i71VikmuM ZG8cA+Yu4tDnmHVUgfV7O92Cjxk7eyTJdUUKJ6Xlo2uI4J5zZRtJi5OF8bl5XL5EW1d/ smE5XdkEINU4hkrQT0mK0xY0+ZhMYLwQceYVIEKPv9Ng/4Y5hNxVkljnNMaexjfjGQib 74Qg== 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=0sSsZL/5bk/ZfYWdnKatPnReAnQ9iuzMoBYco4w8FLE=; b=YOG0KqfjNGQ5poOqVdpLVTdDkyJIuYiXuVLim23qTrTo4Ro2TQYGwf0e2eijUw7EGa Yo7/bbzg0+pADi0LlDgCLPX/D1VW/b4hHKyvL8N5ou0LjaYgDc2oE6c+WkWwWxk28PI6 vdqdNoEzXpp2nVcJK3/CxGmz86VV1pHx6SiRA21LBmb7ny4krJlCnlx4oeQUiKcU8Vnn 4NysrEwtqZ8iEtIAWrOqWNzWjNwImek7wwJeTwarbOcOs7+RiF1zVrROaGTwoJy4PHJH 9EYRDUho6ZoaMt1edX34626NAC0jH+e8gzkDvZjIxVz0p/MezeoY273rg/5lznKuxy6J iyhA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532Bm2TarzqBulpMK8XI0rsl/LNGQ08MpK1JjBNHNypM5QhABA1u nzOmwGumjG6OwaYTqbdPZWE= X-Google-Smtp-Source: ABdhPJySk7xDom4dTBVQM+eZfb6b+UQJe50wAmCOGnIsXKKcqS9Xa5uXk5l3HK1CMLQVNSVbEKMM9A== X-Received: by 2002:ac2:4c07:: with SMTP id t7mr2560514lfq.89.1611667022492; Tue, 26 Jan 2021 05:17:02 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:ac2:4adc:: with SMTP id m28ls497229lfp.0.gmail; Tue, 26 Jan 2021 05:17:01 -0800 (PST) X-Received: by 2002:ac2:561b:: with SMTP id v27mr2703914lfd.233.1611667021454; Tue, 26 Jan 2021 05:17:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667021; cv=pass; d=google.com; s=arc-20160816; b=UZMzco15TI5W3MVjlLwYJQ8KGG24sUg5IgzAb/Ly3ezAxlM+DAdWy6jYWGftzPg5rC PDrnivITEVYasFl+GTRhKFh4cX4dBn7ThpITYj4Cnys7PVImPqHML/7Q3RpXI9jBNp4H fioxpHEY0cKPwLHhdJS9/uKudXNfUQBD6cm5UxTufLUnzqZLNWtHmXH9uYeLtwiN5sfC rkWB1EvDn5QsY/I+MVq2WpKtIKeYvhUcg0YSaRO9lYzBvcK6+njjKcL8MdaIXB15iPRC orJPB1PAWTSQNFtsflmlAhlrPmF6r9p3Ch8PoNH1VsFTU6hKoxCyUNoCCe1J1gmvZrXm ccQQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=nNUi6/LDFXEXFfmtqDYlicTJ1nWxI62FlDs0HEEFqW0=; b=rmradgxjsYpGZJvqnXiW8pv4UkV3FVhBEL9JDXJcSOHTZlQC0+w8xbUORFn1VFmAU0 Yppmk6cPQEt/VL0boqjvZxJ+BuW1T/fz7EXr6qQse+sFe2tB3kbpx3ZWWCPqRnaFNHtw ZqACqf+VJe4MCKlOUZtpwGVGwrrbwrYpRPh28dmAcIaWoxcoyoT59XrIhnFGM1tccS/r cZQtRFFvF1ZikoFcg2P2oaSnFMQKpoguSqp1y4m28VANM6CszKM1LlIDLGlAdbCm5/JX UU4ZCyeUbqDt22rs3bSmX6zqvkFnitsE+6jJYCNau16yCfg1huT7n6OY2gbWiWHXY10T W2KA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=WG0zrgdY; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.8.58 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80058.outbound.protection.outlook.com. [40.107.8.58]) by gmr-mx.google.com with ESMTPS id r16si89070lfi.10.2021.01.26.05.17.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:17:01 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.8.58 as permitted sender) client-ip=40.107.8.58; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C5N0Bz08PP9SFp2I0UlRUtqNKO53qkbsfsZ1g64baxAoeEbFVsJFT4EmL8yAiNpK+HO2JLzYsSh3DpeR827SXzwEAvJV8jBUjdBkhHv5YGY7pYUYkqXKMseoXObjL/kAxonObwj5NfjWGAjsGDp7/j3DFB0lMz3K0gtOb+ww4rwptNGkvQtAGN7w0udNWMjHTyiy21ETO7Dg1YM2onQ1oKRIzHvNlnjS+PIY+ZYFhZKJaQYSCC+Sc4ns9lukc5Cik0F4cXLL1j1LMihgCpvwQN9Gu4x4JUTtqmbQ7rGxmvgRDpd6eL4exg+NA94s7WO00yWnHRKiXDg43sVdcMXSwA== 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-SenderADCheck; bh=nNUi6/LDFXEXFfmtqDYlicTJ1nWxI62FlDs0HEEFqW0=; b=XsqzlEMVpK1G9mzwqshi6jx66dUDpSzzutIATBzuJgshYKw9j78wuBuemVjb+n8psfzGQnlTr5yG07JXo5SRKWIlOjEIJvtp9w/gG1+NOIwHmSDchNAP7B5OV8m0VS9srnvpmUVCdjjXMMx6l0XsVzJBxYooXKLXBAHOvgye1iL4BiALSZY7PdOn7gY3aN61B9IHhAk17kFtCGi0x4rjCk4EkJyX+ckN58HlEOPSDMgpzqXhlSBd/kjX+bDbNt5Zy0GxwuYsJe7h/R0q8ABpkebiv8T84+Th/xexZ60OmB2ye475rEnzvKTjwn5RVYTh3wzDQZ0+/W8l+c9c4RVsZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM0PR10MB3603.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:156::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.17; Tue, 26 Jan 2021 13:17:00 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:17:00 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 2/9] editorconfig: added settings for *.cfg files Date: Tue, 26 Jan 2021 14:14:05 +0100 Message-Id: <20210126131412.3567-3-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0021.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::31) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0021.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.16 via Frontend Transport; Tue, 26 Jan 2021 13:16:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5896cd88-ef7f-4921-dcf2-08d8c1fca9e7 X-MS-TrafficTypeDiagnostic: AM0PR10MB3603: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:551; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UHeRjtaC1eNr3puHiomW8GIOdLXMyqedH2GsfF1GrqLYwIg1lqGFhvRbCSCbbNgEDmctbTIS7uyztXrNFkY4mJjk6NJ2WNEIBBHWZKNzapBbZnkcJqXIvuaPBljehzqXQsxCwhdkzKfvEy5q2N75+Fuf963FynBhtGeRMq8WqvPW9oy82srX9LbJfLZk5R0ehGS1skuzRbrBCarmK4PRQ9p1Zn8oyGLBbrQNMv3BVgSWvefrASPEEA0Q5EGCf61ILAxqncY3dQKP06fiRUOSS01HdwrJIWdHND+P3Bf+f64PZE1bS4Yso0qsCs2VPuLfk4/AYTbQ4ugJPDrCHc22AWfPinpaLb+G6nIH7wZSrMdBIFxYO2rI33RtSes5ROwSrx9S/U7Z1ABVr0U/5XYdVw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(376002)(396003)(346002)(366004)(54906003)(8676002)(66476007)(316002)(6486002)(6916009)(36756003)(6666004)(8936002)(83380400001)(66946007)(478600001)(86362001)(6496006)(44832011)(186003)(4326008)(956004)(2616005)(2906002)(107886003)(4744005)(1076003)(16526019)(26005)(66556008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: /gdhlcyUTHwDlMvuKJLczysG2aemuL1lHvACbEPwmlxwWdNv8sTx6xOuRyhsfdRID9Vj4jXIWt7j04368s6bvpEWIin4Di9mzWbYduTw24TZnj2s3U0VTu//h4pQnUAVyev1+ezHJ2X+7z5wXjYCcoRAcK1x++HheE4NTmhs31idx9C/ceW9zBRnhuqiNSAPrh1uTSvUeujtjCf9QLB2UHvubo56pECNlYkX9vtz8ulsEQ5IHxKj1yCBnVqnhKpp3BbtAh7NlnyB8enh8cKCf5lmGCDUXOTVzFBtjIewoQnbsYvtw0BHBuNqfC9Eyrec/uQemQaSScrvMKHo3chf7Ru6FPKDqm8JRArC1TMJlwcyLeNjF2ralGHEEK+YY7QL5W8c2jBTLZTXkmCuPRJi2ttbDAKG5AIRXdYnxafOF9jsP1rkx6KQLFJ1rrtyP/PGwjPr0wdi1B4+oUPPSkntpzqOTRNMCpcXq3neh25j0OA2rEk4Ot4xlRVdShVXbLTcmM9ngsOLG6RYprlbxrA++7Fv46bSUmQdqbCos7SE7vsTKX6JpYI20BliTY1qXjpAAQq7S3grWKAQJm+wdPnLpUZNN+9he7o2R1bVuL8Wb4kWY8qDbkYK/ZK1LyZNLghZ1SxAGKI6sZNKolAYWGl/DGvXixhvDk9u9DM8IiAMiaZwJtpp0ZEFwCiCxxIGnaj/KpcUThYvEL6uSF6E3Ujg1nRz4tdiZ8JI77W/l5w2C/2VQUD8BchE0PvuVL4lbUom/GPk/8k+x+H+Pjoa3P3b4nWXsAvt2ieRfVb/ybPkhlSpBOVR78soWk3Gl6UoxEeoPPEHwJPmb48uuUxypi/CDYRAVgboPicCN29xsz9a3+LgFeytcW4V8Rlr50NPIozg7ipb+xcQcHNfgNy/fYoxd1nDirHKobkSY7UmLmsAGzfGhMSiCqj7aSOFuF9etg3EIoRtcgsC1AHKNJnH9PO0c+l+RSrmMUjoyCeFK3PCxCm4u5b7rTJDwjN0G2MMMu+Pl2H5FdaAVIKPmaatLFVVoTnMAOGCHR6Xt4i3ldBflH6jVCrlo+9gVp2FekMJmFqQ X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5896cd88-ef7f-4921-dcf2-08d8c1fca9e7 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:17:00.0708 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: F3ACEPxjSPSyCGV8u2lsJM/CosU7EAh4vFJ/yCC1iNk/xQ5uyDAcK+MT0ZSgVcLe7MtX6wjbCcjMwmY/tYFczRuAevPqlGdw4sD/+GLwHlw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3603 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=WG0zrgdY; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.8.58 as permitted sender) smtp.mailfrom=michael.adler@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: , This makes it easier to edit swupdate.cfg Signed-off-by: Michael Adler Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index 2dadd71..46f859a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,3 +17,7 @@ insert_final_newline = true indent_style = tab indent_size = tab tab_width = 8 + +[*.cfg] +indent_style = tab +indent_size = 8 From patchwork Tue Jan 26 13:14:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431672 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::13a; helo=mail-lf1-x13a.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbs5mycaamgqeg4jv5wy@googlegroups.com; receiver=) 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=NdAsNjX2; dkim-atps=neutral Received: from mail-lf1-x13a.google.com (mail-lf1-x13a.google.com [IPv6:2a00:1450:4864:20::13a]) (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 4DQ6hf6RN8z9sRR for ; Wed, 27 Jan 2021 00:17:04 +1100 (AEDT) Received: by mail-lf1-x13a.google.com with SMTP id v25sf1312615lfp.18 for ; Tue, 26 Jan 2021 05:17:04 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667019; cv=pass; d=google.com; s=arc-20160816; b=aMPRopp2F0ghbKvJ6Oosgnvyzc1z0P8CXD5UwMIRltKHwLGQxQmDExGMh76hbA2MKE 80z7hnoMQZG9kpcUi592LbE2gk85MLqa+MNwJVbOKblpulpQOVvxq04Ty2Gwnwtetd8C 9Oki2FlP3qwWULFEvUt1nv5tteDLQL3L49a7l0n0FQkZU9gdLAwMgql65FiUYFryFFGr 0CeL74hqoxwbchgTHECfOL4rcgNyHvGVrEYqpT4wYrU8u7Mv64B+ugMM6CqbZohnYBnc y4tklitfvm5kcAIiFsmhYKMC5O/eOjFPeqTNlVEIl4iJw/elXNT7gKZv/F7m0lbFuxhM icfA== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=sxvgdnC4ze4vpsTBdVBrY5mFWKNBcxtc8+uKdLFvm0g=; b=HdrSfg05gpj7YOwsSBSe29cNTuilfH5T5srN01NWYVBSYTLwD1qhiPZn9TeUEQN2Wh 5joJLqLdrgDqYsWiP8oLtxqjUnnXjFm5W9dlBfvZ+VxRW15wOqrEySPZnAoPGaHGscji IepPpzAXEVv3LRqZFvhnoPwfIP0viR+jAQGGvkK7S37K96InUPKD72tPk7Qwl12xQNCQ Kbnqyin4N1Ebwcrv3PzYKvuGVt+6tJILD3QysbAqd651zCY+CqTGHsp6KVvkZ98ib4US z7fj7+anWWe7X9U7kCme1O8W2ZtVRFoRYaNapfuc+nBVQZMd052MTFlqHzkZwWAz/z6h gYqw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=lo8uAIsE; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 2a01:111:f400:fe0e::61e is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (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=sxvgdnC4ze4vpsTBdVBrY5mFWKNBcxtc8+uKdLFvm0g=; b=NdAsNjX22EquWXCLNvA72dVLTHJBrn4ZMVFzpiJmXzmDVkNMUjYZK5Mvp6T3iY4jKi Uby/XYrV9K0jFS0Tei2xhMRmDEYV1V0FlZMS00S3rsjfbK/CKITeq6z3qxLtF3vULmd9 /c9Wcqdmx94n/dqgvRrUKxB0usikqEFgmXbrn6m285oR7BWP3DVO7bKboPVGbYx/kAP0 bwsKs5ONbjL8W/OmT+qf2oNsvvL4EvoAl55x6Q63NZl6gDqY7tthHUC50TUBi/JxMJnu dFQIn9e8r4Kh3qZhdi2BJ7MfSloSWhfmv4tOor6NW4ItUFd8L3oMsPWgHxmkQ7qZ4DZ0 fvZA== 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=sxvgdnC4ze4vpsTBdVBrY5mFWKNBcxtc8+uKdLFvm0g=; b=ZwNMhW/qs7AMNAb1diuvw6ojJN3IlCraRGibqLfc3mGMVj20pQ5sdL6yzvimPtpNx4 kEYgHXw5KNV7W8Go0Muz0DpKpUuvGBEgn9Hyksyk40NORRHJj382RvgZcP70F+k3VfJg XTLIph9qGWCTJft+JfFl2QAdsTHA1JEYh4vrUtsOVzCFr5IKUmZ+PEmZ7W9s2xRNpCBV s8Ff5ia80aF6bUE+Lm5EN2/temrvAloKP6AHCe9gQ//pLmJnBtD3kuhTxnKtxvaE5kTN q+ww8u5puqKL/oA/LzMaCHR8TxwMIyHTAbacs6UmALUMQhJR8QCtoppRTXUuQBaykC0w 9GnA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533pDIZSfnIWG+SRrBpPmGdIPtRrPA4PqpfB9hJp40TQ+XeN7PMT jFfJRnl2VwCIj+bwg9J3DqY= X-Google-Smtp-Source: ABdhPJy0y3gmP00qlSpaTa9f5FJ+6onsT/aDuQBDPbav4ke4agPRA+HkG6F3ORmBXkp0DXNncCEI6w== X-Received: by 2002:a05:6512:3253:: with SMTP id c19mr2560487lfr.245.1611667019718; Tue, 26 Jan 2021 05:16:59 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:974c:: with SMTP id f12ls658834ljj.8.gmail; Tue, 26 Jan 2021 05:16:58 -0800 (PST) X-Received: by 2002:a2e:a58f:: with SMTP id m15mr2926382ljp.214.1611667018701; Tue, 26 Jan 2021 05:16:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667018; cv=pass; d=google.com; s=arc-20160816; b=N2n3iUY4QCwHrkFDDFSwfsGWn16/Y79bzNTj5Yo1Q475fQX/J/Uf+PjF4llZeG86LF 5H4Lq4P9AxdTsq+VM7gGIu/0fwqzC1HvD+42ffZmi3J680RR4qjjJ4EDFWmE+Zi+pEox axpCxZSL2g4HR04RO/1vcDu55EMSNRiqnQbXxhQmSNwownfs3W5ZoIfTcOFeAgWRCy0r tSblHjjf4IR17b3Dab5cEZ7aoob4f2n//Scs+UJLVaWs1EJo4UJUScvVRU91oPY174Fi KPvIPHYjirGR1VcdIdbUO/gn8zRwOrE/FGMvEr02ZiMs9JmbbRNHZOrvrtZ9GmISnkWt rRHw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=bLaLACg+i1XgSfzHx7gP8auap5712nymgSxiGp81oVw=; b=OCqpTcCkAxYKueOoCkWwZ0Fh65qaH5Q+YV8suaMVhPTB57OCj67WJQWkfrvnfeOUf7 a33s6xBJsPgnnM19SYjFMJ3L9ujWpnfZIbaAunaVRqSj7yvewwdm/fk5zB1RNBFM/88g GNy9FnTqFjHUqAkgNkaWDNFAVzcc08XtwBjl0vFQMmA1uPVX4QqgD4lm6QmgHWoJAPX7 NF7o1MzbhcWztgq/RBd7ozs+ejH8fdSq2cnHSCk4ghZG2DMJ12DCyfr2r9dM38PmbjaX BFzMATfXnTAnvBq6kyVsrGNQfjX8613tiiwjIZbByUsWRFbgkSM3TWPITT8tFTQ05K/H rUzQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=lo8uAIsE; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 2a01:111:f400:fe0e::61e is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061e.outbound.protection.outlook.com. [2a01:111:f400:fe0e::61e]) by gmr-mx.google.com with ESMTPS id l22si501289ljh.4.2021.01.26.05.16.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:16:58 -0800 (PST) Received-SPF: neutral (google.com: 2a01:111:f400:fe0e::61e is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) client-ip=2a01:111:f400:fe0e::61e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GySYswYhqLyD7bzr2UdZVx/i6KmT5QYRa2B+vl+gbsyyaiz5eJyHyePHmfgscIj8PkvWyPAgVvhtdPX70dRIglo/kgy08KdenRvvach4WOkSRK9NJdBWawafo16kO8d9GLZK/1+xwRXSe6ITJFHyrC0V89nFEr/pZC1FzNtFQyxWakvTw0nUvqwnwVAw5FPtS0OjBmfV0fbSdtEKptp1dfk31ta6wlR64Hlz0lAtIgxHFXPkEA2eYwoVCpl1qgpfh/ATRLFA00UvH9GNWWs2t31rEp7gzCmG9dIXiErBO5LwQwvIUg13d1WtFeZHbU2IuEszevs7gBIBAdciJtdTcQ== 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-SenderADCheck; bh=bLaLACg+i1XgSfzHx7gP8auap5712nymgSxiGp81oVw=; b=h2gvJkcLJ4e57Rj4gNOq5lUlnqc6q70/UXi3aYaYGB4kC49X+huVD0efkp7GXB1XL/p8SP2JWNbpC3lGaAPr4FbEY8PlAAcHQgKnq4+ZAaasQ03eV8qSvtDjz5V4PLOXklyTr8V7vYEkfD10kYp/ZBturRIGfizwdopCfKCdCoowR9dyHPRhmkObKbKl0246spOIdKMZfXyVS/JQQ4WonyGodvsIvscjkMdv1ataKMdqiOCpJWQM5cjQDPtIISGPJSUyRbIlOYxD7/3G3yB7zvpVmli/x0NMX9JXxaQCens8KFKxvORMwBcPCiVri8BAlAcKR/IqVon8PxiIw+rJsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM0PR10MB3603.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:156::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.17; Tue, 26 Jan 2021 13:16:57 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:16:57 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 3/9] Added software select to swupdate.cfg globals Date: Tue, 26 Jan 2021 14:14:06 +0100 Message-Id: <20210126131412.3567-4-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0020.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::30) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0020.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Tue, 26 Jan 2021 13:16:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: aeec0e60-0b40-498d-ed3f-08d8c1fca812 X-MS-TrafficTypeDiagnostic: AM0PR10MB3603: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:326; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QB8TS11PLtOkqdXN91u4MlgyBCxRGZMct7fILBAYi3JfLcVFEIGdtGSRmu8j8vhW6OTx2fC8sLzoiaZua5SPeZ5lkpPkmDRWB+z2SRC0e40Spw1BBDf6U7D+STTzomuZGN/V9sP5xc/CDxef4UDtymCDzSzKbAGwzIrWPeoPmG0rVRlCFnOCbOCUD/jbnDOvmkcE7FOph/PEHfI1aGbSJtOGeDUQ1X4+dXiWD6TsH1DQmlI21d1z7QmB3KbgE5tK7PFJ1g2rQuDRj0Wk4JJtzZ3/xd/sxo6SUfXCD5n+WS4pBH1oWr4D51zwV8OR8q65brMni4SeE5GJdcI8KeUQ++AGEWUMfQqltNbzfogmTOmp8vXSjgPD2mo2jdeANO/ZbqkvWJ1ijZ5Rq7LazwwBRA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(376002)(396003)(346002)(366004)(54906003)(8676002)(66476007)(316002)(6486002)(6916009)(36756003)(6666004)(8936002)(83380400001)(66946007)(478600001)(86362001)(6496006)(44832011)(186003)(4326008)(956004)(2616005)(2906002)(107886003)(1076003)(16526019)(26005)(66556008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Vf4G9cg8yB5lWodpmuNmNHLtdP0VPBtmILykXouKZyGaFkAZ0n4G2CLUCGsIXCEpYk5S4BuAaxL9AFe5OH9WN72EYuwfcNJ/HGbXIOBGZAhlPYpaDpKkA3nqOaAax6lzjtGrkuDe3zZO6TLQY65JBijji7sIxR0Bgns/t8BqRCVpjCqgPJyH8zZxI2aJ7R10w1sxYCYGGElNbZoLKt8Kgz9aBH2+Dyok9G7xCr+fMPyG6NYYTg+HL3GkEQw1Oo7LogS190+mNUK0U1e/nTCZJa9j5vuo5gwSDamkohbiV3YOXLbmn+qw9fVsE7zkL+pfGk1xtLHCK+FOCJZ2UwWxa9B7zp/3uqZFfPlmg7hlyNGb1f0w9bfctoDw6DBLKz7X5aFjC19vd5/7XCgz9K7eCN/ptUKbJYsl5SjZRiHVvo71NCz4Fa1K/IarCkpWed9HXWICwfs4u+lZpbo3JxYsr+KCmnWLpPTD4MM8Nx7Q9O5B5tnuG/n/dcnOyzrrrg9St+oVEkEtEVkxj0zQhnfhKglEHSk8x/RvuRlbsdM2cIBY5KveUfCL9fUN6bw6kraOcRc+LvlrobGBteGhO3trlUFNB7+C6XHPv4NlITYSoy1JU0OafRCubHlW7554UYTI5Ctdtlt5bHTkXmiHMNjVxytDE8SogM+0350R51S/Q4XVnW5N5H/xnQqiwXGrmXagiTC0Mgu/7SOwY0ncarTgo1IwcuW+rFS+5+0DcerbhkwNf5/I12TWYtJFsVthpHdUAfuvBQuek1FSUcuTZj6A3UpxaOyLlLPU+2InnQeaZ+cIKZftQpAhT1KB2NSJdPOWaJdih8kH+dnBK1pY4M0uDVbItkHtRJomDppGmzKcyy2MVJN4HqIOZSS246gZxX2tfa8blBVBwYnL9x43lWjbguhFEp1wwlGQo31iQfNqe3Z9MWulOZ8WjFJKNKo1LEBZ9hZGPq7suC+7xWC3xX0TnfmKZMyZWWnoEzbn0iwAwO5jgCjapXUZzcVcn/f/QdbLpF/jH/cWmHxhMbk3AhPt7oFvF+4Y3tGHn7bUzeyOUsStBlKfdczUa8+1xk1uBlKm X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: aeec0e60-0b40-498d-ed3f-08d8c1fca812 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:16:57.0686 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: okym14ZMmt1uuISVmxFwo6dcRTaueaM/oapEVVn4Uinc5JxpwCl8foUTOiyxCVyJrh7iowVIVdfW7sf2NpGwAqzrh+rdChIeyLvuhBa//Oo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3603 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=lo8uAIsE; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 2a01:111:f400:fe0e::61e is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (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: , Previously, this option could only be specified using command-line arguments or via the IPC interface. Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/swupdate.c | 12 +++++++++++- examples/configuration/swupdate.cfg | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/swupdate.c b/core/swupdate.c index 788981e..ff3cd16 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -363,6 +363,12 @@ static int read_globals_settings(void *elem, void *data) GET_FIELD_STRING(LIBCFG_PARSER, elem, "forced-signer-name", sw->globals.forced_signer_name); + char software_select[SWUPDATE_GENERAL_STRING_SIZE] = ""; + GET_FIELD_STRING(LIBCFG_PARSER, elem, "select", software_select); + if (parse_image_selector(software_select, sw)) { + return 1; + } + return 0; } @@ -809,8 +815,12 @@ int main(int argc, char **argv) fprintf(stderr, "Error: Incorrect select option format.\n"); exit(EXIT_FAILURE); } + } + + + if (strlen(swcfg.globals.default_software_set) > 0 && strlen(swcfg.globals.default_running_mode) > 0) { INFO("software set: %s mode: %s", swcfg.globals.default_software_set, - swcfg.globals.default_running_mode); + swcfg.globals.default_running_mode); } /* Read sw-versions */ diff --git a/examples/configuration/swupdate.cfg b/examples/configuration/swupdate.cfg index 6fad156..a97f982 100644 --- a/examples/configuration/swupdate.cfg +++ b/examples/configuration/swupdate.cfg @@ -38,6 +38,8 @@ # [emailProtection|codeSigning] (default: emailProtection) # forced-signer-name : string # set expected common name of signer certificate +# select: : string +# select software images set and source (,) globals : { From patchwork Tue Jan 26 13:14:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431674 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::440; helo=mail-wr1-x440.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbtfmycaamgqeuxcsigq@googlegroups.com; receiver=) 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=X59wq3XH; dkim-atps=neutral Received: from mail-wr1-x440.google.com (mail-wr1-x440.google.com [IPv6:2a00:1450:4864:20::440]) (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 4DQ6hf6WXQz9sW8 for ; Wed, 27 Jan 2021 00:17:04 +1100 (AEDT) Received: by mail-wr1-x440.google.com with SMTP id u3sf11078050wri.19 for ; Tue, 26 Jan 2021 05:17:04 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667020; cv=pass; d=google.com; s=arc-20160816; b=IISRezRiLGtQIgmfcW/RDn77s2ZYMmvgTu4X9tzqX5/U5oTSFDPriFHJgdL5lGi6/A dv0BCekAHWQba0JMVK2zTcg5NVBMoqWiLcX0AT06kArg1KbtS0Hbob37IMv4VgzZXe3y SdVu0BPDeQS7tz2jfMbBvdcaNcqiPvA0d+kIrvlje/QDVvCxEugxYyklXNkR71vZgTRA ugtQMRObpZqeyGDO+cQV7luzS116lq8bqKhqEtSHZCoI2aHko0+BNkW6SrN8loQzDRgm WjYMzGNW7jwaAA3o4AQ1NG4RRaVgofI8Da6JMecbNGKoo9V7Eq7xnMAWhbhjhvmmgc2Q mrvg== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=PzLEV5TWeKD1n5Y8S2bNsbKNCeSSQvOw4CdaYlc6elg=; b=hq6NtDRoiah6MxLRUGIVqBQYj5TJBf1eBEV4r3r++qgmCRUgJhGueEkkX3k38+wSM3 ortV6NqqvuRMnTcXuYzIDNHfTnFV+pxXBzXmN/hEgNAeRTTo0d4l7be5NQJe4K7fF+6s RtrkixXVt/Zr6KGH+8l0V8T2lh9m0FLNsCvSRpYM0KyHUCgyPRR0ZBcji0bzR4KZYIPO 8YqOMzMMHdHeXM9TvwQzDWWXenPWSLgjKsBoPS17nkUgMI22J5pqb+UDUn1+/0ntN//y MpnKeVVKf5l3ZRj5bpDuCMiuftLn25yiA42g/KF/enqWIttOLALkVvs17JDBwQUW/y3x A8Xw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=EZ15sebw; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.68 as permitted sender) smtp.mailfrom=michael.adler@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=PzLEV5TWeKD1n5Y8S2bNsbKNCeSSQvOw4CdaYlc6elg=; b=X59wq3XHdHlbhZb/nI/QozMg3rV6SG4bNtbAVvqfqBhkxEgut6LbUtRtcvbU5YGiIr Mtm0UDBsywH8uJAjw4PmFTD1lwDSAD1RDamGAmppT7zooxCzq38lW8o/g7oQtGqQrM3+ Mar88vPdl/MMoUAywCZyU/nwoUeVWHbtbj8VP2hgffiQJYqiRp88ApN9ptSeWam9YRMp tvKQ3Irutjb1fXE6bEQkDPvOgYkuPagBPPVU4PH6bHW0F4g6aUJBjr+q9SIhkcs/eMgh nAbttq7b3SEyQi6ggK9KNdzli+H/pVrJAaFMvphURoi8GgC7gVwlFq9xMEjREuO9rni6 PZrQ== 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=PzLEV5TWeKD1n5Y8S2bNsbKNCeSSQvOw4CdaYlc6elg=; b=qghdgEEa6t8Gt61ISaZSE7L2VaXL1ze0VMcq9CJHe7n1R7TNtENRrkY8T5Q9f55Tu+ MC96BmFj/xHuF+3w907Rcx3uRo9xdOT3Md6Ix1AuRwJ9U7vKTeMe06MrHX8oSGjtTY5U t9JaDPOfV99jYvJzD+RV0Wgu7j8369VD4j55NIyewzX2V0k54CYS8veXErNZG/urB46t 3xV69Al83nwDI5+ZpGlk02jhLKR02YqBQi4IzmoVuCN3Dgl/C7qCyDvtRHADbfmcTBLN rj+XxhKdCSVED00kjM4BtIC3lTc5ovbLrfXlapk76pPk3vzhss8XxPqvQRdvdYAbowNR 3zcQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM5325nE6etHuU+Pmuz4/tUWPN066OywcFsB/vBqZNTaAMBLFSnLof u5DrADfTVyXOv9VRFa2a/so= X-Google-Smtp-Source: ABdhPJzisg1YDv5XXdcD1m2hcGMBzTMPq6KGgYHVFujl+ijY/cwVEvvQa+kDc0ENLys+5Nbcftaj0A== X-Received: by 2002:adf:814f:: with SMTP id 73mr6086225wrm.368.1611667020590; Tue, 26 Jan 2021 05:17:00 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:e608:: with SMTP id p8ls1073223wrm.2.gmail; Tue, 26 Jan 2021 05:16:59 -0800 (PST) X-Received: by 2002:a5d:53c3:: with SMTP id a3mr5905885wrw.43.1611667019733; Tue, 26 Jan 2021 05:16:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667019; cv=pass; d=google.com; s=arc-20160816; b=MmvvAUu4djhLaOZF2FJHea4dxzMMaFVTDZiyuVPs73ohUD1Y9kO+uwhYXDmCNFbiAt yxxR34HcPhZuuvUV6i22qLMHr3jAgGHtGJxWi640XfUh7pL47Nh0e20+VEQ4TCApe8AH GmYhEDAcThf/9fT17lr5M7FnxKV5wFIdleY9OMUOGdQEUGxBrLA7FEq2/NAiPu4034+H CMTaCuB+z5Jg6IGRKisEYVTuci3fWpkdRaEuTRrk5uPKGvBWwLEFHRNTilWcwsCvLCm1 Coetj+rEMEdBgJNivGhE38N1Nn2Icuvfu05jqHMFFTSoH9WnA2ki9RHcnW/+zyv6uqM6 fxfA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NEyjrkueURcCLYmpmLvOzjzF8Y8DIkXjqIoCqNCrd6M=; b=ku1LiKJzwogyikqpncf6oM5/glT3byzBvsHuH7PzK3ngVlK1KuR9ZBxq7ZHv3FMetI dKWVCfNf1ZY8UesbaqrnZAdVOkzPEEPb6vDnUVlsfkFg5vQhYCaNeb3AigOTZw/Ggh2l 4T5WsoJW3wrpW/nUmSUxUG8tPskYD0pdlyDBm8IoBWyRB3FMoUBHbfcHoAFQuntIDC3l FgIx5QzVN2DIWIIV+T9X8qeXkgV5fmPe4VUouy2MzO9/V5egwfe8qYNNUR5PeYxnKo7j bZU/MqoYyuVfobMNBd5vhTBgBJslhhSZ/I0fWNFtVkbWhximR0JG7V5t36vpAPWm2UvR W2SQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=EZ15sebw; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.68 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2068.outbound.protection.outlook.com. [40.107.22.68]) by gmr-mx.google.com with ESMTPS id 7si748932wrp.3.2021.01.26.05.16.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:16:59 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.68 as permitted sender) client-ip=40.107.22.68; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kmIl33WTHctAg+jgbrMGQFMb4IlifpfE4ZovzoySUahP2Yxml606Ak21LnVh4runcSN4zSCsJ9GClo+aewWy31tFDCIuxsJoXm3iGkOMGml825Uvn1zHuYtWOBwEhTOUok01ijDqZdzXlRe112bv+KDG4WWtLLq2e4PjJnQE2qVMwPn1ZoKpw9ZnuBey0Ac/nm8tUVX9jliDXITAAjNjiPzFEetguvs0NbtfM8Two5fml7ebdMqkIVBCzqK/+wsnlrTZW0c3/lwXmcu3JMAhdEg6dNkUfutHgb/ckKLA1gr+z2W0m95xu/HdLpV+tIofozwx6nSRURGDq1cH6jPsHg== 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-SenderADCheck; bh=NEyjrkueURcCLYmpmLvOzjzF8Y8DIkXjqIoCqNCrd6M=; b=M/T92HTMbsmy9ysj+P4dfknXKJ7g8OhXn+jeRhSOg23aqmGPiTglUtsF4WrzcEnxJrIHQgzmw4+MaYLs76fBEXd1t0k3UM+71uBV2jhUdISYR+oE2qi2A3EzOmooqaDW02VUBZFSXrw/EMAIVEyxem+QnK8YNkAtuY7+CC4YOZi2TpNOrJIFULB6b5zrDUgxVUc7mE1k0sVZsKRwRHg2CrP3zfCpb4OJ0p1OMvkZ2Qmk7KLNN0EruFp1kGsrXn+iJGSeNmc/ktLR/ZrKPzBGPz6JToHXTudlfvu+LK4/XGyTEv6ctk694zRSqrlXPckHYdbWDmwNnnMRJQ9yfhnO0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM9PR10MB4611.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:269::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Tue, 26 Jan 2021 13:16:58 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:16:58 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 4/9] Config parser: Additional logging Date: Tue, 26 Jan 2021 14:14:07 +0100 Message-Id: <20210126131412.3567-5-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0013.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::23) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0013.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Tue, 26 Jan 2021 13:16:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 52f257fe-c11c-401c-f23a-08d8c1fca8fb X-MS-TrafficTypeDiagnostic: AM9PR10MB4611: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:196; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SI1oMin5o9mJy29wfL+u8ILYvdcCLasnnkXoohk8tEz+LisM6Ah3bIIcdhQTxPZmxFKq9e73WRwptsTFAITehkArIYy3be/2e1AMaYI28Zrop+I25Re6dWpEKOars4m9fSrsmstgCuPzC8B7flsrmvEdW0qeBVVkVpLMeGsuPSSS13aWVXuUEdjadDrgUn7V7nLCby7zZ+QlZ7J9rs2q0wrBThP+Uce3r1Lg69CdshCuRp3CJKkkS95mYsoV2dFjVIbFPjSYUN+phAC/OKoAdLXKoFW4i9nuJBXDz0VJtXlQvUr/op1mrd0xXhQyJIXKh/7PD17agypZWvtkVRYPE4nfJjFs5Tbr6w9g1YN2DHEtJqS20eRw2uQQ3lPykqw++vH/x41LjsHe7fun7Ba4IA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(86362001)(66476007)(956004)(36756003)(66556008)(66946007)(8676002)(5660300002)(2616005)(6486002)(6666004)(186003)(107886003)(1076003)(16526019)(44832011)(6496006)(26005)(498600001)(2906002)(8936002)(83380400001)(4326008)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: MHaIMetuZUt4LKZu6zZ9gTh9niL7Pj6I/gYrvTYcCAfAwEmhQKTvhFq3dypzSoA0rDnnVqCy0X1u7mcOkUk6T4MM9mtQ/TcnrL13bPMQAanr+68/gC7J9J6vumGS/MAXgLHuZyX51HaU+sRgmZxNubXNhdyWX1OiFRinuz2lDt4KgXdG3VD7BYEFTUzrXLMvbG9f+klC+qoKbMVN09bZISxlbg23J+7rfdu8jc08vIaSCCAwqB4i+OfOQ5NsRa/5MrCF4QVviuaqzMwjP3nOcHyYuyjsH9SRkA1k7KedKslynh0HXFJ+NpMeFXVpKok+4g4TgJftYCxGsEXqVFFrcGGLw/ue8I0VQMV9nzQXP4iYJAC4KxZcvuwCPewkLt5Wx8+k43BlAeBsnrlsiiAO/t0KKNlyA9NAYVG5nxVI3QabP7uDzugb91azHuukuBXnHH2Ra7g3fvdkyxDVQI1YrcRT0UO9HdHewbaWvpe2esz+QLqHkUWnk0eRkeiDiYUeu9tAMLIR7bMzP6CyUdISe1RzmErQF6IP/cT258GAW12CIGXDcm6kedBApCo21mCZsfSSew50XFar9NYVisRENUmzOORb3LmGocNgJ9/X5uzCEMyo43yRuY+8PkTlsUrpPpHihFTll0dxmMS/W8IOb5QBorVQUq2PJ7fdyxLWMhKH+GSimbOG8zOmzTzDg0xiDUD3l+GpMl8a2P9hoMDHHO7rDXVJu/wdqOCFOks5DDsDufQ+3U7y16k81WMk+3EVJaopYMVyzxSj5Ch0gAcyihSAtRUmKUKbS9VQRKZLFbUZzloVwtLkxxuU/gt/43KK/1w9BFAHHvmm+g7iV/AURcAQjAt9Ye9M2pg0FmMsLGYDhz8an/VSnfWnqZ9hiBbhAad81d5uzAjHaYmGfacoydLD6tQ1076QgCkecWsApzmxBbmwb4tbEazcdTdMoE3e1VomudcbK4JHOEQbNJjBfwzv8voNQm/04WAUZUfgtAcYrslmuWZukxUFlfNQI5LutcnQMYbCvroO5yW1zO5pokCzOQXX6MxSE0NB5rs2la/rxMjBC5OMBU/uLnsWsQlJ X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52f257fe-c11c-401c-f23a-08d8c1fca8fb X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:16:58.5667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: trn75CV53xmfJG8y6jCGDBquHVAX1KIE2MvFBG3pJ4p0Aswevtg3uyqY7wykJcZxCavWNo6wyJzFOpYZhzRRVUPETg1FyeAQdGyEqnlCliM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4611 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=EZ15sebw; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.68 as permitted sender) smtp.mailfrom=michael.adler@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: , This makes it easier to see what's going on during the early start up of SWUpdate. Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/swupdate.c | 1 + corelib/swupdate_settings.c | 3 +++ parser/parser.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/core/swupdate.c b/core/swupdate.c index ff3cd16..6548d06 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -217,6 +217,7 @@ static int parse_image_selector(const char *selector, struct swupdate_cfg *sw) { char *pos; + TRACE("Parsing image selector: %s", selector); pos = strchr(selector, ','); if (pos == NULL) return -EINVAL; diff --git a/corelib/swupdate_settings.c b/corelib/swupdate_settings.c index b0d3344..de7f331 100644 --- a/corelib/swupdate_settings.c +++ b/corelib/swupdate_settings.c @@ -53,6 +53,7 @@ static int read_settings_file(config_t *cfg, const char *filename) { int ret; + TRACE("Reading config file %s", filename); ret = config_read_file(cfg, filename); if (ret != CONFIG_TRUE) { fprintf(stderr, "%s ", config_error_file(cfg)); @@ -86,10 +87,12 @@ int read_module_settings(const char *filename, const char *module, settings_call elem = find_settings_node(&cfg, module); if (!elem) { + TRACE("No config settings found for module %s", module); config_destroy(&cfg); return -ENODATA; } + TRACE("Reading config settings for module %s", module); fcn(elem, data); config_destroy(&cfg); diff --git a/parser/parser.c b/parser/parser.c index c2fe175..9217028 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -812,6 +812,7 @@ int parse_cfg (struct swupdate_cfg *swcfg, const char *filename) config_init(&cfg); /* Read the file. If there is an error, report it and exit. */ + TRACE("Parsing config file %s", filename); if(config_read_file(&cfg, filename) != CONFIG_TRUE) { printf("%s ", config_error_file(&cfg)); printf("%d ", config_error_line(&cfg)); @@ -851,6 +852,7 @@ int parse_json(struct swupdate_cfg *swcfg, const char *filename) json_object *cfg; parsertype p = JSON_PARSER; + TRACE("Parsing config file %s", filename); /* Read the file. If there is an error, report it and exit. */ ret = stat(filename, &stbuf); From patchwork Tue Jan 26 13:14:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431673 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::23f; helo=mail-lj1-x23f.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbt5mycaamgqeeip5nka@googlegroups.com; receiver=) 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=gZbhOsg5; dkim-atps=neutral Received: from mail-lj1-x23f.google.com (mail-lj1-x23f.google.com [IPv6:2a00:1450: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 ozlabs.org (Postfix) with ESMTPS id 4DQ6hf3185z9s1l for ; Wed, 27 Jan 2021 00:17:06 +1100 (AEDT) Received: by mail-lj1-x23f.google.com with SMTP id b26sf8063622lje.13 for ; Tue, 26 Jan 2021 05:17:06 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667023; cv=pass; d=google.com; s=arc-20160816; b=fQI5lucxeedRNAUen64oWrVAwNVtZawjceeHiWDmkn1oKKS/fZBh58blb98xjVTB+w H2veCv+pgPS7K72M+Otoxb9npGKq6STN78ypvBKKZN9KIIw2xBQHgulDUQXW6Anr4FyL ZyG2pMZwJQTaJ3jEU7z1OU+wt171/nAyXmoEN/dIdm/yh6yO018sxT3UqV4vBCXDTFF2 gVEJF8I41IKia1Po+szu9WlXHg3y+STPdq6COIfbJ+fLF6Ks+r7+Wc75PV3ogSdWV+xl VDdbNODWeDBEmr2p1OFQiVuXKaJRG+J8ZttG8S0BLp7jJWtsDJhphdWNT6+rUqn9MqXa cKyg== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=UKta3JH2CqVNOOXIm/Rj1HBIIhTluc+scRDC9EVzVAk=; b=jb+K/W4XCczTNt4MF540DKIxG3TLSfb9/ka5EUdkIh+xb6Ylt037R3zuKbaVzKyOk8 Q5pQrLLwgBspDbZbsYAFLlACpjnwnj41ETSJuxnUAmVjOSlHWrASnLSv+pm0JGPNW7Kr rsAAUk73pwKFTmWHZvUSgUUbTkf/yysy0kKzTjmLDE05HRxNsjYEyfsA0oaDhqprFs+c u7FvGklD6xYc0gYxedasPr8git1AUgLqHiEn9k8elw778eHoTPR/Gvzar4Sy4od5aA9A S4CuVWYeMNYhT5LeES20u/M2AYJrz1JI1/pj6ehzxpQenmSLszWg8xQ7MuW4utcb7SPk 9lMQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="PG53j2d/"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 40.107.8.73 is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (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=UKta3JH2CqVNOOXIm/Rj1HBIIhTluc+scRDC9EVzVAk=; b=gZbhOsg50kYQh4dQhmeAFNBVu3Xpll8eAkR59BrySCEODu4rgeZ5h3xdQTAvNhmTcS MmUXtXHdm9EqlbzrR2h7iY752uoG+mcmBWtYh4v9FN629EJHqbxct87X2zBp8Ojaf9f6 Rxa2aG7s6lFQhIAqVg7y4GfaeKGF7tKna9eTtHkBsZDQLON5wx1PG346Rk9GdFbTDm1N Gg0puWJyFGUIo2UVF9UA5c3pa6cwE8giXbu4HbxefNw8H2XvYiaBdu+v/8XPH30zehL+ FstGW/A+kG4wGfRA6m1OUwoCqIquVRWadgAGvrgbNu98dwFNOW9HezQSH1CI7JaFrM0b Vc6w== 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=UKta3JH2CqVNOOXIm/Rj1HBIIhTluc+scRDC9EVzVAk=; b=GvOdzApusDkFiMdXZ5/ZweYs2v2YjrVR4hH9Ncv9qZx/srXrT4pUAt4Q/UQGF+tZpV 28GoMgRuNkub9WPsdEX7X7zao4vseWzCzwbSf16A1XWI8qiomBEvooPWKC6q6llgIoRh 0ZMu/Sd0g52U10fvulVcS3IOLG6faUImtPRxfd51AbxQFm2hGEu71bD2G+Uyn6vOfk5D RA3RZZmGwDBn1fbElJGvIrdfNn52FVJcYYyKp19/90pRdQdv26vTX3qshQSNU/sRTkKN VHf+3+mpLuekFwwnuwV6/9JyL3B/45rQZPGIkXDsmWjL+U7pMK8XfTXCA+zz7CrqcezJ 78bg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533LqPSVU2TyyNpRlapqAlz968yMVDRPPCpJAt3raEesklXRBonn 9iK5CjmQQLrhk2cO7JlRduU= X-Google-Smtp-Source: ABdhPJyqTE00E1HNog6fpfE4wUBaDkxRCmwWEObFlQaTeNjoO6n/UIsbVZ0myaaNoUa9XOdv3v7Zmg== X-Received: by 2002:a05:6512:130f:: with SMTP id x15mr2719024lfu.259.1611667023625; Tue, 26 Jan 2021 05:17:03 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:974c:: with SMTP id f12ls658879ljj.8.gmail; Tue, 26 Jan 2021 05:17:02 -0800 (PST) X-Received: by 2002:a05:651c:39c:: with SMTP id e28mr2903863ljp.81.1611667022757; Tue, 26 Jan 2021 05:17:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667022; cv=pass; d=google.com; s=arc-20160816; b=C7Ayb0tuJIBM7uksMnP2wbZEzmYI2ZMVqkxMgvUMafu2SzhQRceZ2fj7Qrylo93o56 PYtlTCIPrDAxUOGjls8SvChuFSiK3nr2PMRiSYrv4Ko0m7T6xOlMREXLtS9E3o5n7O4N EAheOTSlp8O5hEaLoQlpZJ6Be3QFOzQW85axTLFS/AtrNRtUIL1//5f1RhxRIO5KNxwO EWRlqIrY42ow2oV0mC34u+uWqu4Yl/BBKAz6I9OcAVK79/3G4QX+DUF6d2aqMMwKegtT l9IQXb1CVojxLvH8Cwt1CVoqVTZ9kleWyKbYaeqo2QtiMNy6DO2BdOTopQX9su418WNW g1bA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=saPfJ/Sr7k/GEfoUM8kbza8bfGVMPpumaZ2xj3DXiGU=; b=dZQmPps/4dhUkBTN4R6eHKYGMUe9S2rGNqgV1pMDR/FBTd3yVKQmjNDebU8bHFWZb5 3awrsx1sLMPx0/3ao1Syd1UFjzCnothUsgRMZ46SU3pSBkK/mnuTUasLYg5NAWuBI5Eh D67PlqblBuHPk3xbkudqcsQhtSiixUOGByfzSGJlbStadmHvVJ4BezG5W2AF5byR0ZVu lZ4WSS9bo0sy19wxbgoHI+MlXmGROoSSzgW5CQcDW04Mc/fBgS8d5RershQEicruOWYV EO4BDZlaoJdGLlJskgTNj2r9gzJCBXTBH46nEiIDhwXbwPl7XddDuDOaqOjVITNBxOk6 o+BQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="PG53j2d/"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 40.107.8.73 is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80073.outbound.protection.outlook.com. [40.107.8.73]) by gmr-mx.google.com with ESMTPS id h13si759848lji.7.2021.01.26.05.17.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:17:02 -0800 (PST) Received-SPF: neutral (google.com: 40.107.8.73 is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) client-ip=40.107.8.73; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jwc75bnz3S1oaA8Og8AmLFaEbeq4jS8qMfmNxlerYeOrNfNjastbwkpZ17fIeTE68ebmLEaJBzkZRcnPHi4rsmUJy8/Rh2kT1zf+grOdVKAVaNPF9tzbJK6MNWlIYy8jBK4GPha24Pl3pnPJ+8klccct2SSZ4zQyXCfHT+4j1WS39CfuBN2GT27tRSOku+tVULjVnT7VO9N+igTA4nGh1asUziL4EI1QCUcLV+PfJ8v6KzeO/NHS6i6HD+PxYtAgKiuKyl81IRLWXelh8pUqytQKvlffMwfeQGQJanyOQP/XlKlKZVWZdvxiykc3awCzxokH9Ij3CHtJfW5O+uv2zg== 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-SenderADCheck; bh=saPfJ/Sr7k/GEfoUM8kbza8bfGVMPpumaZ2xj3DXiGU=; b=M5UIiV9qErC+P6q35VYaSBs37xsTvj6ddW7nYb3/FOvyygdygpK3ioKK8hpRDkUH//YM+MCzMwr4dajSPD5XADie8z2k/a9HXbFD3/YBCMB8LAyl+yVHYu3RYPFBM1nFEapGwrJGBSS/y1D9D+OSwv+NCwGDCuYqjyAhuh6RttMNyZRVbKBOef8c0gapNallAribazl/TjJp550joHvFIcQz08zhtsdJMQ/Ne/JytvSqTxMEZ9/uvt0/fZYqJUEUcjTaYhISxfhm318IiyYnm6qy1vLmkqwa8HKkTI47mR+zeWmIajVQJssmve5sKDjDXdan7vQjGdy5K3We+BRYwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM0PR10MB3603.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:156::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.17; Tue, 26 Jan 2021 13:17:01 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:17:01 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 5/9] Avoid re-opening and re-reading config file Date: Tue, 26 Jan 2021 14:14:08 +0100 Message-Id: <20210126131412.3567-6-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0026.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::36) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0026.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Tue, 26 Jan 2021 13:17:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 784cad85-fef2-4449-3f5c-08d8c1fcaab0 X-MS-TrafficTypeDiagnostic: AM0PR10MB3603: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:792; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lSmYWKWSvCZKO/67EbQ1ER20W1aEStH1CnHuPnC97QWrv6VITi8p74HWXNmuSHiiLzDWu0Njk9sOeEIH1ORH+NQeF0fkHUTZH+lka6EuVCNEX70Ov3MpwmiEVYG/rfm26oRWRy4rtQLLY/2MlDnue55VikKvYOAhlxsxibxCWYm6ogVW5r1LuSXoJxqFV3TdJHw+toaKHG6s0SuzrsVMNjzl/2fx+ljeoOkYgYH61OvZ/MVTU9Ctq5w0sS8eMGZJohwaZv17rixH7QA2iYnSmgOw3n6vQ6tipKNL0SYioMjhqZlz4eY7LyHe4DcMtYnzVPlF0+YxMDFkIWh8Hp5NWT7Im/0gW7RpqJvm3UgrmxgxmdE0qBE2xaSwCnjMYRTD3blQIDuI7//L6w7nejNWQQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(376002)(396003)(346002)(366004)(54906003)(8676002)(66476007)(316002)(6486002)(6916009)(36756003)(8936002)(83380400001)(66946007)(478600001)(86362001)(6496006)(44832011)(186003)(4326008)(956004)(2616005)(2906002)(107886003)(1076003)(16526019)(26005)(66556008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: wgh/vxc5n7wDF0nGAp+n9LEH9dM0ieECfGNnnheJrKKBWP/xD/Zm4Ly1gdXNEdDBLlkJgDF/hH2gzB18RIZxbNrHhwOqZuXKv+OC3L4E0UvHSLhr+wgDUYiTUmtQBvvTBD87kZCTaJwBdTgHJdrWynjkxSgA7OGkSelqidWC8BD2tG0zdmmeK2Rp4hPbKfP8BmqGYeRN7lC8kCtf7xuOyvxySEeGKyhQGLJnchXsZYqypihaANmibREvg2VEQVN5fgPnkpZSEJ2iZI7HKzvtZXHiy5BWGhGSzn3HJqa7xQ3H06hdEGfF0xCWIqVYnu7Z+P1Z3YLO2i0OcVdU/P2O3QcbnvfrnZoiLqXbfSQGO0bypJEFAT6fJPGoKgW8eO0waBQrUy9hGZJ+33MUtgm2ASx99TjHXXAB/0PDUwHLW7/O399av8Jwv0a805Jju1fVR3rT4ntGC+tnRD8RVRyHfYYVQb/YkRUwTChh78OAki6MVgWmpmGkTu8J8eRk9HbFRlfvNAWTOOv2qAsQ62jbKlL7xtii5pskYVvILYHXdlmBLJFcVjGa9mSUA0MtDT4qmMB9Y2zLQ8EXm4+4UhTt5X/emrD4d1FJSz3xQ4aTwEW43+wpyDcFbRLux6q8RuTntak4oGOJNLp5tjZq61+IXYWo/SUqidBKp8iuGXZUafk2g+exTCf5YUDhp7isW698h81qhHM1uX0oN69uA4B14qFft8LLxP/AMlLWQ9by3YzoiGGZuWGnJR+ZBRe8sHsV+SGR0diBKSpfS+4VmAzJcOmNa7NyCENPYt6bI45+lFt+C7Yk55t9/WZKTt5o+tMLrLptF58P11ygdDjYCDmloFStBsueFG97Oy2HowCbEF2lypRUrRTmqYAG1GdyEqmycXil6X6ZjR3agcxizGoZ2B/s99oMu8LAzNPEM0V41KKXXiDTYHFOgawie0651kcXgwF7WM7fh7FVmvnSUF/MflGDRuo+D1lbBbHg/Z9U0Jfrx4gZ2ldevNMZntIflhEGKHCsgnp8MkAvvTAAMfTCfQ5Lvijq4g2Tw/kVJDQSNi+6NyOcTLhSURvx5S8HFAYa X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 784cad85-fef2-4449-3f5c-08d8c1fcaab0 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:17:01.3751 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7hX9NgReEluRgmJUUbOz2/iA422Np6XYBEpXcg88zy72RqDcolnHAoX7N2dsPM8B4UjJCxnsAN23Frz/lh9S2sY2oBFhQ0x6+docpAXR5eI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3603 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="PG53j2d/"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=neutral (google.com: 40.107.8.73 is neither permitted nor denied by best guess record for domain of michael.adler@siemens.com) smtp.mailfrom=michael.adler@siemens.com; dmarc=fail (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: , During a regular startup, the config file is at least open(2)ed and read(2) four times. * New API for reading swupdate.cfg (use in-memory copy of the file) * Move settings_callback to swupdate_settings.h; it is only used there Notice: mmap(3p) was not used to avoid security issues when sharing with fork(2)ed processes which drop privileges. Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/artifacts_versions.c | 2 +- core/swupdate.c | 16 ++++++--- corelib/swupdate_settings.c | 72 +++++++++++++++++++++++-------------- include/parselib.h | 2 -- include/swupdate_settings.h | 37 ++++++++++++++++++- 5 files changed, 94 insertions(+), 35 deletions(-) diff --git a/core/artifacts_versions.c b/core/artifacts_versions.c index 7d1d035..cba45b7 100644 --- a/core/artifacts_versions.c +++ b/core/artifacts_versions.c @@ -149,7 +149,7 @@ void get_sw_versions(char *cfgname, struct swupdate_cfg *sw) } #else -void get_sw_versions(char __attribute__ ((__unused__)) *cfgname, +void get_sw_versions(swupdate_cfg_handle __attribute__ ((__unused__))*handle, struct swupdate_cfg *sw) { read_sw_version_file(sw); diff --git a/core/swupdate.c b/core/swupdate.c index 6548d06..37eda4c 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -547,11 +547,16 @@ int main(int argc, char **argv) /* Load configuration file */ if (cfgfname != NULL) { + swupdate_cfg_handle handle; + int ret = swupdate_cfg_init(&handle, cfgfname); + /* * 'globals' section is mandatory if configuration file is specified. */ - int ret = read_module_settings(cfgfname, "globals", - read_globals_settings, &swcfg); + if (ret == 0) { + ret = swupdate_cfg_read_module_settings(&handle, "globals", + read_globals_settings, &swcfg); + } if (ret != 0) { /* * Exit on -ENODATA or -EINVAL errors. @@ -560,6 +565,7 @@ int main(int argc, char **argv) "Error parsing configuration file: %s, exiting.\n", ret == -ENODATA ? "'globals' section missing" : "cannot read"); + swupdate_cfg_destroy(&handle); exit(EXIT_FAILURE); } @@ -569,11 +575,13 @@ int main(int argc, char **argv) * The following sections are optional, hence -ENODATA error code is * ignored if the section is not found. -EINVAL will not happen here. */ - (void)read_module_settings(cfgfname, "logcolors", + (void)swupdate_cfg_read_module_settings(&handle, "logcolors", read_console_settings, &swcfg); - (void)read_module_settings(cfgfname, "processes", + (void)swupdate_cfg_read_module_settings(&handle, "processes", read_processes_settings, &swcfg); + + swupdate_cfg_destroy(&handle); } /* diff --git a/corelib/swupdate_settings.c b/corelib/swupdate_settings.c index de7f331..f06ecf7 100644 --- a/corelib/swupdate_settings.c +++ b/corelib/swupdate_settings.c @@ -10,6 +10,7 @@ * starting swupdate with a long list of parameters. */ +#include #include #include #include @@ -53,6 +54,9 @@ static int read_settings_file(config_t *cfg, const char *filename) { int ret; + if (!filename) + return -EINVAL; + TRACE("Reading config file %s", filename); ret = config_read_file(cfg, filename); if (ret != CONFIG_TRUE) { @@ -69,35 +73,15 @@ static int read_settings_file(config_t *cfg, const char *filename) int read_module_settings(const char *filename, const char *module, settings_callback fcn, void *data) { - config_t cfg; - config_setting_t *elem; - - if (!fcn || !filename) - return -EINVAL; - - memset(&cfg, 0, sizeof(cfg)); - config_init(&cfg); - - if (read_settings_file(&cfg, filename) != CONFIG_TRUE) { - config_destroy(&cfg); + swupdate_cfg_handle handle; + int ret = swupdate_cfg_init(&handle, filename); + if (ret == 0) { + ret = swupdate_cfg_read_module_settings(&handle, module, fcn, data); + } else { ERROR("Error reading configuration file, skipping...."); - return -EINVAL; - } - - elem = find_settings_node(&cfg, module); - - if (!elem) { - TRACE("No config settings found for module %s", module); - config_destroy(&cfg); - return -ENODATA; } - - TRACE("Reading config settings for module %s", module); - fcn(elem, data); - - config_destroy(&cfg); - - return 0; + swupdate_cfg_destroy(&handle); + return ret; } static int get_run_as(void *elem, void *data) @@ -162,3 +146,37 @@ int settings_into_dict(void *settings, void *data) return 0; } + +int swupdate_cfg_init(swupdate_cfg_handle *handle, const char *filename) +{ + config_init(&handle->cfg); + if (read_settings_file(&handle->cfg, filename) != CONFIG_TRUE) { + return -EINVAL; + } + return 0; +} + +void swupdate_cfg_destroy(swupdate_cfg_handle *handle) +{ + config_destroy(&handle->cfg); +} + +int swupdate_cfg_read_module_settings(swupdate_cfg_handle *handle, const char *module, settings_callback fcn, void *data) +{ + config_setting_t *elem; + + if (!fcn) + return -EINVAL; + + TRACE("Reading config file settings for module %s", module); + elem = find_settings_node(&handle->cfg, module); + + if (!elem) { + TRACE("No config file settings found for module %s", module); + return -ENODATA; + } + + fcn(elem, data); + + return 0; +} diff --git a/include/parselib.h b/include/parselib.h index 5cbc255..84a51e2 100644 --- a/include/parselib.h +++ b/include/parselib.h @@ -85,8 +85,6 @@ void *get_node_json(json_object *root, const char **nodes); #define get_node_json(root, nodes) (NULL) #endif -typedef int (*settings_callback)(void *elem, void *data); - const char *get_field_string(parsertype p, void *e, const char *path); void get_field_string_with_size(parsertype p, void *e, const char *path, char *d, size_t n); diff --git a/include/swupdate_settings.h b/include/swupdate_settings.h index c3b083d..c8e4f1d 100644 --- a/include/swupdate_settings.h +++ b/include/swupdate_settings.h @@ -8,12 +8,29 @@ #ifndef _SWUPDATE_SETTINGS_H #define _SWUPDATE_SETTINGS_H +#include + +typedef int (*settings_callback)(void *elem, void *data); + #ifdef CONFIG_LIBCONFIG + +#include + +typedef struct { + config_t cfg; +} swupdate_cfg_handle; + +int swupdate_cfg_init(swupdate_cfg_handle *handle, const char *filename); +void swupdate_cfg_destroy(swupdate_cfg_handle *handle); +int swupdate_cfg_read_module_settings(swupdate_cfg_handle *handle, const char *module, settings_callback fcn, void *data); + int read_module_settings(const char *filename, const char *module, settings_callback fcn, void *data); int read_settings_user_id(const char *filename, const char *module, uid_t *userid, gid_t *groupid); int settings_into_dict(void *settings, void *data); #else -#include + +typedef struct {} swupdate_cfg_handle; + static inline int read_module_settings(const char __attribute__ ((__unused__))*filename, const char __attribute__ ((__unused__)) *module, settings_callback __attribute__ ((__unused__)) fcn, @@ -40,6 +57,24 @@ static inline int settings_into_dict(void __attribute__ ((__unused__)) *settings { return -1; } + +static inline int swupdate_cfg_init(swupdate_cfg_handle __attribute__ ((__unused__))*handle, + const char __attribute__ ((__unused__))*filename) +{ + return -1; +} + +static inline void swupdate_cfg_destroy(swupdate_cfg_handle __attribute__ ((__unused__))*handle) { + return; +} + +static inline int swupdate_cfg_read_module_settings(swupdate_cfg_handle __attribute__ ((__unused__))*handle, + const char __attribute__ ((__unused__))*module, + settings_callback __attribute__ ((__unused__))fcn, + void __attribute__ ((__unused__))*data) { + return -1; +}; + #endif #endif From patchwork Wed Jan 27 14:04:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1432222 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::43c; helo=mail-wr1-x43c.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbfhlywaamgqeurby7zy@googlegroups.com; receiver=) 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=g9fQq4b+; dkim-atps=neutral Received: from mail-wr1-x43c.google.com (mail-wr1-x43c.google.com [IPv6:2a00:1450:4864:20::43c]) (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 4DQly44vmrz9sWL for ; Thu, 28 Jan 2021 01:15:54 +1100 (AEDT) Received: by mail-wr1-x43c.google.com with SMTP id n14sf1086553wru.6 for ; Wed, 27 Jan 2021 06:15:53 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611756949; cv=pass; d=google.com; s=arc-20160816; b=NVuF4RuAZf8Ehq6HQDBbzv97C67mPGvk7aqFtwxz6sdqfTaYCGWTPa3nMQxuD8rpH2 nvHqqi9XpeNLUo4xwJJniMTaQTycnT1JzPESipBP1WAGsHw5m8+GbSxmjymBbnG83V3c nI10EoyJsY8UUOLkHMOU5Kucwjym0xStYe9Tys750V+kTdLn/2Ws5D1jreXNpIxgREmN Ko4c/DBpcUnSQdArPqbXP0q/kjpI9yocYB3uxCotdoHuTohMvCdiKyDxA+t956C1mxso wyhY+E9VD8wW2B4XCfgB3/L25jOW8xUV0/i87QZqOyRQemAjP6gqVrjgX5wsbAVodbJd mPig== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=3Hbq6T6eRed9YiOXKbPpu7Cz2DCJwI4nkcquPWUni1I=; b=A5p4kUKtwt7qdPX6n4s9nAIxtyRcYqGfZ0vYvec5Yp7A5488j0Ml8cRpacOiLLLk/H ZpXGJFwG5ZBMVpXCB6Nzq/4V6MSg44bGcavBUCCZXnKbohaupXHpTBHELf84hLFWzK5m K1p/oDRCGEvVPDJ/TvrhWVyNKRW00LUTPE+kiAPNZF3w33V9CvV5Fkj+/SdOYaRjsdad lA9zO9ISs2Ml3Y3JdsUKbjvxnp3uSczdxEpcXJ4KYCAg3D20vczuYLHQY4Mr25WR1v8Y bGxzM4QHK6ruaLOFpun8yRZO1z2MnTSYuaFTkyc4WivdMgX9D4UhXPa/Uf7Q7vd8x47K Lfdg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=fURwthNe; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.20.56 as permitted sender) smtp.mailfrom=michael.adler@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=3Hbq6T6eRed9YiOXKbPpu7Cz2DCJwI4nkcquPWUni1I=; b=g9fQq4b+qVZoy5VVO8vaAPskaYWwKa0Esv1GwGZHe1vMZfHk2Uem2Tuz6VQGAVk7P6 Z7vk2qbLU7TOEEnHZiCKKtBLG8kVSnazKeAfZ8tt8ZWgSHq+d+/jvd4dg1peYye+1RhI QdfvqYp3z7LiiEUtYO+hM9oAEM/cAAnQaoBh3wtHvhBITieEXR5uGdUipPGZPQVDYC+d IXaBKS7udh80vq7Kh9WEC/b6MYT1ABKGqoX1TVsanEYVvgiHQ+037j+DT7MxittANRj/ QRXFc7TuCvlg1DYbT3LrvSU01P7eA7Cf1aU8XnbG/anY1kIakAtWP49cFdS/jGz6zd0Y xggA== 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=3Hbq6T6eRed9YiOXKbPpu7Cz2DCJwI4nkcquPWUni1I=; b=ncni8/YinKhm7vK2M+JGBWqvXzGX3Ub07475JqXHPg9+tmdQQPdIEEaCrNk9eQ6M6M 8sGvoztZIjzVu5nb5Ez3Xjuvc6O2ASjRZ9HvyHbAUE9iVT5cxnbyrknOtzYt2C6A/ykB dVucC2L6dj+5Arlcawif8ym7x2Y5gLzgC0ph86uYM61wP2zapEIKBvieoo/TnCl1i2Mi xdrrRbREghHLeQ5MCy6hD0oQkyIG8sdgE/s5IHCFopVu7d58YQjf4KqzQb5bQXVSEMlC tLC/vKIeUkd0xDjRnpcOpGN9jCi7X/QE1VRdpF/65n1UW+APs40O2loVKcYnB344/8/3 qY8A== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM531qXSv21or2rBPy8fWBWXthxUUN+HwxbjTK449tQi12M8cevv5+ 8h5LOIs3qTQKMbxlfbuj3mA= X-Google-Smtp-Source: ABdhPJysr6R4BP8J1w7lUPXR2WdJw2Ia7cp3MK89HRVA8gZULZTHkhH2uWZwt9RQPokLTNUWVf0dIg== X-Received: by 2002:adf:9148:: with SMTP id j66mr11939449wrj.28.1611756949091; Wed, 27 Jan 2021 06:15:49 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a7b:c8c8:: with SMTP id f8ls1055514wml.3.gmail; Wed, 27 Jan 2021 06:15:48 -0800 (PST) X-Received: by 2002:a1c:c343:: with SMTP id t64mr4217066wmf.19.1611756948101; Wed, 27 Jan 2021 06:15:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611756948; cv=pass; d=google.com; s=arc-20160816; b=KLL63dcz8NJvKMLBYrHKQ1IymYHCpoN2f0g/DcFZYp8WpbtuVv5aVWJaxbSTOy/nBs 7wAP/kSTlEADYidjDSJ+HmUTlV6BnagDc6BbhyPNNLGzkuwMVFvK/rtS+K8k2qu2AWQB ix9YD/Sz50OzHo9helcGx9fUeeaoUGTeMLR1NmYrVDYW0jEZy5/y3xjB48VDmEgeW3Pi YuYkYMCnmr69r8tjNgJ0HGmTVBbGFS/g3B+7sYH0ogirjDExAJFJ4QoHtHAhGAbiR9Hd f6yfF6+GjeTncwPTngYAZkt9+jym081clSoPwInWMv9etHB8xA5SQAlzzxYYbXqbfpUP Jp2Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jDBg7+EnxCQmdIbKi/X+1fiVtlsu86gNgoYeugaI10w=; b=MCIzkMqqEjfCnKU7P5a7o6WywJ1XLtvWePPBr76yIhnsL9DCvkQEXVY4vTvRXuSXBu NCtJ8qkFp2twEWJIuGN9px4mX1AFn5PkexAY8hz6SvLnU8KcM6cK4rJKvBsMHRDZ88Sp DoBh6Q9fkjxsZmZ2Vv7+4e+hHkFYstvx07jNNCEXQrmEypZxNkWgeg4OOT/MzR6X0RLn WVCPNjcw5zDE37H5vAU2jTSEZzAHEZ3Ok1iDeRvei7g7GYVxz1KcMoWP7lw1rhHKvQVx 8dHD6MTMPaLF0IjePXhYONn+czjKxIPuEgYlIFqQuGmpc1YS903wPZpmmcQwQnOBnLNt 093A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=fURwthNe; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.20.56 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2056.outbound.protection.outlook.com. [40.107.20.56]) by gmr-mx.google.com with ESMTPS id z188si181084wmc.1.2021.01.27.06.15.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jan 2021 06:15:48 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.20.56 as permitted sender) client-ip=40.107.20.56; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L8drw6wUOaNrrgO2QWyCvf+yklK3daqukiO7d6e6l+JY2Nc/W/ZTgkof1hwvtWvhRg1uGDTsYmXUvAJKMIUmDVWLNhL+L+j7/Z2rJ2wvK9Cvc4AHOa4eGsYJKvWETSAMqEc+7E5OQYK5xc4LsjBVhop/zHmfP0U6iA74+IjNJ1PRa09qDijILieIa2rw6n+Id0Hh2fl3mFtDl6SJF83KBEfRJOFjtG08I/PDNy6TYU6hLMjQ/SGIKzDFUfKczg0JT9On2YvtA7gH/o3V2eJb0kbl+tYvABqYWR+kPInX5vzlGpYdKztzRT+jl1vfPkfTPhpSuHCeBfAd73AqdX8XaQ== 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-SenderADCheck; bh=jDBg7+EnxCQmdIbKi/X+1fiVtlsu86gNgoYeugaI10w=; b=IhZydTewM1A1wVLsfUEB4uKSGlZp+tVb7kIhzgkK0vMfmLnibgWziytBeidxAiV+UwII0PpCkgJyb0othbAwl6BtQua3HAOoykYHwOGxEQsYYEwVT/IDkrVkUkx2EYdRxOkQ/hxZlbTD0jVYEr9xUhoSBiKxDY/yl76NXph3VvOPNgX6mcJWsqPYslHnQogIY2RS8jIdjC8SsPbEl0x9FxtcfGZsK2/LbYSciyeHpS6VhRmemco8jCrmHUpmVMaMrgNrO+TDwAvnWU4sqBlgq/5aWcD6/7itxdwh2500fTfoypXhHuDKo3RWk8MQ5wVR1hCPNn1ALp8cgbemugLkpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM0PR10MB2962.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Wed, 27 Jan 2021 14:15:46 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Wed, 27 Jan 2021 14:15:46 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 6/9] Use new swupdate.cfg API to read sw versions Date: Wed, 27 Jan 2021 15:04:38 +0100 Message-Id: <20210126131412.3567-7-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0PR08CA0007.eurprd08.prod.outlook.com (2603:10a6:208:d2::20) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0PR08CA0007.eurprd08.prod.outlook.com (2603:10a6:208:d2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.16 via Frontend Transport; Wed, 27 Jan 2021 14:15:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 92520151-d5db-419e-6e8d-08d8c2ce0a66 X-MS-TrafficTypeDiagnostic: AM0PR10MB2962: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2958; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tu9KZS4WvhqJjXnzGHPmHtoQLAKfLZdOvi1MaW1naRWAQr0L48J5xyj27oY1m4dxu2lq6xnHDJ5CMoyrxiUgkd+dQvlTb00OuX+eCf9IxqEqg3AwCYMaT9N+bBIN9yyRkIt3jHE2R6E/W5DpH4pTWwSlQjDD1EE6TFiGsPIQEvJonsVk6cRSf6RxB6TcQCtTftOzN6EH35OW26s220CwUpfpFu68LWGJhGW+Q+H7pun862FQ7hp63EFFwS5P0fBjKCEb107fjA8Bw/5jc5ZmjZQGoKa9uQN6Ecauw3me3QlYxkCRjRZbQrCB0NNbLmgV0lPdqdFtMOmEieTfeoQfV9QkOoqwMtt2l9iVn9CpKNcBPSr+/5RTxu6zlff1Ub0/qVW+1/btzgjll7/vDae04HiJfRqcGFfnNlJv7iaUq3iDiC/4JZ5JqvCmFcWpDO6R6h9D2zmRfNM2fCdJr8EqyN/Fzxvosex68pUph3ZdMyEMA3hBV71JF9Bwji0Jje56dqoohRfSENEWHoRsSjvCFQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(396003)(39860400002)(376002)(136003)(366004)(346002)(54906003)(8936002)(6496006)(26005)(66476007)(6486002)(66556008)(1076003)(16526019)(8676002)(4326008)(956004)(86362001)(6916009)(316002)(186003)(44832011)(2906002)(478600001)(5660300002)(66946007)(6666004)(36756003)(2616005)(83380400001)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 2ewzUdHEXGTbJ7Bb2nJ85qpx6Yh1cSXZClQ/fHUWbmi3CR3/TumTKfRq0SDGASgdnl+KmbKGVnEQq6kOsOzXwDX27eS2ftAirOjY7y20alLpSKBAWsOgk0wj48ntzSkN9GeQeJUJjExAQCdkxf5oy79HmChcHBc9e5nI0gZTZxD8JvbG0W+uqDf/AGbMTINhc7sD85n+XQOnFRQykxoulFVLXJgMUiSLCL2402IKJCRLZAJKg5dx7fkUR5M1+VMW8zYJK3uFZKeXqugJkFREEmyzR2gspPuEZ4uimukEobnUuoZTYjWq2ZmWi6S5YRTtVD8Cnv/+9e1jWa+0EMMJAIkBYBLCZsb1lYi0McYryBrxLFfdopA0n4gPNZ2Q1qvm18c9wOd2+IMJ7w2KmP1WvzCuRCfY5shKaAH/MUrxq0wwNTAqm5c2d9EtXpm2pDtzBZOTzLwm8G3b5FxmBLagq6mtQA0z9WSR+3Tm4irSVOLcXmjK5FDDGhbHv2sKfZ5sB+s55A+cKiV+3fqMrYwYeGOs1wr/ZDK8t0laGgYepz1ucAHsxtMZvUW+OTc71sF3cQqUsx8YiG4UYK4XlcAwICterYhpBp43ROTIXbv5SJ2zf1dKM8vYq80EDkQzdHD5tAEpagDbN85yYwuOHI9Q3aIs0hG3GLumquVvRvyHpcEToJklXsRDo1jZRQnatHu+P64IwoRHy3XBDEMzaouMu7kzwVuPrOSdihzEi5llJBS/qY12/s5Y0reP7FKFZN77cRpb5ihRCS+L/Z5qVDOj4rh5rgZB1El6movW8eoqzbo41ovH/J4FShg++oL6lEe1LamjsPJvvbAWY8sTmUEUrhaYS0Tt/Q+5SyxLjGnpA4T/SBoNCSGQERFJC9bn3a1GhhXcyCk+IU/CaQTJx28Ej+RmfSs38AdBDpb5m/HJZ1EFCqJiThy5NZXcpPBK9LFFY1Krb7onLj/SKri3IIy24kzuyza2Lg10q8MvR0g8t0gcBdszdr/EqU29MKD5ldbSw/blEzVPr1buAdfo948eHpSez3YjJFNGctJi5Bk2O76l0Ol8Ljutx7/L9lQuq/ak X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92520151-d5db-419e-6e8d-08d8c2ce0a66 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2021 14:15:46.8170 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7jjM2J4rEcIdAcs+PRrfjedS/gqhUrcHu+tAo6OagiYMa32vMsypex8NV/Emqr0tksJ/Z8fzNy5SiMrZoouYJe2ulYx9doLEDcPlA5gs7gg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2962 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=fURwthNe; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.20.56 as permitted sender) smtp.mailfrom=michael.adler@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: , Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/artifacts_versions.c | 6 +++--- core/swupdate.c | 9 +++++---- include/util.h | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/core/artifacts_versions.c b/core/artifacts_versions.c index cba45b7..6074c33 100644 --- a/core/artifacts_versions.c +++ b/core/artifacts_versions.c @@ -129,7 +129,7 @@ static int versions_settings(void *setting, void *data) return 0; } -void get_sw_versions(char *cfgname, struct swupdate_cfg *sw) +void get_sw_versions(swupdate_cfg_handle *handle, struct swupdate_cfg *sw) { int ret = -EINVAL; @@ -138,8 +138,8 @@ void get_sw_versions(char *cfgname, struct swupdate_cfg *sw) * If not found, fall back to a legacy file * in the format " " */ - if (cfgname) - ret = read_module_settings(cfgname, "versions", + if (handle != NULL) + ret = swupdate_cfg_read_module_settings(handle, "versions", versions_settings, sw); diff --git a/core/swupdate.c b/core/swupdate.c index 37eda4c..a76e670 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -581,7 +581,12 @@ int main(int argc, char **argv) (void)swupdate_cfg_read_module_settings(&handle, "processes", read_processes_settings, &swcfg); + + get_sw_versions(&handle, &swcfg); + swupdate_cfg_destroy(&handle); + } else { + get_sw_versions(NULL, &swcfg); } /* @@ -826,15 +831,11 @@ int main(int argc, char **argv) } } - if (strlen(swcfg.globals.default_software_set) > 0 && strlen(swcfg.globals.default_running_mode) > 0) { INFO("software set: %s mode: %s", swcfg.globals.default_software_set, swcfg.globals.default_running_mode); } - /* Read sw-versions */ - get_sw_versions(cfgfname, &swcfg); - /* * Start daemon if just a check is required * SWUpdate will exit after the check diff --git a/include/util.h b/include/util.h index a0edd3e..ad2e90c 100644 --- a/include/util.h +++ b/include/util.h @@ -17,6 +17,7 @@ #endif #include "swupdate.h" #include "swupdate_status.h" +#include "swupdate_settings.h" #include "compat.h" #define NOTIFY_BUF_SIZE 2048 @@ -208,7 +209,7 @@ char *substring(const char *src, int first, int len); size_t snescape(char *dst, size_t n, const char *src); void freeargs (char **argv); int get_hw_revision(struct hw_type *hw); -void get_sw_versions(char *cfgfname, struct swupdate_cfg *sw); +void get_sw_versions(swupdate_cfg_handle *handle, struct swupdate_cfg *sw); int compare_versions(const char* left_version, const char* right_version); int hwid_match(const char* rev, const char* hwrev); int check_hw_compatibility(struct swupdate_cfg *cfg); From patchwork Tue Jan 26 13:14:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431675 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::33d; helo=mail-wm1-x33d.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbunmycaamgqectv2aay@googlegroups.com; receiver=) 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=kDDgqeef; dkim-atps=neutral Received: from mail-wm1-x33d.google.com (mail-wm1-x33d.google.com [IPv6:2a00:1450:4864:20::33d]) (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 4DQ6hh4hk3z9rx6 for ; Wed, 27 Jan 2021 00:17:08 +1100 (AEDT) Received: by mail-wm1-x33d.google.com with SMTP id u67sf1289778wmg.9 for ; Tue, 26 Jan 2021 05:17:08 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667025; cv=pass; d=google.com; s=arc-20160816; b=p1ABHWk+rdIwK5Sb1ZRjJIMisjbIaBI84uouRPXdz9T2Mvz9241r6Ncx73xVlpZLa/ P+YLOzRFYwX3FahmjnOwW3jXCWqJtqxlBGUy5krXF/5KnXTpEc8QJEJ5l1LwZA6vMcuA UFNmjVkfwIvuV8L9vgenSZ+Ye2UKGM+y1Yt1/VSVNM4S5amr6cokFVlkBy4zYr5wxriU tLzX/SQj9iXSS7V/95fUyoKhdO2D4oaFmJndvN7ZD/m3JFBiDC7Uh/2rHhWaHsrQ1nd+ 1oc5DdrDdN9kChb+OVbT8Edazc/M48GRMDdEIyu/+a/Ej8nfmEypg9tOpqExE6El1ZMv rK9w== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=/N2IxTPr8ZWCdQPSP+QlXHLnXJFSLX9Puv1MHFX8F0w=; b=Zal8kQdUUwGRAaDM9UaApt3l5J6GLOEedEVDOCRoERuQ4Xyn0LP4cUtLgMnETX6oXU H52tS0wwWhUMAzR47xF62q1gn4uqqvk/gUhKqNXu8WcVCQ3ryRiBtdSSzVio2faQzg3m D1MldiITRrAK6HpHgQZP7zUmXeY6djxAVafKsNGZNKRONDEQFalhGb3J8lWu2FowkSUv DpDgiHZyRJcsvmZUfiI+c38HOjfkRCu9SW0XzGN5t9GbfWV06znDddPo8PZwmcw50pYO 3OmvD/PFnSAAn5+Dn6nknUJK6tc+G1F6rCQ9/m3DvwXoP2LFJQBW0uvAFR8bIrY69RAD IH5g== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="dVU0QQZ/"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 2a01:111:f400:fe0e::60e as permitted sender) smtp.mailfrom=michael.adler@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=/N2IxTPr8ZWCdQPSP+QlXHLnXJFSLX9Puv1MHFX8F0w=; b=kDDgqeefAXsbiCo/lWSaa4UKJWFmNfB10fTik8emdm8tt00fI0i+OHXagwUnMMZPKl ZChuvSYDsFY6xnFfOHYt8TV6QAyWEFnR6QwyW1KHqVbTeYH072sYk+7+GVhv2Hvi5Ys5 l4jNIdaVKT+XWuWjngHauxgOG80CUVIfz8FoY/wHEDh77Se7IR243i2He+xqug/aSYLR o2R0uqk9DWRWuC51yl2cMQhfVhUJ6Kya7GGvHoxEQybKUQEtvoXfihh0FtMdcSYA0qBt I6bww/jXKolJ+wCp4W4dxKMq6eRpnP2bfZaNJtGpPTHiwD8Vs3BzMuoksSmSKteweWAx Sg3g== 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=/N2IxTPr8ZWCdQPSP+QlXHLnXJFSLX9Puv1MHFX8F0w=; b=bTjk5fukuFd+8J7LwoVqwdL9F4yNeiEKyXkdwwGThnQJATOluSgvLGn5beATYA7vnD v++TfkZPsi2qQNm3CmfXntXLW7D4c+0DVKsL9RoBFixRXSZJc/lXj5yBcKzYZezZo4iW DTbCFll7Wk3ebch9PXqUE+r9N53aht25S/jWqapk8IE5MMh86VpyIBFJY5P0r+XRPavt HFpwqcizrRjlCUYqldYMgH8jg3Jl1j0qY7E5sRwEPkrOMYHmUGUuiOezJYPuz2ZrT/Hm QxxwNwoPsAfanJbTZ8mFd2Zkl2DAAh8PwwooC+CDbh9ETcMX8UZkwZdgQ5P7JIln2PyK 9saA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530dVs7BgBHkSiliU0l2IxLxcy2gRmpQp+gmA0TEFe676uwwD5am wLmkzFSBCPmx40pqyBi8DmA= X-Google-Smtp-Source: ABdhPJxoqADlTtPeIakYfFTu610qDtMibknIFDCzoto0x+Sv/zRtLWmTXc/reseMq8FhdDqU5/HIZw== X-Received: by 2002:a1c:9cd8:: with SMTP id f207mr4781510wme.155.1611667025203; Tue, 26 Jan 2021 05:17:05 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1c:7210:: with SMTP id n16ls1276707wmc.2.canary-gmail; Tue, 26 Jan 2021 05:17:04 -0800 (PST) X-Received: by 2002:a1c:9a4d:: with SMTP id c74mr4577875wme.73.1611667024314; Tue, 26 Jan 2021 05:17:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667024; cv=pass; d=google.com; s=arc-20160816; b=XyDVA2bkg6Olon3Jc0ElsoMqI5WlGgAUmU3yva5lnGV272HaVxvQICvkiAeACmdMnj FbAZBwHR+rmV56FBte8Oq5wAhvhvoi4F8tNjUkREDTbyyRWpXE3jIqMeLNw6BP7DSQmk G6oqXQRmgOX19gDfNio1xqAy4cWuu1zUC4RFcZLOO45EU4MakzhdmK17qYX5n2Ym0n7d YBXxLA235DZmXRu6dWKvRyxNbx/qugyKYf3deJ7O9szpPX3b1Db041v7mYSUbOaAQGd+ VsAlvXh6R4jJvNrtfOeWrUcDCr+a8DNa2VmN0KRESGy4JrZWaVP9l+0isZZMh6oto+4R MwCw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=I1cCnXPxdP7btI4WPWAU5MJaM/cZVRpN4+9gfMQ9x3E=; b=C7KdDoqp24kCAhxe5hywfBqHttlvvphGUPD2vadG6y9c2N86RfWoq9+9ixornXXQHl Cvqqwm87nD5UZ/EmGO9DjVTAaonvORVtWHZOOxlA3wMO1nvIWRkBVYD4pkMryKOjOcEo Q7/cgz1851bVsE28NbeyVnPzos7OvmArH/ZPD6UKTAxE1+gOExn6dWlL4djsU8exwS7B 88p+M2mQPDxBpukJGo0lFO0cu2YfcmbOfz8xe/RYBP+YJ0Jpxuqor1a+s1T8HdnFA09O VayotWXPgm+pXp97SPaVXYo+AAJOkTuN05aVIAbQ7b1PKbz5mB0XjymiwviSBYrhBsg1 VyEA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="dVU0QQZ/"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 2a01:111:f400:fe0e::60e as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060e.outbound.protection.outlook.com. [2a01:111:f400:fe0e::60e]) by gmr-mx.google.com with ESMTPS id m2si143017wmm.2.2021.01.26.05.17.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:17:04 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 2a01:111:f400:fe0e::60e as permitted sender) client-ip=2a01:111:f400:fe0e::60e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lgks4+qVDT4jp8Vs18jBfFgCb9b7iwfp+rU8WcbaihrBY4H8bJjZitZnSJyjOJQMOOwJSviH2YD+w9j+0rpfYl3/vTBiKbUKR1z0ZGUr/ikxthZRKWS32/vtLFUEN9Vc+SCBpzxg7ml6HDRV7zJZuf0IXqKnZMV19g/bpJ5pcEX6BEfhRgnZ2MD8U72Md3bB6fX/P2tiIGjaHWIdtDbVhUy/M76Al+3ASu3uQIRFDwKKHNSfh15kKkQ2bja8jPArvBwcah9lZzZZGL/lmfaAUAc2kUOL0penetI76ZfsVMdcGu2uiAzNUUgq6jaWQrY4q43OhnamzAypvYcC90PYVQ== 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-SenderADCheck; bh=I1cCnXPxdP7btI4WPWAU5MJaM/cZVRpN4+9gfMQ9x3E=; b=MLpRwNOjiGeDVIvOrUpRwDjjtnq7vpbhU1Xc2RekMyrDoubaUDaMNqnbRAKqViwzlxxlFLrTTbEOmlUdOxxLqVIbdgnqlgUrCik5IZdyZtpra/cOrvBOujB7RkFlZqkrvHiNF2iqLaRBHo2/VUGjsLawqHUoxXamgdUtFNnIHJHbP2Lr+OG2egrees9NM5X3I9YW+lQiMTkGaEa0yxTDPES5OLGrNWmWfcpv6aL8BRB1Lb3Cc1vVd6r31mbSjcHJJP3rt4eCKQ68P9ALKAkzN4fPHz/dQNSebmlONb0vtl1AAB+N9ADKsLJbumRNA5vHOlOYvF+pHh2T5cGc+qHL5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM0PR10MB3603.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:156::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.17; Tue, 26 Jan 2021 13:17:03 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:17:03 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 7/9] Use new config API in suricatta clients Date: Tue, 26 Jan 2021 14:14:10 +0100 Message-Id: <20210126131412.3567-8-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.16 via Frontend Transport; Tue, 26 Jan 2021 13:17:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c7c5c770-d73c-4fad-0310-08d8c1fcabd9 X-MS-TrafficTypeDiagnostic: AM0PR10MB3603: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:217; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G4CNYafaL79BNTi8dBLu9baH/WwkK2vnlqIEtxr+FNqKNDKrGSPRTeZkRkvoyojvnjG3/R9qne91B0MPAllalaKEo/mI747egrVEppHuXNg59Q/u5nRvTr5aTeR3djPVvrUNVlJd4gfznAUb4aVzGNrPeQiahNukFvsyyi3tBqtq0PfEAOFZAtoJE6gCumlzfV03u4E1GeEptSfIL9tbwvWI3MJUSvmHfi53S7iUZ3EVR6ymjR5vfYa5xbBRCfY7FSXZB1mL3h8xaflmc9QnHCND6FlkMvnYdFFCTcrOW+VZ+1cx6WycN+t7LBis+6K0JhMwixFlFilmyD7WSCuD5pfWKrBQTlgXmARG45YS9H/tFS22qy8YAYnVCUX0PvlW1T/OEGovr362jBQpcXYqXA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(376002)(396003)(346002)(366004)(54906003)(8676002)(66476007)(316002)(6486002)(6916009)(36756003)(6666004)(8936002)(83380400001)(66946007)(478600001)(86362001)(6496006)(44832011)(186003)(4326008)(956004)(2616005)(2906002)(107886003)(1076003)(16526019)(26005)(66556008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: JJIAooy5DnD43bJUqvxIF01Z7Ymu6C6s0LkuHikgcHXtQ9s5KT90q7KoiJlBmk2QTkSOgR1YWhsUgyilDGp/nz+Cjp0Sx9NakIqbNfdMTRo1/I8iedZCjP683mfxerX779kiML7I9j4565wzixnSy24VX2VMxNvXTe+ExqSgrXAvogJnpy5G87S8RtQ4PPMGvJzzypnVFqiy9lFdLr7YTevTMjaPqPdWvt7UIvVvt1NE08hyauGajOs0ftVY6C3ZZn3ofnTh5MDQWUicwx7J/8jbDCoUEt03YzHsagExMkL2KrKugLf7oXxw9YCsfXqaHppVNZr6GkEFSIG97jVHrOQoxSfEXXsZG43wQXJnGXodOZTdeKYJAJBlg0B4nEnkYLXTkMDk1tpUl7JgwqVzYGdbgwK6R6HmjELSd1fobNmihKuTcZVIb3jjSwmnSPJs3NsW6Dp3tOya2n4C805nIfqcS52AKzdBVL5NF+vvM4Fx5jNY/TPrfdv2jAUb2Juo3X6hcCmNsK59PVYwmm36NYhTfBRYciw1nZMVAYHMZCJ9UufUoGtr9ymdIyu2aX90dC/w7T0alSdgTI1bGdwq/PoJaemTqq/p3fWkceN69cz/EkMaYuDX8ySHULG5KyWAkGFhhppxr2Q2+Ib/U83Fxgk1yKqQTfvQmU+ijvPjvg4q0HUxbYVAC4Bsq3MTh4ARpjaO65H+DNBduZEFNwdDQc04vPWGfjfkhVNjHE6cgcDErfhhU/8ULjyTAB3xTvk7cEwYxvSLahNOjw3iEODtjxaOQjwxH3W9os8KQiuLyxbq2JKIhDIyXKTIDBOY0LiMlBeSZkkU+BQeRyUEmwBqCoXMz3ZKYQaJVLA72uyXxR2huZaSOvWELEQryAdL2xD6oiyd53TKJUZNLfBQrqkRp5HewHt9gzUrT14ZEbq2K/jQfHvctiwmRRzMAGXLHckuCnd3tLJoGfuRoFZKt2yYmX6UFC3uZnRigh41OGhHeSa3wa+XRWiYlyUXN1MdMXruE0PsjnmwmvbE0iIZ/rbUlAe+3O+bjsajayZo+f8UZEQDUjDx7HjxL+aaA26jug54 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7c5c770-d73c-4fad-0310-08d8c1fcabd9 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:17:03.3749 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uaVr3cfFGVLKpw3e+YfZjQ4oMsaqeSk0Z3GbfZp77lhlmrd4Y7W/Z6zs94oAfAWyIFIgY9NL/LfPpAGGSYkpKYnX/m8MFfSMxLcB+X/MoT0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3603 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b="dVU0QQZ/"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 2a01:111:f400:fe0e::60e as permitted sender) smtp.mailfrom=michael.adler@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: , Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- suricatta/server_general.c | 8 ++++++-- suricatta/server_hawkbit.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/suricatta/server_general.c b/suricatta/server_general.c index 1803981..6ffc030 100644 --- a/suricatta/server_general.c +++ b/suricatta/server_general.c @@ -604,11 +604,15 @@ server_op_res_t server_start(char *fname, int argc, char *argv[]) LIST_INIT(&server_general.configdata); if (fname) { + swupdate_cfg_handle handle; + swupdate_cfg_init(&handle, fname); - read_module_settings(fname, "gservice", server_general_settings, + swupdate_cfg_read_module_settings(&handle, "gservice", server_general_settings, NULL); - read_module_settings(fname, "identify", settings_into_dict, + swupdate_cfg_read_module_settings(&handle, "identify", settings_into_dict, &server_general.configdata); + + swupdate_cfg_destroy(&handle); } if (loglevel >= DEBUGLEVEL) { diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index df48180..165e686 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -1650,19 +1650,24 @@ server_op_res_t server_start(char *fname, int argc, char *argv[]) LIST_INIT(&server_hawkbit.configdata); if (fname) { + swupdate_cfg_handle handle; + swupdate_cfg_init(&handle, fname); + /* * Search "suricatta" section to be compatible with past */ - read_module_settings(fname, "suricatta", server_hawkbit_settings, + swupdate_cfg_read_module_settings(&handle, "suricatta", server_hawkbit_settings, NULL); /* * Then try "hawkBit" because each server has its own * section */ - read_module_settings(fname, "hawkbit", server_hawkbit_settings, + swupdate_cfg_read_module_settings(&handle, "hawkbit", server_hawkbit_settings, NULL); - read_module_settings(fname, "identify", settings_into_dict, + swupdate_cfg_read_module_settings(&handle, "identify", settings_into_dict, &server_hawkbit.configdata); + + swupdate_cfg_destroy(&handle); } if (loglevel >= DEBUGLEVEL) { From patchwork Tue Jan 26 13:14:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431678 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::238; helo=mail-lj1-x238.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbvfmycaamgqetbr267q@googlegroups.com; receiver=) 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=DUDE6FGv; dkim-atps=neutral Received: from mail-lj1-x238.google.com (mail-lj1-x238.google.com [IPv6:2a00:1450:4864:20::238]) (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 4DQ6hm5V6yz9sRR for ; Wed, 27 Jan 2021 00:17:12 +1100 (AEDT) Received: by mail-lj1-x238.google.com with SMTP id 2sf8053701ljr.17 for ; Tue, 26 Jan 2021 05:17:12 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667028; cv=pass; d=google.com; s=arc-20160816; b=FpuqhlNHGllhOTfz1Omi788bwLomUVK9xqogzHnuR97DXWnFP+2wUZMkDcacsULII8 ZROXnghAWwW5vXC6fDLPHI2ciHwNQ8YpF5nzOKQJBwAdvwaACeV1cIHBqXsBpst+Onde jBYba+XGbxNinFFh3DHwBohngZajKMJmoyACCEpz0hMLUCs4W+NM5ymMqDRyz0iOxLhH nMsBacLwGNY+dv+LnKlv86st+DfSdDEpPB/qpEcwDHJ6ye9IuVcFcahuJAQFy6AUhKYC YIVu43oOG1e93yH1nXBSqvkZpr01cak6d8fLuhcld3u0LfM5qT8FhJEpkZiGzHjZj7vj xoOw== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=2CZqIPKEzZkcqb1GlaBuv03Zjqbl0gjgSsDKkndVbZY=; b=chbuCtcXLKxvFBg4KLsoTcw9z5MFPehrL4M9KRBr0kMC9xjf11IU8tPqM1sYKezUax HkzoWgRuZ2wRVYXwBg5oy7zwFUERGztliJntfWOjO5N4430sTsgqM/z1iI2rjnMNFjAG z2vfE3TR34uEIiFj+M/7W263K1op5BNnUSdpITMH/elnT2toiNHx5i8JIqSscJDhzFzO gEaVEovYFKkDzSwiuKIwW+z3KZxIMvL7/zLGemUfZmlFVMEF35lshljDL5YQVbzrXOGs an2BtFmgh7KxszKwyaje0axKSpmqVuUriIdCuZlY/LWomTU/WRjLjHXUDaEsS1r6fO5i Mliw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=c5RE+oij; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.52 as permitted sender) smtp.mailfrom=michael.adler@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=2CZqIPKEzZkcqb1GlaBuv03Zjqbl0gjgSsDKkndVbZY=; b=DUDE6FGvjMA+K+qDQluC5g+A7vfOmyKxBPfTu9H6eZXdVik/0h9ctZWVwq0w50bjtb jLdDlujcE2PcXTL5KZQdS5U3+Kf7ycN6ZOFfLNp21So3sUjpouyKgqOlzJjxB/0+qd0F CrYWTnl7tZUOeNtbvFKBrLsBJzbBsykSpGJMK25PwvYb5vBBx+hJSrBQwts8Lmx58yQM khlnJgx6i/LXxTFyVaa7LimrabytBU/JO+5ZvS9XpfVWY/IMxNsKePbEWSVpUJ2ZA6ue Vw7SdUfMTKTiYATSoeOwfnteWioygY/r5VV4wuimICtY7FEheJHfOwSsrswhAjm2Uyjg TKhA== 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=2CZqIPKEzZkcqb1GlaBuv03Zjqbl0gjgSsDKkndVbZY=; b=aWNNPdawLCJ/hs9aTcLd+KUTj3MFAePswd1YHX5w/b0qmjbNLdnhunTmOUpoz/0rlv YY8iBpQrzsOh1rcwFSfrxce22peMYqyIkjdhPt7/trL5pXaNBdoDduV0ac/CAgYfjc8S VBG4f3H1okSyvltCnNfPQlrHGKug0p50EY+MMDR6B8WHWtFxm0oh6H1VgMLVUQcvIRmI V2vX3aw7xKxe8e3AiPAx4liFex9pJnezbRf975lrwQEfjtYp90nx21n7MviRWlleLlZp 7UXU8Z6hlwmgLtWFyH5YILPLBF8zAouIILEcAEt7RY8hBy+gCwsVrSa29w42qJzDTjrL T2QA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532mSniH7SOaqLef31gnx2e169zt28VNXDc902WsDjn77C/cZIud Q87WzN+9AQw1LNM9GhKm1Hc= X-Google-Smtp-Source: ABdhPJwuEsmrJLIIKM52VXcN5OMk09xy+qbvMYuhV+bfUc9Ur4bNCYYTxLXVpoaOH1ai4DtE0xVy6w== X-Received: by 2002:a2e:974c:: with SMTP id f12mr2872275ljj.101.1611667028648; Tue, 26 Jan 2021 05:17:08 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:974c:: with SMTP id f12ls658936ljj.8.gmail; Tue, 26 Jan 2021 05:17:07 -0800 (PST) X-Received: by 2002:a05:651c:211b:: with SMTP id a27mr2779675ljq.433.1611667027816; Tue, 26 Jan 2021 05:17:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667027; cv=pass; d=google.com; s=arc-20160816; b=gOgO+P6y640LGyhtnVTiMdiqKm+irYZ7CMyOI1fCyvclkEzgkjXyULCYC7P1Ay7ywu F0u91DTQ6F+qWg6eBYWJR6FjaylKkrIbLOpaEsm8oBd8vcPc1ZoxZ9fmV2Na2wTGlmBD cMiDBrcYeO2WyzCVQzFWg/orL6A4T6VI4OHP00jCdHwywOGlprYQp+LNQlhfz7s35K5t hiG2Fv06++RBTzXa5xGTf8uirAp91TfKGhDBnZuDvv5DtYOyIqXxBtmpEdVk0DULgvN/ aLDUr6zMMrisPZpZszbx5JsVFrhhLqsEpO/5VKSIAD5QGKCyyYyUJ736WoisgiYUHhDa f5Og== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Sl8h7Jw34kao+/4C3KPAT693l93FTT3oxH2qz7PrzN0=; b=BJMmrjdtEgWJwpzKjpUctyg+X/Nkd6WrqS2bXb+Lg2mnE5oX+MkhtYBagq5u+Y4wuY 45HP69Mcscl+7GzgLy4tKzyKjSLuE0TpGAGCsC/0ShHlj/6W2YDNnkModnkYM6MpKdmq CM6DvKdrb+jLmujmTj4bXPHy+HDuPGMJNqTNZF1xzYRqdCR9KnnlJdkWOCDzsia6SANn srMW8k08Pwsvf33fFcHJQo6cJqgU0BQ7UkMWAa7kvI4yzK5msvosD5hd9h/hydvIY6hk HdI4EsLZbEI8uBCapCb8eZshmC22lFSnZPkAs1aSwX5xUxZdr2aQBfOuxRPWatoU7YFb 9Vgg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=c5RE+oij; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.52 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2052.outbound.protection.outlook.com. [40.107.22.52]) by gmr-mx.google.com with ESMTPS id u7si326057lfg.2.2021.01.26.05.17.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:17:07 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.52 as permitted sender) client-ip=40.107.22.52; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JIogPooP7cPMMhnkP8rqjPJM0/uVLXMWNw2CuotOO+I51AzSvJi+o+nkmLlVhYwK/+wDDW4pkcTlYsMTc/qg09mAth57frpwGd+DKpLM0XTJp73erYFAJodziTa6NWvB1exSzc8psEhkSeS8pAUCBE02q64KQoJT4rMtax2jM/62KmeEgPXuTsv9pPrOzqtTdnZT2LHX4RKq+kYmjVG5btVhIVUkwKkl87Jq92aLIACROJjKt614NrMVUxoH48KF8K9a6xIfBHtnhepFYHsFhQGxqZLuFPiaT/3aH9XvmjMnBxBPyNw/2THJkWPIwKu1MrcUf+AW1zu3Lc7SnlxHsw== 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-SenderADCheck; bh=Sl8h7Jw34kao+/4C3KPAT693l93FTT3oxH2qz7PrzN0=; b=mzFrcGQmRTTSfxNSmHxLbBROrJ5YEfWCmDZrwciPf4IgmH9hYeVtuRRKGFpQxcVXlgE1zbKYVjgOiEqPDwahRPa2r9uDCG5gBaMhhcbQlv8VHQwvGps+LP5qjbdvw6meZYni4uoNH0kuy9r5Z2aknvEYdcLJiuTq/H/qzKK9+wq+u9wmmnVxDnKAgP7N8y1kMbWpRujX+a8YCfotsoHhfy3+jF3v63ARMPzsczKw7s9LLv52vOoWAXUVk1MuwCwGdL9gSjqfHVJ11aF1/TwMxDRBekMzLPeM3A4N8oZwvJsVFj+N8OkPUdTdsoIVAz/xtTmODUl6zN4XQpO3fCSe5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM9PR10MB4611.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:269::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Tue, 26 Jan 2021 13:17:06 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:17:06 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 8/9] Avoid re-opening and parsing swupdate.cfg for each subprocess Date: Tue, 26 Jan 2021 14:14:11 +0100 Message-Id: <20210126131412.3567-9-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0021.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::31) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0021.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.16 via Frontend Transport; Tue, 26 Jan 2021 13:17:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: fbe51d9a-1226-49cb-80cf-08d8c1fcadbd X-MS-TrafficTypeDiagnostic: AM9PR10MB4611: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:134; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3yE9vvlNQDeEOujBhFswvALrG3XA+PlPVxhcE/v2YJIOtFjIdJZVDLru1zh8s0jclX+nHveMDS/1PPkZJGYXb/CfgPx7E9ue3muKrwZiSlLuH6fHGlFR8RgKeUj3kpS5r6dgNN7QBxeqxAb7QmEjt57PQ4XUo6efqvmOddCbpmN6drtQmg/6G2+oa4nXlebc4dO5ISg8YYeHJjf2hsOIYW5E6wQd9Yf7zmcA5ARwZqz0hxKyL+hWfm7BFrTada8wxSe7zHbtYgaYKAPyViEhBPwXj76GwoBgrAAp58M5a8IAkS4BWvUExp+vk9D/ZHwhA9xriWoXX7D1mQGkVgRH4duO2Pi5zh27dkiaQ1QQO3Eq1UUGdwOYDm08VS0L93nP20581l/PYIsWJe3GFaTu7A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(39860400002)(396003)(376002)(346002)(136003)(86362001)(66476007)(956004)(36756003)(66556008)(66946007)(8676002)(5660300002)(2616005)(6486002)(6666004)(186003)(107886003)(1076003)(16526019)(44832011)(478600001)(6496006)(26005)(2906002)(8936002)(83380400001)(4326008)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: H6F2FQ8ACP5EDGLjWRsIWB4MV3gjIZI5jttyFIJhNRRFPcVSzeHVWMXTQpBZRotBNxJeycf4ox1EeVAhyeWbtzKCt9nunwcjiHJELSKI6lx6gTqpMziGUSMHzyRSxVYkiwL3fz7koos29Lr5/mUvxGw1L4mTcPiyANRdj8z6oZScDfhOWINt1XhST75matKfCSAEUjz+1Oor6Ct4bt3v6V+/+JSAiWkDs8Ktyp8L4ILpHESj9wa3byguGBnG+jjBbSDbOf3QakEJWsNLOwrg2IEZwkPsrLGpg6HTv3MrfFgPyRA1BoYi5q1nJ7U9VqIcwIuQK1IgiNV8hS+bGuNJEli7JRa1E1uOxeHf1pq/IaASIQI31EeX6VtgSrVSdynETSRPt2Yxy2TAj+Msu2xhwfOPJQcjG0j3utAr54Sgp8TI85W4k3d9qccSFyRNljEkUEDgilMQyy0yJOTCue0y6I5Gtd/PAhM8j9U5vdgpqA3Ldtac9sCS1mZcrfhbRW48wqi9Ax3H8nBPtkhsLuINCVj+2C9VML4FeX7hJ9RLFKhI0B7r29O1cKI7/d3WDyHRdieBC/LgnncA/GuuvsGVRN/OcBLTa/ia5vBa26CbQgp685hHcY2Yuzdvjvubu1moA6+k7KeRqK9HRgSn42L7QXS6nyFQ3CE5to81KuwrdiWnzJ3lkz5N/RHXuirKu+tW0C6UI21eFfqA56QfwlfyZOOepCjBRMsa+T29lRjMCmzQS+f/CRYN5jVfj34jKzc9FZCAyQZZStOWWpDXgI1jkv7oDcRuXXwKlwrD6ZaTX735ysRkoExjxIFqclgkb3EpVHecPCh/4U8krvd7yYf5Yb6hg8qKSTGqSc/re8m2X+bvOq+cCyXCfpv1k8A+gNqTnEV37Y2SQE4CTQ8NmpXlbx3i546Nh9EA3INd+Gb4ZhNhmpBN3VdyGTWZBmia7fH7eJzu8UQwo6QZ1IOfTSsz6Sds2AmxHvn5E8B6C4IgzB+9vQEbnAcEpqFU5Yl+lgfWyapU2mXoIPfeWJCiyGp7fX98Rfto8rOoliB5u3qnSpZxzf7T6oC4mt1m7lA74qAY X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbe51d9a-1226-49cb-80cf-08d8c1fcadbd X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:17:06.5111 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LJ+JRKpMHaiwNCjgHuCLs0IHvN0TU4Zt2oV8NO5V2xfZivKE5TWZ2em+Gw99oIYRn4OfCS5fqK5Irc7AAc3VKP2Fu8QHY5EZ+hihbMzXKnQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4611 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=c5RE+oij; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.22.52 as permitted sender) smtp.mailfrom=michael.adler@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: , This is achieved by passing uid and gid to start_subprocess, i.e. an inversion of control. Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/pctl.c | 20 ++++++++++---------- core/swupdate.c | 33 ++++++++++++++++++++++++++++----- corelib/swupdate_settings.c | 6 +++--- include/pctl.h | 9 +++++++-- include/swupdate_settings.h | 4 ++-- 5 files changed, 50 insertions(+), 22 deletions(-) diff --git a/core/pctl.c b/core/pctl.c index 01ad540..481f077 100644 --- a/core/pctl.c +++ b/core/pctl.c @@ -165,19 +165,16 @@ static int spawn_process(struct swupdate_task *task, } } -static void start_swupdate_subprocess(sourcetype type, - const char *name, const char *cfgfile, +static void start_swupdate_subprocess(sourcetype type, const char *name, + uid_t run_as_userid, gid_t run_as_groupid, + const char* cfgfile, int argc, char **argv, swupdate_process start, const char *cmdline) { - uid_t uid; - gid_t gid; - - read_settings_user_id(cfgfile, name, &uid, &gid); procs[nprocs].name = name; procs[nprocs].type = type; - if (spawn_process(&procs[nprocs], uid, gid, cfgfile, argc, argv, start, cmdline) < 0) { + if (spawn_process(&procs[nprocs], run_as_userid, run_as_groupid, cfgfile, argc, argv, start, cmdline) < 0) { ERROR("Spawning %s failed, exiting process...", name); exit(1); } @@ -188,19 +185,22 @@ static void start_swupdate_subprocess(sourcetype type, void start_subprocess_from_file(sourcetype type, const char *name, + uid_t run_as_userid, gid_t run_as_groupid, const char *cfgfile, int argc, char **argv, const char *cmdline) { - start_swupdate_subprocess(type, name, cfgfile, argc, argv, NULL, cmdline); + start_swupdate_subprocess(type, name, run_as_userid, run_as_groupid, cfgfile, argc, argv, NULL, cmdline); } -void start_subprocess(sourcetype type, const char *name, const char *cfgfile, +void start_subprocess(sourcetype type, const char *name, + uid_t run_as_userid, gid_t run_as_groupid, + const char *cfgfile, int argc, char **argv, swupdate_process start) { - start_swupdate_subprocess(type, name, cfgfile, argc, argv, start, NULL); + start_swupdate_subprocess(type, name, run_as_userid, run_as_groupid, cfgfile, argc, argv, start, NULL); } /* diff --git a/core/swupdate.c b/core/swupdate.c index a76e670..3729e32 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -545,6 +545,7 @@ int main(int argc, char **argv) } } + swupdate_cfg_handle *p_handle = NULL; /* Load configuration file */ if (cfgfname != NULL) { swupdate_cfg_handle handle; @@ -584,7 +585,8 @@ int main(int argc, char **argv) get_sw_versions(&handle, &swcfg); - swupdate_cfg_destroy(&handle); + // save the handle for later usage + p_handle = &handle; } else { get_sw_versions(NULL, &swcfg); } @@ -847,7 +849,10 @@ int main(int argc, char **argv) /* Start embedded web server */ #if defined(CONFIG_MONGOOSE) if (opt_w) { - start_subprocess(SOURCE_WEBSERVER, "webserver", + uid_t uid; + gid_t gid; + read_settings_user_id(p_handle, "webserver", &uid, &gid); + start_subprocess(SOURCE_WEBSERVER, "webserver", uid, gid, cfgfname, ac, av, start_mongoose); freeargs(av); @@ -856,7 +861,10 @@ int main(int argc, char **argv) #if defined(CONFIG_SURICATTA) if (opt_u) { - start_subprocess(SOURCE_SURICATTA, "suricatta", + uid_t uid; + gid_t gid; + read_settings_user_id(p_handle, "suricatta", &uid, &gid); + start_subprocess(SOURCE_SURICATTA, "suricatta", uid, gid, cfgfname, argcount, argvalues, start_suricatta); @@ -866,7 +874,10 @@ int main(int argc, char **argv) #ifdef CONFIG_DOWNLOAD if (opt_d) { - start_subprocess(SOURCE_DOWNLOADER, "download", + uid_t uid; + gid_t gid; + read_settings_user_id(p_handle, "download", &uid, &gid); + start_subprocess(SOURCE_DOWNLOADER, "download", uid, gid, cfgfname, dwlac, dwlav, start_download); freeargs(dwlav); @@ -883,7 +894,10 @@ int main(int argc, char **argv) dwlav[dwlac] = NULL; - start_subprocess_from_file(SOURCE_UNKNOWN, proc->name, + uid_t uid; + gid_t gid; + read_settings_user_id(p_handle, proc->name, &uid, &gid); + start_subprocess_from_file(SOURCE_UNKNOWN, proc->name, uid, gid, cfgfname, dwlac, dwlav, dwlav[0]); @@ -910,6 +924,15 @@ int main(int argc, char **argv) sa.sa_handler = sigterm_handler; sigaction(SIGTERM, &sa, NULL); + /* + * This process is done with the config file. + * Other processes will have to re-open it if they need some settings. + * This is necessary for security reasons since they may run under + * different privileges. + */ + if (p_handle != NULL) + swupdate_cfg_destroy(p_handle); + /* * Go into supervisor loop */ diff --git a/corelib/swupdate_settings.c b/corelib/swupdate_settings.c index f06ecf7..1669f37 100644 --- a/corelib/swupdate_settings.c +++ b/corelib/swupdate_settings.c @@ -94,7 +94,7 @@ static int get_run_as(void *elem, void *data) return 0; } -int read_settings_user_id(const char *filename, const char *module, uid_t *userid, gid_t *groupid) +int read_settings_user_id(swupdate_cfg_handle *handle, const char *module, uid_t *userid, gid_t *groupid) { struct run_as ids; int ret; @@ -102,7 +102,7 @@ int read_settings_user_id(const char *filename, const char *module, uid_t *useri *userid = ids.userid = getuid(); *groupid = ids.groupid = getgid(); - ret = read_module_settings(filename, module, get_run_as, &ids); + ret = swupdate_cfg_read_module_settings(handle, module, get_run_as, &ids); if (ret) return -EINVAL; @@ -165,7 +165,7 @@ int swupdate_cfg_read_module_settings(swupdate_cfg_handle *handle, const char *m { config_setting_t *elem; - if (!fcn) + if (handle == NULL || !fcn) return -EINVAL; TRACE("Reading config file settings for module %s", module); diff --git a/include/pctl.h b/include/pctl.h index de5f3b5..84cf549 100644 --- a/include/pctl.h +++ b/include/pctl.h @@ -9,6 +9,7 @@ #define _SWUPDATE_PCTL_H #include +#include extern int pid; extern int sw_sockfd; @@ -28,11 +29,15 @@ pthread_t start_thread(void *(* start_routine) (void *), void *arg); typedef int (*swupdate_process)(const char *cfgname, int argc, char **argv); -void start_subprocess(sourcetype type, const char *name, const char *cfgfile, +void start_subprocess(sourcetype type, const char *name, + uid_t run_as_userid, gid_t run_as_groupid, + const char *cfgfile, int argc, char **argv, swupdate_process start); -void start_subprocess_from_file(sourcetype type, const char *name, const char *cfgfile, +void start_subprocess_from_file(sourcetype type, const char *name, + uid_t run_as_userid, gid_t run_as_groupid, + const char *cfgfile, int argc, char **argv, const char *cmd); diff --git a/include/swupdate_settings.h b/include/swupdate_settings.h index c8e4f1d..d98c73e 100644 --- a/include/swupdate_settings.h +++ b/include/swupdate_settings.h @@ -25,7 +25,7 @@ void swupdate_cfg_destroy(swupdate_cfg_handle *handle); int swupdate_cfg_read_module_settings(swupdate_cfg_handle *handle, const char *module, settings_callback fcn, void *data); int read_module_settings(const char *filename, const char *module, settings_callback fcn, void *data); -int read_settings_user_id(const char *filename, const char *module, uid_t *userid, gid_t *groupid); +int read_settings_user_id(swupdate_cfg_handle *handle, const char *module, uid_t *userid, gid_t *groupid); int settings_into_dict(void *settings, void *data); #else @@ -42,7 +42,7 @@ static inline int read_module_settings(const char __attribute__ ((__unused__))*f /* * Without LIBCONFIG, let run with current user */ -static inline int read_settings_user_id(const char __attribute__ ((__unused__))*filename, +static inline int read_settings_user_id(swupdate_cfg_handle __attribute__ ((__unused__))*handle, const char __attribute__ ((__unused__))*module, uid_t *userid, gid_t *groupid) { From patchwork Tue Jan 26 13:14:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1431679 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::23b; helo=mail-lj1-x23b.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbv5mycaamgqebo5yofi@googlegroups.com; receiver=) 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=TbSL/K2B; dkim-atps=neutral Received: from mail-lj1-x23b.google.com (mail-lj1-x23b.google.com [IPv6:2a00:1450:4864:20::23b]) (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 4DQ6hr0cW9z9rx6 for ; Wed, 27 Jan 2021 00:17:15 +1100 (AEDT) Received: by mail-lj1-x23b.google.com with SMTP id g24sf2493605ljj.0 for ; Tue, 26 Jan 2021 05:17:15 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611667031; cv=pass; d=google.com; s=arc-20160816; b=sMYCsdDwO1ntMhENAXMecTbAbZR+6ueEnTBz36+4cBC7qNJWQgVSolKa/bjWzXw7lT izl4kRsgHbWSaAQ6TCQh7fJIWolhsQ1FkLLxW+mvszBuQ3DnN7kFOKQWxVSgZiLbsDLo ++wNkTG0kJb/MyDfpujB/reSTHFeXrARWL0YhThZkyT7tLBpubWzySnk1unTWhHPxmXC SXDwZMKHRZmRSDWNdUJQvZ2py7ASMr/RFV0kzUMyFtAHq5kDBlO1IAFser8YAf9j8WKc UHEFxxLut0RmOUJ2Ra/TgINn7ZrgAzIDe7B6V3IuFwoNMkRRy+aECi+CCrrJHBtc8Ch1 wYig== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=t9gBX1qq0QxR/BiCAry1x5ZclIWgREhMx2HAedheeC0=; b=ud2LHDqDhmiI+MRmpCxZ0eEZV2tgjrxJYTt5eHXzIB/lNJVpAylxvReasdHVN9VaMd AumPg7Pq3q3m6xcLWmsP1oaNDIoIPgZcy8F1yrSDQPmC4jVVRg54xOsYZscuKHRmGxFl 3rKH2SlXQwkJENVR92E5R8uZwLRZjhCnhpHwo4kP19dpXJJ+0bOmLM5WiEk1fO6Z0Bja cyZllaWmuPeigIX3jrRq1/18YVNnXut4Zau9/n1Vh/56cDkJZBRaxSUat5idS3xQPYv8 lsRqXQk31CG+1eC2OmRqf1SE/30jqob6CZTgLJ1YABcRmFY1VZh2ZpNQg8kpVAl2G5BR KyzQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=PzlHfy30; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.40 as permitted sender) smtp.mailfrom=michael.adler@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=t9gBX1qq0QxR/BiCAry1x5ZclIWgREhMx2HAedheeC0=; b=TbSL/K2BJjUX9J2BJdiSM/cHM9iN/vWKnEZw4Cc6fefK0ngm4HEHqRx4kD1Ky/mZwf f00S3cLfVVPQt6BtYDkzd4yexCb7F2ApU+rxQN8++1ICR8N+/IqRV0yvNhBQ4JA2v9D8 EOoqJd73Th4/cyb2rWynoXd7Q+Lpc+nlm72Re8mMM8YBYqmUmtbPRYyh5QCPrYYzglBM a1ZJjOOMeeebQVi1md9eAOKz97qACJtmVctqWSzphOQAz9XeXbK62BZU5SiyrAOlIe5z kYBrdZweWR6yE4WYhFf7NKduY6uYpmcijDMdEoo+y88rN+NX9VLTGi005dW6Hwj98GHB J0Xw== 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=t9gBX1qq0QxR/BiCAry1x5ZclIWgREhMx2HAedheeC0=; b=t26xRaNJdPFZN/cugr9k+7ZO800vgvHUuzUyc+rKL2+QsQlWIixSCTxjrB+Z51N0fE dq4poLnTP6F4fMa8jPnMHDtnJdmXZLxl51vxMTIpu7As1k5cjUPQY8nHj8h992+/L2kM URrQQhi54WsuEPdKAl3Nm24dLuw7W0m2goWrZj9iFUs7zmSGdtbxrqHcqcSI0A1LlSIc 57e8EQY6QyfyS+JWGn5c5OAW4mn3vq0X/skD4XT5mwifeJTvbPFk98PScIRKbTxhav+T yuwoEelj9DfQ8WXv7NDf+39rAaRL0M1Ob5CxT3mcF/T0QZrY9ZKm1wQlPRNDvEONmwsT kniA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532DKj9uMrHwcoGCjmYaz37vMDhxvXP/h/M0rM25gZJ0BdkXgSwL q4evesMpmy1SzDzvQrn+6bo= X-Google-Smtp-Source: ABdhPJxDcGz1hwobI6VP6ubKYdHK9EjwLWY1wlq1tK/yEOiYmqCGcB/iA3vPTmpG/D8f39oROamiPQ== X-Received: by 2002:a05:651c:54a:: with SMTP id q10mr2909112ljp.454.1611667031625; Tue, 26 Jan 2021 05:17:11 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:91c3:: with SMTP id u3ls659468ljg.10.gmail; Tue, 26 Jan 2021 05:17:10 -0800 (PST) X-Received: by 2002:a2e:9b83:: with SMTP id z3mr2907396lji.82.1611667030618; Tue, 26 Jan 2021 05:17:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611667030; cv=pass; d=google.com; s=arc-20160816; b=fh/p9dWkAVOD3TeBNJfd8beipGCMw8L9mDwvsJ4HSs6kcOfHyOMv3qpjp1sjw0K+7h L110PqEAIEBIOxSsZdA96GZY+u2KVHJ7KMgOwJJkn88GmOHVklGAKNztOIup8HtzJQO5 YqMxuQCUtkyiuO6ojI4FWeyIdUMGNk+iOVcd/XIHIUCkYCDExKMJCKJuB2a2VdrKiSLe Da1XNpPF+6P5owgay/m6WAO8CleHV37N9Owlbo3mrCOgqeogPv10N9je93prcqN0QoJA Luzos2eQ7QF9Bdfu3S5IFRKkbnCUaHgmmP1wBXUFKC8SzOjPb2+P+dlG4mcVGBOmb2Gx fJ7Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=PhhEfifVYR7R3OAcpArZ+hZmtDrUYx3+SNjF0te2m4o=; b=RP6A0bIzbRfehYMa6xnx8ENIYmSi9AwC0i0Ee4+6fMduAyiafNqj6OdEkpOwsLgizz uz3qOtmUz21QpxU9rIpfufemOpADObxRI23HjPUIGNQsXmX0iNBw4Tv5ZaHQJ2rbRqnl R3L+zCmtUcpuKT3FPf8XIr1I6LlwbzBiRLbeso/bgj44f9EpSO6NlqSuMAIF/V9GsZNZ SLxcfzOIYERsOFf3gYsxhzHsYTWJCPxFaev80a7Wqyguw3a87Lo/ckIBkCS6pnHAUqKo WBRS785Gjd2EkwDg9ldL/03W0MFLJ1rBnOuRuj4RoaaPGUU2B8JnBcO2d2Mjz4PM3SjQ +JBA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=PzlHfy30; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.40 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2040.outbound.protection.outlook.com. [40.107.21.40]) by gmr-mx.google.com with ESMTPS id v15si26193lft.9.2021.01.26.05.17.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 05:17:10 -0800 (PST) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.40 as permitted sender) client-ip=40.107.21.40; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E8KYMs5CZ/aKGz83njnzw5E0CTtd8Dm58MYYzQVh8hisCLGjHCajedrNgTk0cue69fTNeNYGepd7DC40PyNvi6d8ieag5IFueDNTTv4k39XDVaT74MWBiHxLYaLg4nD7A7l9IiTHUfoosMIM3GOU/uoBDzCtqns5TCrhFEiEzsUJl3XffKPt+DpMwm2wdZ2eUsmYcdgru6fa4//sCKp98vHD025YPAxOzbnMR+HWxWrr1/JRRmpd4V11rAnO5q2xzyiJWQQ/dWs9+R4zid2gLFf9T0Y3ml5HLu1GlSCYaSseR2DsPyq8ja/3I0OXRIDdnN7o1QbTikcC3VkFkHOpVw== 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-SenderADCheck; bh=PhhEfifVYR7R3OAcpArZ+hZmtDrUYx3+SNjF0te2m4o=; b=KolHfNv4d6TOpMDwN4eJaWKDtO9gpkZpiLheSFt36Nwi1cOtboM7yFT10KEDy3tX+FxziqiAyLSRMUyzViELoDCAFYbff7b1EhOLfoaqQA7Z6oC26tycB2zNjosfaK67ny7XhHWdX4cFLfd0mjrBmtFGwlbVRCT7He5g/Jwspub21bFAHm3Yg+I/xlrvcRifGyA59/NhBst7dIlIT4y6i+1Y8PYaUvr2y5IdI0je/G8HJfB5xBpi96mGQXRVwgXsV/o5oT9ha754lWFDopIxekjX3M8ZxdoiX5tv/XQoG2xD7NyTe2KS7ALWTbU3mPn8rNd7X9SWyjJNVvjQ6hhCPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM9PR10MB4611.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:269::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Tue, 26 Jan 2021 13:17:09 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::2838:c46a:e3fe:2c7a%4]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 13:17:09 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 9/9] Simplify get_sw_versions Date: Tue, 26 Jan 2021 14:14:12 +0100 Message-Id: <20210126131412.3567-10-michael.adler@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126131412.3567-1-michael.adler@siemens.com> References: <20210126131412.3567-1-michael.adler@siemens.com> X-Originating-IP: [93.104.69.78] X-ClientProxiedBy: AM0P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::28) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (93.104.69.78) by AM0P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Tue, 26 Jan 2021 13:17:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 32b62e5b-9f3d-4aaa-9df9-08d8c1fcaf75 X-MS-TrafficTypeDiagnostic: AM9PR10MB4611: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w7FVFj+emL6fgVUGvelLVTogOqU6KkoAWqd5KU9xz50vmvKbPOJTWqWDvTXkJbgVOUB/HUuOr2jRzL2Mw0fkDBaaZR7tQlzLzBktyH/Y0gU1r5fAt1MqD5Ykwm7h6nvdBkgAUXndEmZFp/kp1xOvQmldjakcVxNmY5Wn5WkBIF3ymkkiCqoojfE1Pvby2fhcv9ax8eH1XohHtFDZw6nn5M/Oi+r09unqjfVa1GuvffgEiedoFQ2hkl/+JBe/Lq4iCCDy3bL7+qUfHDBX6eHvGrlR/tBknBTXiw02ZV7tCnecsI3pSZstWSjp969pjRE8+6ESp04Q3sJVR1ReYSnZNzAt+ctx4iDNSkhxMngCI61tJbNoyshVR5skAz7j2EbFzFCwfAL1jEMi7PVoTKuQqg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(39860400002)(396003)(376002)(346002)(136003)(86362001)(66476007)(956004)(36756003)(66556008)(66946007)(8676002)(5660300002)(2616005)(6486002)(6666004)(186003)(107886003)(1076003)(16526019)(44832011)(478600001)(6496006)(26005)(2906002)(8936002)(83380400001)(4326008)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rvLjp3iKpICnIc93iHzfkwKk8bxgO8w5dZ+2gy51SCtD4OVR5CrpoBDR7l+4kNfnWOTC81rSuqQqiLX6oGnESn+mAuJRmzGgQ43juJVRY9cQpKggWcxPC693Dkat8ZokBIAze+kHG/OpC1L/Si1e2zsUaoSaYL1TvKsaYlwE8MY8Gn5tgA1E1QXBvgs65HgbeEu/fBmGjlLsbjiH6euX5y0L/wCnxLiUZFmdu+O7mONsB99KCjnddFgn2K9jrx61Nroot9jvDMsWZnFVroiE7hav56xrQqPg4V21WS1sJCmWEWNc2srQKsMvbn8DWcw2ny7mpWsut1Oj57/2ar1RBd3lACXSiubDKthyyFDohIw5VysHAM213EFMbuwIA31da0V/GXqu4ru2+pVDu+7iT8qZNHtG/pV35b5+XF4pv+dLUi3AQumFd5eC0wkNQUAnCRY4S24XJFFWduFL9vrGAdqyszp2bBg5ntJ3uNcW9nvZvmPL+xLRsclxdU23ifFQN09FXTJJ6qOfxyTH9fDfIajM1yZclWQqowIh1fhExN0Web2QQIrOTy+JY2XEnzgL0iCpcHuNBUoBCyOBSVQaX6Tvhx5PHF1a4KwFfdii9n3rI81OWvxT/asgAHv+LZJqJOhtQZMhdsVZGtIHi2WnArxxlGzBO0hryovFybYgkyx90ezTsFoB7Iqz81ndBmZgxi3vxOEwW8luHVl5LBtW0ClLji9YGEehIuH7NQPS2VB0xPHtPHD4+0Rv/Y/XZ6hF6DQxl+k1m47erXG87A6beGnYC6Xje7k9RxDUDhd/8vaCVLrXGFLUSimk/gNjVYkeVd2Tr1Qk/7H7yCCiNqVlr4mokaWJVGtkdeKvgW5YfTNPFa0nambAQPky3rpWF1fRUJ0YrnvtQQ0mYdrm/P2CurCNSa09quA1GrcofnpGBsIBTttrLcvGRuPTK4Phwi/FuUdQhpxMhYvWISIidgPbMZttRkRm2JzAQIRlN0PK7EZzuq8qGA5Vkw5iI3KphEy/1yhxYM+uctMNxg7LSt5phCxozQ+c8CUcYcIKV2nEubCnFZEcMSzCktOanKwkiwNk X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32b62e5b-9f3d-4aaa-9df9-08d8c1fcaf75 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 13:17:09.4114 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XhpUTg4UxQ6xUJ6OU0FBbVW+783qWGSnGHB7dpncE+VJp7Z5IVYYg/muLmpV9Uetgj8o6BuoWYkRbVtmCrlwMv5TIga9fmUla+TtZDKAJ2k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4611 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=PzlHfy30; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.40 as permitted sender) smtp.mailfrom=michael.adler@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: , Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- core/artifacts_versions.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/core/artifacts_versions.c b/core/artifacts_versions.c index 6074c33..63350d2 100644 --- a/core/artifacts_versions.c +++ b/core/artifacts_versions.c @@ -131,21 +131,12 @@ static int versions_settings(void *setting, void *data) void get_sw_versions(swupdate_cfg_handle *handle, struct swupdate_cfg *sw) { - int ret = -EINVAL; - - /* - * Try to read versions from configuration file - * If not found, fall back to a legacy file - * in the format " " - */ - if (handle != NULL) - ret = swupdate_cfg_read_module_settings(handle, "versions", - versions_settings, - sw); - - if (ret) - ret = read_sw_version_file(sw); - + // Try to read versions from configuration file + if (handle != NULL && swupdate_cfg_read_module_settings(handle, "versions", versions_settings, sw) == 0) { + return; + } + // If not found, fall back to a legacy file in the format " " + read_sw_version_file(sw); } #else