From patchwork Tue Oct 17 14:06:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850248 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=P1tPaSYh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::139; helo=mail-lf1-x139.google.com; envelope-from=swupdate+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lf1-x139.google.com (mail-lf1-x139.google.com [IPv6:2a00:1450:4864:20::139]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wlc67gsz1ypX for ; Wed, 18 Oct 2023 01:07:08 +1100 (AEDT) Received: by mail-lf1-x139.google.com with SMTP id 2adb3069b0e04-50483ed1172sf5608791e87.2 for ; Tue, 17 Oct 2023 07:07:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551623; cv=pass; d=google.com; s=arc-20160816; b=RsofweDoFN7MtxNNFmASsScEWHd7NlHVgbTDf66S5Hzzp5e6ijp4SJSxX5ilGp7xIg svduGqBiV3hOZc1v3YJ4NWVl0YkW2sVAU06N+uoMGYrBrrMPN6MHMloZN7Ty3cP9fNmL GOKaxZK+RyCkCAf2/c87HgPbTZTNEyv4SHVGb+NmAVO3+rCPhfUW6Wlr144BsJmiuU8E GmSTJJuVZ0+J8bZwiJNwwSS0Sha7oEbJnwdU6XBPrQKiAzyPeHvx4Enxnwp2Ph/WIfZQ FRWO7v3jSHLyWqA41x2YFTLDACtJMTnx6ml9n2LDp/09Ug83AbYoPRob10HINjJd7bjO nnoA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=rcIOE9cpDZ/vAGi0A8TD+TyIt7Dz6gnWcIYmzbksTVU=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=Y0ViSYY8VEi9TEyAAgB/jUj1kWwhy8dhIVY5bClfdAtzUMLw719C4OThhx2H7YlBUV BrI8GkuIIanDoTzn/dQJDLeTTOURRUSnXzYefBMXfbmMCTo8ET2Vx/X9ukGAfunQfdxt X6aYM+H141uic22c4DttB9/bfaWWAH11c3uXG4OMLNCOomp32YUmu6IVenGv/2av2kdN EQ7yKAy72fFTlnbwzIrIWb5HbajYAVsU/N5E/16soCmJNyBfDO9mpXdHXYiRzKGecexP c6ltaY/lWpiOHc996TW/NGBXpLR5TVNCr9EEpa0n5oxVgcfun0YbKuUD94e8EUbQHZjg LTng== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551623; x=1698156423; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=rcIOE9cpDZ/vAGi0A8TD+TyIt7Dz6gnWcIYmzbksTVU=; b=P1tPaSYhNeAwysV3AMCr0dSpwyDijoroAxK/Pk9z4Brm3KLZrTU/roBSJLMTckf9bW U8bILImXS4LECDnp2jKcMUnkWJA+hc5g+chK/7D/vSM1LqVVup7MSzf8CHkDDMmZJGKS iKaVRbMMu/BBl9NyE7968RpD5sEAmiYG6iJlVZSX8/s7r5DbBdCMp2RL8DCFOJqf8L4+ bYQZIj/oOsKuXzqCSgbno6Y+GB7L3gNNZccaCQflOwMAsgPdnU4fQz7XFy1UljYLXjrO IWerH36++DoWqMMurqkwH3cYaAcewtMNXLzW1UjSInB01JJbrLSOjyyHRYmiiJ6wQn2t Sf+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551623; x=1698156423; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=rcIOE9cpDZ/vAGi0A8TD+TyIt7Dz6gnWcIYmzbksTVU=; b=W2kt15O7/BvRaeDRrK09pPr82IB+IOr9RVWBaLVkEsU1zIkTqeW40Yasi2QTCwzzgp OWz2S/OjXZlL310rm85Ypk0po8RJvT17XAVOdSyJK2Va5VU/+zCBWiWXLLlzQQ3oB3jq 5n7OGiEGW9Oi1YppWWdEW+iwGa7HZRXuDzOp4Dk1zrk2YGq2qZDhDV0x4wMDIfaOprcl QmYPxOX8ipnPePzkywVsPf8VCf1fLX/WTBn81qdzyX5vuZt3Z/4GmB36hnxMfY+8iO82 xM4NuUR+gFAP4KmnxY517Qc7JOGkeKIJgfEJVWgXSD3s1zgUPqRdjMtF02SClSDXI+1g jxIg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YyAVwo90XDDHJldn+ipMffLuMCbbc8wm+sJCUNKpQ/s2cJWka+4 MCiESq32e3+B2yONBJKZLlE= X-Google-Smtp-Source: AGHT+IHUYtq/Lf93ElnMhqCI+vvKozW3kL7kot3X7Bp7IsFrzJQ4CSkX3tjIEl6y369szWBgtGF1Sw== X-Received: by 2002:ac2:5f54:0:b0:503:7dd:7ebd with SMTP id 20-20020ac25f54000000b0050307dd7ebdmr1658810lfz.24.1697551622689; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6512:490:b0:500:7f17:b77d with SMTP id v16-20020a056512049000b005007f17b77dls117124lfq.2.-pod-prod-01-eu; Tue, 17 Oct 2023 07:07:00 -0700 (PDT) X-Received: by 2002:ac2:484c:0:b0:503:2dce:4544 with SMTP id 12-20020ac2484c000000b005032dce4544mr1918349lfy.59.1697551620844; Tue, 17 Oct 2023 07:07:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551620; cv=none; d=google.com; s=arc-20160816; b=RrTg1Fre5BwNOg73+j+R3iEzbmqF9WxN4R/n+TPhZcoZeVi3rFpWM3uldZELer6Qhb 6Qu87av08MZZlv+LFgloaixbbEkpR2SSS9KP/q22s6eNSuR8sdCpWDM1t9nlULBS8+Un cjnwhmSXm6eO6k5zcvPz69d6yBfSX10GF3aG6isNPuVHyifTPizuMBu7bvJC9+E8ihgA yz+oHEcdJYgHK8xjQzgcC4LTMlo3bCGs7OfJKLieDfcR9Yr6A2tR9m0Dau/FkEg/hQfu H7ejOt2x3+CzNduecUc1+O4c/ktfCifRWXj2HXWW2VTaw8/1vYTYOY4xqXptiN0Y6V9z 05yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=KVihscVSQwx+e7bXIjoECK7teIS4UyRxaB46QHN6KC0=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=KmEnbOnLMEY7h/zcCAQQ8FcYhbqAHzzYI2VIdA8JjqIOw+R1SUwjHdE5SSvE6t3WHc bnY2LMHPdKqcG6nSlIp9DuHwLgzKXTrek4DEZuCDtE/LMrlp3DM72o79+mKdvFgSFe3p QaN8MHUqRJ7jrnRxyIjgwLUc0uAAv9RIEgzmKQtw2LbwHuIWHh3Eob/5ekNW56oEmNxP mphblKNbxct8J7ugaQ1Y2IKlC7rzvmpb/80KRVCIx2DPEhPQUaMUNCUHezBArkW8Q20F ISXiCRjNNmpgtBQfI7i2q/HKLDGbW1Cs66+wIpsQb37cbWDdnge5F1m54kENkuoGBITf rapA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.10]) by gmr-mx.google.com with ESMTPS id h34-20020a0565123ca200b004fe3e3471c8si62944lfv.10.2023.10.17.07.07.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:00 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) client-ip=212.227.17.10; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1N9Mh8-1rdzjb3pDQ-015KFf; Tue, 17 Oct 2023 16:06:59 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 01/11] IPC: add SET_SWUPDATE_VARS and GET_SWUPDATE_VARS Date: Tue, 17 Oct 2023 16:06:47 +0200 Message-Id: <20231017140657.95860-2-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:ztM0uLM9IQvWlSWh2II4mSnb/q1dJS/dadqnSW7k7wiSCgt3Gum Qcj1jfhRBy9HuQOox0UgR0IIisQ/NtDlnpqEuNxkkO6sgOA/3lqgpIH5ryumwUo4lj+r95k 27qRX3Kr5PPqDVYRsBSyTBwyX4ZaCyOZiFKBO67ki9BE/O9xzQ6N1aiXhuaPe/uDGFQ4TDi SMnr58Puqm6Wl94sfIrcQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:gBDYxRax624=;7VzYXuvvqB6XG871fsV24ehESTL XYuJCunx60jnqc83zIw3ZM3YFrYHjH5cq5v1Yn2A0/UMAZnFJbeKAFtTvYfm+IQN9haUbAKm3 +DPR1Mg57s4umKIZje7KVh2cOZrGOaytdBHtOOIU10TuuKD+qqGMtGaphfFR6yRSbBsb0r74X 2QK+su2Ajka6ogshjB9apYO4huElXlkDIYVspSJLipqLpCPStqeuR96x4zzlUxnafNRjf2mMO vJw8tiWxgtqDd9J6Ug+X6+1+bHAqfeb5zdMf5MJXB+H/yFQvR2WpOlzkO0XnjXLtJ4euBpnHy weWq9fq92GkvfizkF4Ik1JHmyPwt6r8o/SbOLNkimZjIoFHRF2+y15epGo3HJ3XZIHpjSzyQU Ty35Ens430BdlLClPT5V4+dLQ/j59fFsMwi6t7xX9M+pSj8OPkESkeye1yF9EIB79J9yjSNCk MyZ0/1q+RBMk5hP0lRFaishNqhY1mi1qFnYaoeRr59C2vhY4R8BNbGmn/WXO/IpLSb3lRQLdo UwouiqkbvTAPldwT4AQoXcpRPFrUF3LzSjLXg7EN0fq1e2jnxVJplKDdyqCk+fVM6B+KnIoBi J7k3uv8YZs1FKBKGPlHjLrz5X4GoSogTCzTr4gB/llispk8J9IsdcGkv8gPRzFPd2ftstxBp1 OzReakcFaOR25KjJaiFSMAlUQnKomhOAib5BIxJkluXFJ5NvivQat/cnvSXwdDev22goYKSTR /jWeM1KR0Gsw5/kohe1MzVmfaMGRJyHMXv6NujFqxJybrWVGVZPkR0q9fA2qrkFWbsitkSInA QnEXLwJGdaPTKg60aweDnUvBaiTq41/S5foE/ckmqBG+kU0zavLotuc8mea0jB5+u6p4eWLOV aQiC4bdOA/DA53gYmEa6z98Nbr1cMFxyy9xU= X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: , Add setter / getter via IPC for not-bootloader variables, that are used for general purposes or to store variables evaluated by SWUpdate but not by the bootloader. Signed-off-by: Stefano Babic --- include/network_ipc.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/network_ipc.h b/include/network_ipc.h index e0ef14a3..4d41b7b4 100644 --- a/include/network_ipc.h +++ b/include/network_ipc.h @@ -37,7 +37,9 @@ typedef enum { REQ_INSTALL_EXT, SET_VERSIONS_RANGE, NOTIFY_STREAM, - GET_HW_REVISION + GET_HW_REVISION, + SET_SWUPDATE_VARS, + GET_SWUPDATE_VARS, } msgtype; /* @@ -119,6 +121,11 @@ typedef union { char boardname[256]; char revision[256]; } revisions; + struct { + char varnamespace[256]; + char varname[256]; + char varvalue[256]; + } vars; } msgdata; typedef struct { From patchwork Tue Oct 17 14:06:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850241 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=OG9+7hCS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::b3e; helo=mail-yb1-xb3e.google.com; envelope-from=swupdate+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-yb1-xb3e.google.com (mail-yb1-xb3e.google.com [IPv6:2607:f8b0:4864:20::b3e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wlZ10Blz1ypX for ; Wed, 18 Oct 2023 01:07:05 +1100 (AEDT) Received: by mail-yb1-xb3e.google.com with SMTP id 3f1490d57ef6-d9b9aeb4962sf4100842276.3 for ; Tue, 17 Oct 2023 07:07:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551622; cv=pass; d=google.com; s=arc-20160816; b=YdCDr4VyuvCoPIsd/kM3V+DMLEFoojpxdiNZsnPW1yHgPzHjAY5HralERAIO8bMk90 HGHR9hnY3M1txnwzmb11iMZkB+PBayblj2hbyN/Q74GkCjcIJ2VWeLGXzSTah+Ui1Hk8 K/gQlXggqdpHiEwGD6XOTtJU1lGwJoArkMs/UM36mnILlS0m1HiUjXUgErkf7aW+pKIA 6Plv8aYgv19bimpPLLJ4AtFNZM0HGIeIDAe9NJe0w/NDc/I+fX4Bllg2BbdypfvwEEOi bB/fGk2hwW3DrkK6Z/NHbYaOuMvyd7yXYB8/rPJHar8rR5k+E6/NWnWD8kQNo9Gd+GZe jJHw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=/+kcquXHK5vVcXawRq3VPaGqG0VYgk9ceNdJjFdqOjI=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=n7Mg/4ieQnJC0gqhnEOX+kT/Wp8s8Ec5wTqueZHVL+SvOMIMq3XZE3OeBlccNV05gb PT5mRbYf92ZDzSP0SAZVya9KMnXd04c0JQ3RPEJGmAf/qPIvKsx0i2dcKA4F9SK+d1yk HwvWOwrKriZLW4y6YLjvlmrmP4cj+0tYxptYEvufdJb1mN/weyUsmRxKEkN39gc4P9Gz J3xcNT151TXNZvNI79UViLZGPbS4L7fZ4cjOU+EIJ+5AT97dp8WV3XPJUzOMn6d7oIF4 f1vm7H3b+Yk2nhyqzmMV8hl4CNW5Va8PoSaegcTiCD6fR/AWEp2aLeTdW7e/ZqX0h1rw vLSA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551622; x=1698156422; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=/+kcquXHK5vVcXawRq3VPaGqG0VYgk9ceNdJjFdqOjI=; b=OG9+7hCSSIqLCfKSXCIZCke+zk5/QBBFlJiZlGpvWrvHU+Z7FAT6kRQUF5bOnAYhVM HM8nX1DX0wc3Lp6g/vd4dNyyvZn+cTamaa6qhYHMKs2L9BNVqrAMl5Urb4kZslo6cZ1k +6mAh1tzBUalOzVkSJKr93GkcStHFO3AAOTTOrwh8OJm4LBDdomb6v2+PFGlMvn3kYxC WZoG2UwrXWyXNlb1dV12yv0aJMCFri53oJMd0w6Hnuhib8iAHj6bESygvzgkRhpoF5AW kb2FQTGZ1khnDKdd17v4nDysDfYu6nYjp2qmKDzXa4XK5goTODdDZ8fElTk4Zj+ADfmN lxyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551622; x=1698156422; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=/+kcquXHK5vVcXawRq3VPaGqG0VYgk9ceNdJjFdqOjI=; b=a6Jp+U0OXMETgmLX6xh8mzhm0VcgtJgQ5W7uE8MifM1zlh6AbYeHQ9JWgQ8JJFUKHm rrAfHq3Nv63psWEootOCQw+bDS0+k+Lkw+2tQDP9MXbGl67kj8WWjdL4mrmrzT1YjpbB D2ozSfSBxOjonUs8MYsAHDmvxHNq7KhwRPKssferaxnvqmZv4O10Q4MzkZVIIRn4W+6y CYLEjYybbXZhM4NdKygzEbBEawCiMNoLy+H7J2JTTUWG56tg1AzscjoPIeMeJ1uaURzk N695gJ5sGqKOJpYs27poXHxczs232Wq1pN3qVWo/4XO7R5Luclc4cAaECKtG3hd6ItRv pWXQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0Ywe8Uyu6E+qGHm0iW6UTRSnU+Ulpc82S6aSX2ILFLFQiZN0Lj6d zSJXsbGv3HRA6XJKmRhNGH4= X-Google-Smtp-Source: AGHT+IGk7N98oIwO1yDBSHxOd1JROSqXK0jybPL8lxmuJrojOY4daCgxX2d41TZYZMr405vHzrZwsQ== X-Received: by 2002:a25:2412:0:b0:d9a:5a05:abc with SMTP id k18-20020a252412000000b00d9a5a050abcmr2595936ybk.10.1697551622597; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a25:d48f:0:b0:d9a:4f4e:e735 with SMTP id m137-20020a25d48f000000b00d9a4f4ee735ls589137ybf.1.-pod-prod-02-us; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) X-Received: by 2002:a25:ad92:0:b0:d9b:454c:10c7 with SMTP id z18-20020a25ad92000000b00d9b454c10c7mr2387742ybi.32.1697551621495; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551621; cv=none; d=google.com; s=arc-20160816; b=x/4NeINIyML+54x/W/3GmgB/nYIeOYMtjtGqvVmojSFKoyluvh8YWSLH2mHPGFT6ow kCgjZ35ZENdPea/RmX6BGl2bhtQIpU/L2mOM4kEDFyBEsJb9vn8chUzs4LKpZcyffY3x rVos2xIBXjfgdgxi0nyyMUMTubrhF9wbaAhQtZeQLXHKzC6zbtcKn0pWWhmZb3JTP513 m7DHEVMHhGvjWjRCoOYFgXJE8m8zVjVyXjItKF2xb6XHEzA0H1EJIZIexQ090/S8aKe1 2LyvmEn1zn65AfTDpiirEFO2LHAJHc+RNj1Bol48IPvDRDBG0b+iLnLa+b5J7aRKun3x 93vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=FA2yo59mzoz76T7dhL5eTb4a0jvcwBo/SuTUve/g1yw=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=NoQsZV4XoNKXwS/V/DkHVnFotNusObfagt7KNWXIvahGO8pOb/3GuWZLZRSVYyHw22 3pa9TzGDmLotYOGiktAOPCpoRaaW5W2NkOh58fCEsnvy0cyHnYnei9TYzNTTFpkNXEgP 32AEcsMbyes4SZK8jDqyKMEL+kUge6dKYj4GaCaouD04Gu4aR8V00HFuE0c+Z8yRfRJs hzrcgM81Fbt2frI5x8oBNZwNLkKzhEv2HXuixt9JHib7zyFMQtW1L7fU3MOqIyFiUGL2 4VQg88BneKD8qgAt4p8Q20hwIj/DLUrhsYwhMIRVk2S8QY46H5UGtZqsB8ZYepvAwOK9 FxTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.13]) by gmr-mx.google.com with ESMTPS id 191-20020a2504c8000000b00d9ae0536766si110534ybe.4.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) client-ip=212.227.17.13; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MV6Bs-1r00HK0DoM-00S7cX; Tue, 17 Oct 2023 16:07:00 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 02/11] Store globally namespace for swupdate_vars Date: Tue, 17 Oct 2023 16:06:48 +0200 Message-Id: <20231017140657.95860-3-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:2thc527r5IZx/IzerTq/lVG+Y0B3HAREqTRYm4Cx429PSwV8+dj ++B91Shxo6w4qlRenPa4TZbWDmg2D8yVeKW4aO09t0B7iQdGZLk2kd1plwlNUV+VDBxgdTs eqOPgjgW/olHtzWX8Su7rL2zhRbPL13EwSVZk48YqLKMEP89yI+kP8S7DG65eo2KlZzaHnN YEMopPV4RvTmYM63fMLvQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:805rNFLeW4w=;lN8MatMLLEAEgnavBEKqozEe4rQ 7K8Wci/DI2SPnbN4oHpeflNhFEje04T2s6YE64xFE1B3cuII/m+bvcHtIstkS6j799HHniAzQ SVDqvkREgr3YscBhJ94envXhx/kXaJ4XmsXYpBVagKPFIh83WX++cMP8TVHIx4RTcKSVC3+F9 JSY3DJyaIZeUgZSaVs5Hp6UiQ7nRI/+0i5KhVVfxabJjA14IvlXhn4Swo2qwOJpsO0qcJmL4j VB19O89EqXiuEhSqlJ/flhPoIdpstCbYxzJv82EwgAaHc4Sr7o5tOIgwizid/+LyrHQZocSy4 stEJNYvsf/o1kkttgUnnNst/xYMLPp/gyMtE3GoGtiwPA0+MxteZRTy0SVOf9aSvFC+9M9dxG Fm64WJhhWVU9U/aadmBDF8/OpoQ4aKAEcMr1UFhfyeqog3LtR5vgU57ljJd04itwXe+jXJdKo 4fgCzm4kLcqhMyaMqlA+2FxnXXh21JExc6yaxyoeaD8t7YOj1X5ZQxuVLor0uFc/c2j9TzU2A kIESftNuG7QkgWNcg4GiJ3O2bYf/9Pdp8D5pyLsLqV5QFia75ZmBCYT4ATzWAi9TK60BO5g4/ gCaxJFNHBAfk5wQKm84Q1iB/GK3tmpWfckps9ta2ZqeJX6MXSQKp0gRAbinEzWc2TbvyMzKRG Hd6bYCsXLYbrH+KqPaH/WBXNMNXOCcf+B88J0sisac0Jaf7Y2+tDEVSDAOzEuGNakkrM72YVH f6ZN4YV+3OIMVlvUKyn6YYAFCQ+iNH+/HGPOHszbZw2DuCWt5nOiRhYLJUrT8z/tupof4DhI8 esx3rSbqr9odMoiW81n/oRcvNuq/x4l3c5LtLBE00NcfMKjOzJanUYwYV/5pp6j+wGBg1cc6u ISHS+sjw5q3t0lg== X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: , Namespace (see also libubootenv) for SWUpdate's own variable is defined in configuration file. At the moment, SWUpdate will support to write just into a single namespace. Most processes do not need to know it, and it is ok to define a default mechanism to retrieve the namespace. This patch adds a singleton for namespace. AWupdate will store the selected namespace at the startup and will use it in calls where the namespace is not set. Signed-off-by: Stefano Babic --- core/swupdate.c | 6 ++++++ core/swupdate_vars.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/core/swupdate.c b/core/swupdate.c index 50a34fec..1625ca95 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -50,6 +50,7 @@ #include "bootloader.h" #include "versions.h" #include "hw-compatibility.h" +#include "swupdate_vars.h" #ifdef CONFIG_SYSTEMD #include @@ -318,6 +319,11 @@ static int read_globals_settings(void *elem, void *data) "preupdatecmd", sw->preupdatecmd); GET_FIELD_STRING(LIBCFG_PARSER, elem, "namespace-vars", sw->namespace_for_vars); + if (strlen(sw->namespace_for_vars)) { + if (!swupdate_set_default_namespace(sw->namespace_for_vars)) + WARN("Default Namaspace for SWUpdate vars cannot be set, possible side-effects"); + } + get_field(LIBCFG_PARSER, elem, "verbose", &sw->verbose); get_field(LIBCFG_PARSER, elem, "loglevel", &sw->loglevel); get_field(LIBCFG_PARSER, elem, "syslog", &sw->syslog_enabled); diff --git a/core/swupdate_vars.c b/core/swupdate_vars.c index 5d2f95ab..4dd97ff7 100644 --- a/core/swupdate_vars.c +++ b/core/swupdate_vars.c @@ -101,3 +101,13 @@ int swupdate_vars_apply_list(const char *filename, const char *namespace) return ret; } + +bool swupdate_set_default_namespace(const char *namespace) +{ + if (namespace_default) + free(namespace_default); + + namespace_default = strdup(namespace); + + return namespace_default != NULL; +} From patchwork Tue Oct 17 14:06:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850244 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=pN94OdAv; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::b38; helo=mail-yb1-xb38.google.com; envelope-from=swupdate+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-yb1-xb38.google.com (mail-yb1-xb38.google.com [IPv6:2607:f8b0:4864:20::b38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wlZ1HyQz20d4 for ; Wed, 18 Oct 2023 01:07:05 +1100 (AEDT) Received: by mail-yb1-xb38.google.com with SMTP id 3f1490d57ef6-d9ace796374sf6935756276.0 for ; Tue, 17 Oct 2023 07:07:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551623; cv=pass; d=google.com; s=arc-20160816; b=QSJImcv/rTM3WGpOm5jTG60SezAvcvEpbo7awEnM5uxk4vfnFdqDRStb8OZB7SxXPr g+vC9ftK+8Svxif3RtwOtBABM6zAKkTyPn+GYaZHNce25Y2feoa0N2eJ/KICkUv9hmwF pMpsHIyTimWd6olgfI+2u+9a9iFzhNMVTJXwUoEKERB3/n6mUnac1FEF0YjsEjYSWBUZ jSZYclXhkwJT4cGgGwg3inCD6d6EQW0pUbR0OOIOQ00MKEulxkamTT7GOm6etKxv6sdx 1PZfArZs7tRVP9ARmRRTl1pIpHRweSKn0zBj8ySd/czoc1TghtGRWoGshxZbeO8T6nun yQtA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=AVaeEOrtO3+Fdny7LRU4ajq2MWn432haZQiTgUiUQKo=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=WGm0heuv+MxgkyzqtGwC3mpO2zGaUQbC4zUHvty0Tyq19Fe4tNwhqj9JnBmDwIrrWI YT+0seiEDlo3JjZTjn+1XDCh5OP2NNt33l+0DJvAnpOczEldGVYeni7GksnkfnecvGAw gWEGGiOMRCe1EdaPIR9WiNE4KeMkLwgIDFfw2EY6qeF1lJvFa9V/PW2wQLrvf6WaXaae lH0UfV8MHHxMwD6HEbUqTrbpPzwmMkdIWuEWoob2b1iRy9+vWdj2PMkwygKaDl//ucYW 1YruCK4jvewWW3K7d1zq/EjhAsCfFaffJl35Zbkx3V5TtUv689RHAJf3CznuVUHvUmS7 hyZg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551623; x=1698156423; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=AVaeEOrtO3+Fdny7LRU4ajq2MWn432haZQiTgUiUQKo=; b=pN94OdAv8ZxolEHOZMSILMvUbZoSeRnMhIRmBD2DzhpgzS3OeFmPl1V96gHSlhzgn0 xhjlboq513FaPL1BVsHi761e/ir3bSFy+ZBYBcrypuSW6xuoYuFdcag2ANFI5P6N9oKd FNNwgbaKLN7rnnoXU69geRBQXI0GqH4rMagvd24wq2ouSRkeYS8mE/B46xK1TLwtpKM4 N3VXj3oN/ZGBLtU1vdbtKKD7nodVdd7X/ea+JQdLR5gkN6jJ8HTKfqOYtnK8DxXol24A r9ecPaw7mbF0FUSNG/tQhhOnSf6Y6pl4ONSsf+Q1C3z2RsxlD57otiB66MJGyp73TVmo dPHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551623; x=1698156423; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=AVaeEOrtO3+Fdny7LRU4ajq2MWn432haZQiTgUiUQKo=; b=MyknJU8LIVbffWkyHvDfZCDTZlM9hLMYXg8CDlJRZgCd99CJkG8uHD/haHSQjvvlpA eZtUsRCsMAUP9LBJ+8AzqXkhOv5XDIUNTvh4/vvoVhsa1iewqxaVwZ+WdTdVn7jqYwF9 hczciHbDKiGQRK87PyI4vvBrR2nmF0gfknOUP6VoEZwkp9IsP0ABFsPh59xqkSbVsSRC A9hdaCsj+w0NAb7Sl4y+xjyZz15qQmM1IrWlMvtpUaNJPzhuertgCGDTRIf9yA5Uf88E Cc0Z8su9tyGzTKw8jVdbrGdQ8ukxnQMIyYpWuloi+MmLMa25hz1s6nsqyWFa4mhCjWhI IfxQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0Yw+oEFCBTlWCvgM/MHq7Kb+CI/K+oSZ9hNtb9EdkNch68cIdsnM PEeVsSQjXZhZgjhpQ1zn2Gs= X-Google-Smtp-Source: AGHT+IGR4r3xKu2+UrvANOfyvfJ87YXilzT0SyFIpMvWzjC83PnfqykG7zLkDlKYk+50d3xmPOCvsw== X-Received: by 2002:a25:d602:0:b0:d9a:c4cf:a06a with SMTP id n2-20020a25d602000000b00d9ac4cfa06amr2229372ybg.36.1697551622618; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a25:da10:0:b0:d86:29c:2155 with SMTP id n16-20020a25da10000000b00d86029c2155ls4219238ybf.2.-pod-prod-01-us; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) X-Received: by 2002:a25:c74e:0:b0:d91:c3fe:6144 with SMTP id w75-20020a25c74e000000b00d91c3fe6144mr2319693ybe.3.1697551621495; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551621; cv=none; d=google.com; s=arc-20160816; b=ZHb38BwYNEjK6CfxE1f1i48XFLWSm3AnZRnOWS+9FEgs4tWLneRU9FwvlMt5/1kwps /gW3FvKr3fJjYr/BuwqRZaWsrc3PLZJigTG8SvkPtU25Ves+kecl+bysgJbwpytpXq7K HX1d7J3DyhDJvjrw4MpqDKp/kmRhxwpT4nJH8QTRaOsSvN8fPby/1ai2rloUF30Q7O3d XICCs0H+0lqQxRywstVo710t/TntV7GmDvRkXU1ebEYkElAf/JToDomFiwG8qG5a5VFW oz1FJ/Iuig94eb+1FhOMxTAHjm0g63DkhPeqvJkCJIOh5DpY345i5MnZjc54qan7n+ct U5aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=Fb8bz/fz8FF8eMFoknsXWFy5nNbla5teD0s4DVKcY6A=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=r7TPY1ZtjGGeQxD5rZlcTABDq1CBbDNA1HiwOVnIO9+ZCLuxkoHLoWdcA4hvACrMx2 aQaKUuucfd3HsrvgCz1mGYdZEujgDjNA7+MydClK8oKDnR+jESvZHT5IpfArwxn9qCsS xuzS5gSNurzEF3m2BZoniHOC29KKjAgZgB2S1M/exIqaOg4ULlUOEnrGU9YAzjSO19bl 50eNEP/i2HEZF77ctQGBDzx0gx/Gga9OFjgsYvqpDYilJ06D2dkUj0iKWuO9KhzXF17g LUY8MmliZ5ORjBX4Q364tcLo4PIAmKwt/RVIkiuh4qjjoApNibkQLwHQmVpg5m8bLrSx pZEA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.75]) by gmr-mx.google.com with ESMTPS id h135-20020a25d08d000000b00d866c1128dcsi110742ybg.2.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) client-ip=217.72.192.75; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MSbt9-1qzjpd0nm5-00Sx6U; Tue, 17 Oct 2023 16:07:00 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 03/11] Implement IPC to set / get SWUpdate's vars Date: Tue, 17 Oct 2023 16:06:49 +0200 Message-Id: <20231017140657.95860-4-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:+1fHqxRSgTXbetPZf66iLPMNS/CvOKHlqBFuNBD2GvV5QdLZ6+/ SpVs2q3kGL720MI/MOb+M7b1Yks5RIQhnT5odtqQCehuiA+/BlNq/KiVBSBxmbdiMVoCsy0 piIp7F6KJkuekJr8kSNZynPAhNmhhDi+UW7mKjz2oi5GGf3+MmRDHATEpHe2EWUnh+5KwX0 M/NkUQZqS+Y7DEQoYc1wg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Ii95rGKqsl0=;wAe6Bb4H6nX/d25MDGF1uJQ1x7B tWI1A6kqpX5e3XjiQYa/DBGhN5gjwkOiJqmElf6I3AiNESeFQeVB0GcfBlhU/1DbUN/huNyPt lpet1I0W9p6kMQPT4uQrnF/C9qK8NAUtLdWOZdASlPBPEzSGUUbcnKeH4L15myUDfXH7/owM6 AWo5J/Fz6ag4/rkcIFIyHCXRbwYjLKEUNbJLkdHKYyBEXUZOHk0CuGAUs5MggDyS4WfH9n7YK lBbPhId0iIDimnxKJBMoyJ819EsjuEjbayipHYpE/csITBL1Qvo0O+ji3aER1Q/PPR2TzLvrJ lQ90whGZX6XgABzeZEdILaJCBoeqYgh1CgDSScdUEMXSEKcaOijC0vjISIcF8SHEqLuS1VXxD BrdWxxuNZU4zBDRvexcUSQXHuhs8CgfMgmGr9XiX4pTIhy5QHvrSXwQpbzw1TQbTAf8ttIuvI Q46UszttrjfhESMyWB4qh9AX5olCVVsr094hcJM0+WbYl5BFOmpNrk7Yrao6e8XTNN//wvyc7 HZJdlYWdYgjnW5doPXQPLlFMA2vM02uX2AcKAY8/zHu7bQ3M+q2bWvDQk7/4rqJUqrPeoX/8l Gv7kJfqXQN7DzS9KFY7ejOAmTspyKejc69xDb0WZZlc/3rFu3dbyquIPKwTdUwA+/ixEKDWer XF6G76oUBUViozJvShmZrex/YJOl3mcpa04Kh1xVkAoYiZf47eDdh+D1W2gwXebQFqayRLq+K jmOj/PFMmTI1PM5wOWQhpnI8AGUhypQv80JjROfuXbrbjj8yyqbGuUWs0rP4EIUqeVhJ3T7Zv Juz63IQ4khCgFNentxItDQsJ/HZSyCOEZFHMQs1ZIkL71mjA5aSkphmTNl+N7mD8bJhaSgsQV E5l2mT4/RQwvpwA== X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: , Access to SWUPdate's vars (namespace) is guaranteed for the core, but other processes could need to store some values to store a state between runs. This is not possible from subprocess because rights are not guaranteed for the namespace's storage. Add an IPC as done for bootloader environment to let subprocesses to store persistently variables. Signed-off-by: Stefano Babic --- core/network_thread.c | 17 +++++++++++ core/swupdate_vars.c | 68 +++++++++++++++++++++++++++++++++++++---- include/swupdate_vars.h | 2 ++ 3 files changed, 81 insertions(+), 6 deletions(-) diff --git a/core/network_thread.c b/core/network_thread.c index 916caf28..6b349784 100644 --- a/core/network_thread.c +++ b/core/network_thread.c @@ -33,6 +33,7 @@ #include "pctl.h" #include "generated/autoconf.h" #include "state.h" +#include "swupdate_vars.h" #ifdef CONFIG_SYSTEMD #include @@ -451,6 +452,7 @@ void *network_thread (void *data) struct subprocess_msg_elem *subprocess_msg; bool should_close_socket; struct swupdate_cfg *cfg; + char *varvalue; if (!instp) { TRACE("Fatal error: Network thread aborting..."); @@ -690,6 +692,21 @@ void *network_thread (void *data) msg.data.msg[0] = get_state(); msg.type = ACK; break; + case SET_SWUPDATE_VARS: + msg.type = swupdate_vars_set(msg.data.vars.varname, + msg.data.vars.varvalue, + msg.data.vars.varnamespace) == 0 ? ACK : NACK; + break; + case GET_SWUPDATE_VARS: + varvalue = swupdate_vars_get(msg.data.vars.varname, + msg.data.vars.varnamespace); + memset(msg.data.vars.varvalue, 0, sizeof(msg.data.vars.varvalue)); + if (varvalue) { + strlcpy(msg.data.vars.varvalue, varvalue, sizeof(msg.data.vars.varvalue)); + msg.type = ACK; + } else + msg.type = NACK; + break; default: msg.type = NACK; } diff --git a/core/swupdate_vars.c b/core/swupdate_vars.c index 4dd97ff7..f1e536a8 100644 --- a/core/swupdate_vars.c +++ b/core/swupdate_vars.c @@ -17,11 +17,13 @@ #include #include "generated/autoconf.h" #include "util.h" -#include "dlfcn.h" -#include "bootloader.h" +#include "pctl.h" +#include #include "swupdate_vars.h" +char *namespace_default = NULL; + static inline void libuboot_cleanup(struct uboot_ctx *ctx) { libuboot_close(ctx); @@ -32,8 +34,11 @@ int swupdate_vars_initialize(struct uboot_ctx **ctx, const char *namespace) { int ret; - if (!namespace) - return -EINVAL; + if (!namespace || !strlen(namespace)) { + if(!namespace_default) + return -EINVAL; + namespace = namespace_default; + } ret = libuboot_read_config_ext(ctx, get_fwenv_config()); if (ret) { @@ -50,7 +55,7 @@ int swupdate_vars_initialize(struct uboot_ctx **ctx, const char *namespace) return 0; } -char *swupdate_vars_get(const char *name, const char *namespace) +static char *__swupdate_vars_get(const char *name, const char *namespace) { int ret; struct uboot_ctx *ctx = NULL; @@ -65,7 +70,32 @@ char *swupdate_vars_get(const char *name, const char *namespace) return value; } -int swupdate_vars_set(const char *name, const char *value, const char *namespace) +char *swupdate_vars_get(const char *name, const char *namespace) +{ + if (!name) + return NULL; + + if (pid == getpid()) + { + ipc_message msg; + memset(&msg, 0, sizeof(msg)); + + msg.type = GET_SWUPDATE_VARS; + if (namespace) + strlcpy(msg.data.vars.varnamespace, namespace, sizeof(msg.data.vars.varnamespace)); + strlcpy(msg.data.vars.varname, name, sizeof(msg.data.vars.varname)); + + if (ipc_send_cmd(&msg) || msg.type == NACK) { + ERROR("Failed to get variable %s", name); + return NULL; + } + return strdup (msg.data.vars.varvalue); + } + + return __swupdate_vars_get(name, namespace); +} + +static int __swupdate_vars_set(const char *name, const char *value, const char *namespace) { int ret; struct uboot_ctx *ctx = NULL; @@ -81,6 +111,28 @@ int swupdate_vars_set(const char *name, const char *value, const char *namespace return ret; } +int swupdate_vars_set(const char *name, const char *value, const char *namespace) +{ + ipc_message msg; + + if (!name) + return -EINVAL; + + if (pid == getpid()) { + memset(&msg, 0, sizeof(msg)); + msg.magic = IPC_MAGIC; + msg.type = SET_SWUPDATE_VARS; + if (namespace) + strlcpy(msg.data.vars.varnamespace, namespace, sizeof(msg.data.vars.varnamespace)); + strlcpy(msg.data.vars.varname, name, sizeof(msg.data.vars.varname)); + if (value) + strlcpy(msg.data.vars.varvalue, value, sizeof(msg.data.vars.varvalue)); + return !(ipc_send_cmd(&msg) == 0 && msg.type == ACK); + } + + return __swupdate_vars_set(name, value, namespace); +} + int swupdate_vars_unset(const char *name, const char *namespace) { return swupdate_vars_set(name, NULL, namespace); @@ -91,6 +143,10 @@ int swupdate_vars_apply_list(const char *filename, const char *namespace) int ret; struct uboot_ctx *ctx = NULL; + if (pid == getpid()) { + ERROR("This function can be called only by core !"); + return -EINVAL; + } ret = swupdate_vars_initialize(&ctx, namespace); if (!ret) { libuboot_load_file(ctx, filename); diff --git a/include/swupdate_vars.h b/include/swupdate_vars.h index cbff84e5..1dcab972 100644 --- a/include/swupdate_vars.h +++ b/include/swupdate_vars.h @@ -8,9 +8,11 @@ #pragma once #include +#include int swupdate_vars_initialize(struct uboot_ctx **ctx, const char *namespace); int swupdate_vars_apply_list(const char *filename, const char *namespace); char *swupdate_vars_get(const char *name, const char *namespace); int swupdate_vars_set(const char *name, const char *value, const char *namespace); int swupdate_vars_unset(const char *name, const char *namespace); +bool swupdate_set_default_namespace(const char *namespace); From patchwork Tue Oct 17 14:06:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850247 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=ef+r8TSZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::d40; helo=mail-io1-xd40.google.com; envelope-from=swupdate+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-io1-xd40.google.com (mail-io1-xd40.google.com [IPv6:2607:f8b0:4864:20::d40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wlZ4gQyz26jS for ; Wed, 18 Oct 2023 01:07:06 +1100 (AEDT) Received: by mail-io1-xd40.google.com with SMTP id ca18e2360f4ac-7a26314e1d0sf468881739f.3 for ; Tue, 17 Oct 2023 07:07:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551623; cv=pass; d=google.com; s=arc-20160816; b=J7Gew9cvlGJ1arCi0G1Q2IZ7Nmk33Toq0l5d3XuFjmIT+0XPzP/uynHRFs1yFEksSF jiLcAHPB5tIP5jBqoYvqn9cjbrqGEdP/TKysRJCCTRYR/5tEF6ErRAQK+mCnfU0Qkcpz Q+q+LbuYLsVRWvYpOgureZU3F7oEy1d97xGZA4LGqPZnOOvAmBMwwkf/wDN0Ht87M8ou Ar/nJZOmPheCzo86/Kh/L2BnAyrFJ1imgHUkEujoA0wOF814AH+E/Cdq0N0XyDaVS0xl R0HJGpbWch7nQC5LpXPy/6fOMHtbjp8LUn7HgvM8QucWAYazux/I1YjbO4F+NhAGlsbu 9W4g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=+vJhgc9WciZBe6quLkbgSitTKOobBYkJtTK5o/xvJ+s=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=aLDe5Ul/zSCjJMkUB0VsxBPPzpaZwwhL62X15Fnx7KlpG/SEIHlerFokoF86MsUxwT yQALnhlK2UYYjoetfWMmBV51COxQiQdT1EwIy0eall3GBB71j4DR4jkGvoW6TmGffulP AMEaQ3rm/nyQTggYXcwRNdI+tMhh7tP4jVRtRiHKax33nKnA9/drsl14JnMgZ1aNZ33A PL/Z/PV8+yI31J62voUjPHb+PyJgxMrW87Sj/78HViYMsoNbqle53/XxRzcQcgG4Rrzf eZpNd8Wawt2Hin1eA6z6VuCYVu0fID37wBM9QNJEESHp30TaJJSSVTxpesiD1X3pNvhc 5qYQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551623; x=1698156423; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=+vJhgc9WciZBe6quLkbgSitTKOobBYkJtTK5o/xvJ+s=; b=ef+r8TSZ7jXp2ctVA23MYlemkppZp5Go7R4sx1DiCLjwhb0Vszw6lzuIPXiftQ1zmz 7sFyTU8WswGhjhoEhc15CrBJQxsvJbCKUE0/qNiaxHNrkUOGHDBF0J5VO+lMG6JuYCDZ kERZOVLQrckoTRpF662Azi140aYDbD66y+jwvBC+/WPxKvpeTCYVv6af+Uaq9IslOYbF 45gR6WYRW9i/P//u5rwZnQRaD+ZLgd6PZHF4dVHlCMasaeeaYLtSvKcvIPc3Obc9BUrJ DNAcTs18MBsFvP9bdqG3ohQtQlaXJemqf0x6iYATlT7V73xmUyE8VFh+ZypVEh1YVN9W X/2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551623; x=1698156423; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=+vJhgc9WciZBe6quLkbgSitTKOobBYkJtTK5o/xvJ+s=; b=STruOXkOJFlOGJisIg0RZrrRf9km4PYtrMCU2jksFaASLCd2GatmdhcMsoHLVefJ26 pYN2Ra7450WeLen+xf3jUhtwTXpDr19nLZOu/ourVA1itg05l40TqSaD3xmfsKHvY5C9 Zu7rXQ5geJ7JHBW20z04xzdXvOS7x1PEW/SvGRrdpnu+Pfj2wRYS0zh+Xcofy3S3Je9g JELdXxE4AC62VqZHw4v7abQj0hmBSjzM+gSEy0iDQGCycQJ/6WTfLYBC4xrKFh8rDX3o f0qAcyFw3Y2aePa270PEGXCqEKZr4G3DiY33Tmidi0GWjeAcKaQbt0EyFjjiCuUnITwI CnMA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YwOqJ4Oosxz8x4M8CxZk5XhJ79S3T9Lzdrmzq+82WYH8N4acoKg QFU5kMVgn2WtE4FQ0ypuJJg= X-Google-Smtp-Source: AGHT+IF5oogN5WDL9H0Jf9W/yoVxIi6ideINnzedksynUyB3xdiG1a56IMHiKJRTR+ImqwsAhBd+sg== X-Received: by 2002:a05:6e02:1b82:b0:34f:70ec:d4cf with SMTP id h2-20020a056e021b8200b0034f70ecd4cfmr3283927ili.8.1697551623314; Tue, 17 Oct 2023 07:07:03 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a92:7b13:0:b0:352:55ed:84bd with SMTP id w19-20020a927b13000000b0035255ed84bdls1476531ilc.0.-pod-prod-09-us; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) X-Received: by 2002:a05:6602:1648:b0:792:43b4:dc2 with SMTP id y8-20020a056602164800b0079243b40dc2mr2626784iow.3.1697551622037; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551622; cv=none; d=google.com; s=arc-20160816; b=v7dgiQxKvvniqSYf5z6QbEmkGG8GLWtwhMtSh0OImBrVWNLFVLuBoUbIMFinqCbpUw pNM2sVPVeWVgTGqbtFJc6xT5OlZjB+WjOzKR8u+PMxqB8/nDQ5CI5Pm4trHc8qszMzfG 37AlND7QwwfmFAcVwn/tPZMpEQy4YqzdpRkJKBEr0VmQeDTHgjTgctgEQu8GbHI8Murq KCD9ATIy9QPfKtGqoeRAQ6r+3si70Ro4KoGItcWbupGfcLrUxnEZSkJCwmDgWvmx9HG3 9E/n3bQah7/wp5YiaZF9kBpmzhxXD3Eyx2XRBtg9rA7FUvV+mRrQQ+8mxrzjlo9sVHqh /udQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=WPMY4uaJ7InuZTkveOyFH/GcOIhK1pAhTL4SjEia6oY=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=n3f2+zH93KSQPFZvZTTABNpIBbgj5cE95elULrcgydREDekq2Wiv0VYNuMjEl58vzs zS2QrK4t7IIURde7vleVB9ynf9HqYShQReDIGTmkI/qk26S3JxZHyVQT/MpKN2GC1sUI fROGhcoFu8+87NWL0idqqR8vupV4zuZ72h8Tt4aUefum79+q/xW5dGKlrJchE7iBGuO+ tIfvkjXsVNaHDAbFbqMOpWJTmTR0xr5HySVPBqQE0WNLSw5Vbccs/7cpOFJC4PKLhbXZ 0WLdV4L9j7bQr5UdpPjPFOsPHtqfYIXmwvZp4mHAS4ViOO5nBdvukC+Muo10SwiLfrpZ oa3Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.13]) by gmr-mx.google.com with ESMTPS id x6-20020a023406000000b00439ca012a0bsi124987jae.6.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) client-ip=212.227.17.13; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MZl1l-1r4eyx1Njz-00WoRk; Tue, 17 Oct 2023 16:07:00 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 04/11] hawkbit: add server name into the IPC request Date: Tue, 17 Oct 2023 16:06:50 +0200 Message-Id: <20231017140657.95860-5-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:oqfLpOkAr5aMBNBRNiGxfdNUHl7MqNsCCOMwPj9xPuJYt88121O cQSjv9ZedFxOWfzZ6+WrIRdg1RN9nSywkibVucLK4CJ6aOCsDIGgM0KfN5FFpwdLNy7G6rW JA8qIp7r6ooJPWTBBxPVRWk0gmmSeHF8lQvrEP/b4ljFseW8GkFF35S4wqqXAbZgcf5dOx1 gNpYDesD34oMV2P7FYkeg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:xQAiwbk44dI=;YBUbqUugg/nMd54osvqC7qEdl6c YgGvqClzjtpHKQiCI1gXoyq0qecyv8JlAN5TA8OFlHTJVlybgiyP6Yo7EbLt/cXlZvZBuYXOX g/ZtLJhj9GL86MsKBnTFlAaXMW1grYHMbbMW1ClN1hUloh2NdQGjbTxnhqpTGiyGuW3kNznUJ R/OI6c/Fm2dHlH2XWUJe+v5+04SIKnIt4uwBAzcajEvHqmtUNO/h5cY+lhbuAlBwR8RBq43Fx NHXluRXubzDKJd/az+nlRSDWsWsieXe89jBxLD2hA75MGvrSJbGJJqjOO86pG2aEaMLRdXZXO ahAbCwE6heMh1/4PfMxPeK/Fr1p4k4yGEfuzKiLzJRIZCtq7KwrqXEcTDdr92lB0wO6+kVWVU gg6I0lsv+pB3hbGTMeu+bgbNHD1qWJ/9tKe4HXNOe3FyHLgMna0rSrlxKAzHfM5HIWcNufSSm /RoqHT22t9WFRouAUc/PGMl/jIGfG8UQ1esGqJ3t7hyhPTHcupJsZn8TV2sEg7GDhoQvmI/Yg cWONffaAM73mND3KOrRCGZCmSZrhI6boGkI/5ixsUaeqyViSUz9MoenkPRnxOrse/HEttyp3I GKdgaQbgSak0nn4fnBsBB7PEnjgVwsr9IE7IHVrTDey0TGTVw079/UQ9veJmY/NiwROWCebPe G/HvW4GQvz8g33hyNIYZztleBQyVuF71NTOKUp5WYnu4KWKaUQWxhNWyvTRlhgnlLG4pakTxA 7yt1EEk0+FH5HTIRNB1/vrk0npwmRpv01ww6lLXwnhdS9WVULTKisMSDW+o1yu49hjBQpR57D qm3nUpeIp2UxAZfNtBeT6D3C8qEsrwEoV9IV/5psqdTp/VaCthLClWO3RNkkNP7xxgjeyRP0e F5vk54tu1SbJ+Jw== X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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 to completeness, it could be used in future to distinguish between suricatta's implementations. Signed-off-by: Stefano Babic --- suricatta/server_hawkbit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index 349dc117..faff70da 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -35,6 +35,7 @@ #define INITIAL_STATUS_REPORT_WAIT_DELAY 10 #define JSON_OBJECT_FREED 1 +#define SERVER_NAME "hawkbit" static struct option long_options[] = { {"tenant", required_argument, NULL, 't'}, @@ -1147,6 +1148,7 @@ server_op_res_t server_process_update_artifact(int action_id, static const char* const update_info = STRINGIFY( { + "server": "%s", "update": "%s", "part": "%s", "version": "%s", @@ -1156,6 +1158,7 @@ server_op_res_t server_process_update_artifact(int action_id, ); if (ENOMEM_ASPRINTF == asprintf(&channel_data.info, update_info, + SERVER_NAME, update_action, part, version, @@ -2161,5 +2164,5 @@ server_t server_hawkbit_funcs = { __attribute__((constructor)) static void register_server_hawkbit(void) { - register_server("hawkbit", &server_hawkbit_funcs); + register_server(SERVER_NAME, &server_hawkbit_funcs); } From patchwork Tue Oct 17 14:06:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850242 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=wHzOsGh8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2001:4860:4864:20::3f; helo=mail-oa1-x3f.google.com; envelope-from=swupdate+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-oa1-x3f.google.com (mail-oa1-x3f.google.com [IPv6:2001:4860:4864:20::3f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wlZ16Jdz20Vq for ; Wed, 18 Oct 2023 01:07:04 +1100 (AEDT) Received: by mail-oa1-x3f.google.com with SMTP id 586e51a60fabf-1e9b6561650sf6827661fac.3 for ; Tue, 17 Oct 2023 07:07:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551623; cv=pass; d=google.com; s=arc-20160816; b=AyBmETK/tVbWmhNwrtQktFKtxudTkFHnlWSORXDFnPr+WV3URhDb38BVnOAhJOdXaK 91KpZS1prqDdFtv00uIk9IELBhBZGLDVRFUUUmA0iPFVkGoWjtTRlgqI1tNfQK5InAs+ Gt0Xicxd2u34/H/WMQYNUVYklBntsij+S+T/1Hu2VByFWZfhDkZA0RqlsOjMlhaMy26G cXIT6X9mAe2fhOVYVazXNOnTRTDFDMcGrdbY+iVlaYJBkHTGQRsFL922iwYdDYD/LO9r IiUcypXAf7rb19pjq8KUxjUex8GE0Dac6FevdidpspKWhrG1krHTs3h8GWvH/yqVm7Xn VIeQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=0yEWt7YS7PWFEHfW5ECnGI5UFTlmzb1+nZY6M+7Gc2E=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=lh12UQ+5LqUBzC/f8W3SVcVA/3aj9l9XJjEbxmNC4S18aU3cWhQ7ii+h54p4mjBz0u VS1CnBigsujZfy/aI3VXdXh/7ZG/60HypPrdu6Y44DT/0XkTk/VqQse0UOySJ366qrby 8aqnR1Zs2icpDD/ZV/tZWeMc8nGeU4wS3Kn26ILheopCpl4Fxf5Nq21+E06EosyK2i8Q +na6iE3UMVjYPQ6T+NPa2t5aHtTsfTVS1Q8xXaGUGIpApzZUQUdEvIr2mRO0a8li+s/g tKXOAz0gA9eiDU7Uw3W5tmkO9OSorOhZ8zxA04QIRKhGHh1JV1q92s1J/qV6iVxLxXMt AnQA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551623; x=1698156423; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=0yEWt7YS7PWFEHfW5ECnGI5UFTlmzb1+nZY6M+7Gc2E=; b=wHzOsGh8Sb6i8XMdteFutG65AfVaLwXUzd0dfEyo9dBQu15stdogwiO9ONNy+VwLF/ 2q27vre3e7PujulPL1tNFBDzfYQ2RkZbuec3MACWxwd5btWmHb8tF/Rhx6MQ0dwRO2ww zFBvWdinQy5tqklZgnd7GbN34GCSrpxUQWRKRq7tDXdKjleDc3QHlqmxBgY/jUMKorWC yhcyNdIoSagCAAGM1Y4hFetuIacj1nNsNXRgDQmBYd0jqQm5douJVxjbUjofhhflcncK xmKydSYRQNwVlYjMDEy4stcuAgBsjiT5MOCZcglchiaEVR3WQxnuyqSoKWb39sZeY+pE b8Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551623; x=1698156423; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=0yEWt7YS7PWFEHfW5ECnGI5UFTlmzb1+nZY6M+7Gc2E=; b=jXaKJeyp7rC16yz4mtcPbujbXsyjtgwtKrdowedp+mEBKjzr5CKJFVA5tYzl1aegpm MqJ2EvCa6xbU337iKMVOrBhmxEwcmhxgJ/ycM0T+mdNgpYNub8RVwwXzi+yn7qxJCOyU MQ3D7MV5yMoLVOgeeK8t6te26YlvGfGx1KeATfz7FAgtGSws1VRef6JtM41kWd0n12RM mfSdc12yslZzRAEica7Derom/8iaNZ12kGnIStizasClv9rZmkxupc85LXsznlJTm4Tk IMMzoQeH1ZLijKANLxYT3L/k/e4tm74kLgpu5cOaNDxcKcCPTOfPztrvIOeUtfCUMugC Obgw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YwW4r3KDL6WNe5EXSQkjoRsZDCqnKJy4ZilFdaNsNPxwJ9vXv5L 8gYjY8lK9GYnpU2M+IFWiTA= X-Google-Smtp-Source: AGHT+IH2xB+686LHM/OKBZFqPnyMEMNu6B/lIga09vqKUlvr/G7Fv2CRNq6aUxyrb5ul3Jz+37MkEA== X-Received: by 2002:a05:6870:1708:b0:1e9:9833:daad with SMTP id h8-20020a056870170800b001e99833daadmr2738846oae.4.1697551623012; Tue, 17 Oct 2023 07:07:03 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6870:1f14:b0:1dd:651a:720f with SMTP id pd20-20020a0568701f1400b001dd651a720fls804811oab.0.-pod-prod-07-us; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) X-Received: by 2002:a05:6870:9555:b0:1c1:e6da:f88d with SMTP id v21-20020a056870955500b001c1e6daf88dmr1839044oal.56.1697551622150; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551622; cv=none; d=google.com; s=arc-20160816; b=JxhWtN/PhtEf72sEQUN87+fC7V5DvaSTj76K/baAJ2EQcaIdkR63a7haRumm+Q42uv iO0Um7gtlf1B4NISTbclPUqP7vjQ0gjlcmvrWt29a5tqoBEvRTvPJZEF/9sRLB5oUCLZ le6C9th1n7Z29YgzdWRJC5q3OMZn2cRsMaOnBeiWSjfB3UESo0p4BrqYthsRyXl/rEcv PAcXXI8tp7KoTlLivBwvZmenC3M5tb8vXpGfWH18/eth3fkAsEo4mWcLyp98NmSeNgwh iCNgxTtKfnzMBjVDxFJ0MWqt13HHtxSOE1aMeONK0Eug2Dns2+j4p4IZD/iE9dNmcvJU RYtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=xeNOCsu6dnsuFlex0F7JTcBfb6aGw8tvCkoYWpHFlos=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=l8gy3MvKBmVny0VC1M4Q8Ak78dCl0pi7/PmH/g1oKEM+up/jt4jM5WHeU5JMnjX83B qPDulI7zHdmBWVWiar21QkiSeXDQK5KZt9rvNj+D15UWx1uccgvdBju1lECyjVcVOSmp vBOQgc20iMHp/8GQNWe0W50HWL2LMNNZyydYywJ43R2z1Q3eBzPTuvOViI8GFvrh0cTS 5WiHjQOPmS1Synl9jLDFAJOBlegSZLnHxwU2oxX0A0o2xMFKGp3D6QwT8EFu0s1v86So Y0/kf/kQA70p5wd7DBjconjD49/71ykbhsBnqbVe1XjEiuIkW9QUHL13lC1qWlKFtrcs qBrw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.75]) by gmr-mx.google.com with ESMTPS id ee4-20020a0568306f0400b006c65a8d6f61si119602otb.3.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:02 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) client-ip=217.72.192.75; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1N1Ok1-1rYFdX2187-012poq; Tue, 17 Oct 2023 16:07:00 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 05/11] hawkbit: use stored action_id instead of current Date: Tue, 17 Oct 2023 16:06:51 +0200 Message-Id: <20231017140657.95860-6-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:U5Pq52gGvP+bsubzxHypGmkirlH6ai/ILq7w8suci2xprIuQ+WT STYXEtsw490tZVWDRKHueoNJ2Tig8AXjGoR2rJlzk3+eJ0hzi8rH7GYmLZD6gIPBoClhVxu 5IkSLEBAqs5EIZLle+j3VSCEJSSIkzxr8KeCN9jzwNAVdbjwVeE/wi78wpIuXnbiZgehaPe nGT+RoeUMI8lR5AHcFxKQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:3Hc8DRAeV5g=;w/5V2ljCqBgWjqLn1I3MZjiqL22 disB6pupRMbCloVbQbCSs0MMf8F7bVVY9noPBPyADSCmRzFbXIk7C+y99kswz0yfFNHL/1jNz +CUFbeuoN13kMwUmA2kKthJwkQTQgaSS79uvj8+TzwatgpJ8fu9t799DAfA37inOs7HgSokeo X6OSIU7+2gYj3rflhqZdvFZL/gIbb4EwfDJ+cKYx2epFOzX++i/77oxKtfM7zfZyqPY17ofdN WR2StEw9e9oMR38QNNZGrYbC2P+KI/7wF8BRxVmarI5kZcbZzw2gLjEWhfwCngKOvglwmNsjA aVtv3OzFn4lWcOp/BQ7hM4rcZJnF0Dms35TTAw2wj34x850tTdn6JqZFd09NjKt/obGrPnUib o2lX2YQw1EtQJp67L8yBRgI2AYYMFle0OWvrJ9Grzfd6QyjWsUiZROPdz4Z7WMsovGD9zGU2R QXXGKfvg/NuboYWrtPwZJz54l0SFrbQe0GXthJbYwXjgYVP0ZLhCfwFYjmkGmBQop95FTdQLN qRDE9KsKK1KfSq+x5osqvSub8bl4PPaF44jsdAW6YZhEDSFXhrLmP6iTIcKGgukX9hnD8y5Ee cbdwiJhfo5V/+R6LIuO+94PDQEmzbecZAOGLYTnzZEoCTDabfePSNHAhrpsNuxxgXslPUT49I LD9Tjx8K6dgBW/beHJYE76OqbMqoGO6Q87ZoJWIWeNcskrli3S7KoS+So53o+lgQe1Ujn3HYj DH1GQUiPX43RIWh0ePYwfnOLlL72YP3DNWy55+VAY/DHyQGX46fxeVXE/Ls2RcXq8Fstd3qvm +ZlyUIdFqTxzWhtonNG/euGAYw3AxBOZA/H7/VS+V1Iq6N28awSvpecQuZmU/qp/aOTDt9iWn jG/q/Y2IJnHbhRw== X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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 fixes an old bug with the following use case: - an operator starts a rollout on Hawkbit - SWUpdate will start the update and it will reboots the board - before coming up, the operator has cancelled the rolback, and started a new rollout. This is identified by a different "action_id". - when board boots again, SWUpdate needs to send the fallback. It asks Hawkbit for the action_id, and Hawkbit will report the action_id of the new rollout. - SWUpdate sends the feedback according to the action_id retrieved from the Hawkbit server. It sends the result of the previous rollout as it was the result of the current, that did not run. - As result, Hawkbit thinks the device has new software, but the device has a previous version because it reported the wrong feedback. To fix this, SWUpdate will store the action_id as SWUpdate's variable. After a restart, SWUpdate will take the value stored previously instead of the value reported by Hawkbit. Signed-off-by: Stefano Babic --- suricatta/server_hawkbit.c | 56 +++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index faff70da..9b71987c 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -31,6 +31,7 @@ #include "parselib.h" #include "swupdate_settings.h" #include "swupdate_dict.h" +#include "swupdate_vars.h" #define INITIAL_STATUS_REPORT_WAIT_DELAY 10 @@ -854,6 +855,24 @@ static server_op_res_t handle_feedback(int action_id, server_op_res_t result, return SERVER_UPDATE_AVAILABLE; } +static void get_action_id_from_env(int *action_id) +{ + /* + * Retrieve the action_id if SWUpdate stored it + * during the update + * The current action_id on the server can be different if the operator + * cancelled a rollout and started a new one while SWUpdate was + * restarting. + * Get the acction_id that corresponds to the done update if it was + * stored. + */ + char *action_str = swupdate_vars_get("action_id", NULL); + if (action_str) { + *action_id = ustrtoull(action_str, NULL, 10); + TRACE("Stored action_id from previous run: %d", *action_id); + free(action_str); + } +} server_op_res_t server_handle_initial_state(update_state_t stateovrrd) { @@ -900,11 +919,17 @@ server_op_res_t server_handle_initial_state(update_state_t stateovrrd) server_op_res_t result; /* - * Retrieving current action id + * Try to retrieve current action id */ + channel_data_t channel_data = channel_data_defaults; - result = - server_get_deployment_info(server_hawkbit.channel, &channel_data, &action_id); + result = server_get_deployment_info(server_hawkbit.channel, + &channel_data, &action_id); + + /* + * Get action_id from env, if any + */ + get_action_id_from_env(&action_id); result = handle_feedback(action_id, result, state, reply_result, reply_execution, 1, &reply_message); @@ -1061,6 +1086,17 @@ server_op_res_t server_process_update_artifact(int action_id, json_object_array_length(json_data_artifact); int json_data_artifact_installed = 0; json_object *json_data_artifact_item = NULL; + + char *action_id_str; + if (asprintf(&action_id_str, "%d", action_id) == ENOMEM_ASPRINTF) { + ERROR("OOM reached when saving action_id"); + return SERVER_EERR; + } + if (swupdate_vars_set("action_id", action_id_str, NULL)) { + WARN("Action_id cannot be stored, do yourself"); + } + free(action_id_str); + for (int json_data_artifact_count = 0; json_data_artifact_count < json_data_artifact_max; json_data_artifact_count++) { @@ -1955,12 +1991,18 @@ static server_op_res_t server_activation_ipc(ipc_message *msg) json_object *json_data = json_get_path_key( json_root, (const char *[]){"id", NULL}); - if (json_data == NULL) { - ERROR("Got malformed JSON: Could not find action id"); - DEBUG("Got JSON: %s", json_object_to_json_string(json_data)); + + int action_id = -1; + if (json_data) { + action_id = json_object_get_int(json_data); + } else { + get_action_id_from_env(&action_id); + } + + if (action_id < 0) { + ERROR("No action_id passed into JSON message and no action:_id in env"); return SERVER_EERR; } - int action_id = json_object_get_int(json_data); json_data = json_get_path_key( json_root, (const char *[]){"status", NULL}); From patchwork Tue Oct 17 14:06:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850243 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=FBBsR0++; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::53e; helo=mail-ed1-x53e.google.com; envelope-from=swupdate+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-ed1-x53e.google.com (mail-ed1-x53e.google.com [IPv6:2a00:1450:4864:20::53e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wlZ1Hwvz20cb for ; Wed, 18 Oct 2023 01:07:05 +1100 (AEDT) Received: by mail-ed1-x53e.google.com with SMTP id 4fb4d7f45d1cf-53e119e615asf6221196a12.0 for ; Tue, 17 Oct 2023 07:07:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551623; cv=pass; d=google.com; s=arc-20160816; b=0zXub+4zNN8aXLiBjmzOfTv8d7WFVcNoJBx4hxJMoXBQy02LrNdI0zZiLZlEWZ2+WD 4YJDBeUxEbxrJoDTZjj615XQucm+GRfE5M1hCq/7aPWOqeNhAE/tK+b47dZPsgDxyav/ QTlegX5RRXZznHJhkCO5cZAB/EfC8UK3bVTn7g7FOrurU39kV3D5XtEXE5rBBPq+mTmg xWFTVHC4MX58SebhudduZYxwwSsV6OFNNEcnSFtwuJc69syz9ZZ/S07eP3RdIc2EqgOO ECBPuRorkLHkjXONzbAewb5abWuYQ0NuCeDeNOKbfa01290WLX8nWkjEHRjHZYOk9E0K DB5A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=kpqiNl6nWKO0UOPqQYIlSVPXI0w+ofIJB9DvrO8WE+w=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=T0ua1ZBkJTUJS55mKIvaR0s+y0TN7R1b58uyegVWBvNBHOYwL+agsWyCehIXPpUUUN aBmiHesWpx3ImYS62ZCE91CT1M+1E2f78RFo+57nG+r8N2Wg/Y/IlZk/aDENWj1bpUn8 ADdetfFw2ZvKA/QXMml2rn0rJ1gFR/xP6m5LZbnvDxhdCNHrK41ZtI4bCZmE06qGq/Lr 1VXKNZMKaMDuTBnSVVckMeZ9QW8atjdMrs/H8wjG+KfPzoG/oIH29Uhmq387OqliqUVc c7OS3lXhi6LgzqTL2vv0ktgZR45z0jf8HLfwCJ1rEw4QxQzJMurivgZDwLlA6Bjm0Bkc ayoA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551623; x=1698156423; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=kpqiNl6nWKO0UOPqQYIlSVPXI0w+ofIJB9DvrO8WE+w=; b=FBBsR0++iJ7XBE+ulpRh9Cu+GPzfqRDFkVY8MHoCEZWaGFsQXNu+iJzhg8UFgtXDKb QJ9yo43vnxVtOptrurTYtJjFVBcCrpxSW95tl6qOCs94aCcIuvHr2EZW+S53DzChJH5G DsLmRSjYpg19uFwfE+yebI7q9nSGvP5fXy6brLuYZysYyQECs6pAd7Su9hLCpPXpQZ9G mM3E5N8BUhYWeLiblaX86CIKp9WPDeQA+pjmQTPOdZJ7c4LcWTC/cnnOR6+BkACHhDmp IJE1WrtYvgihnprCMy7DCwNdT8DxDZdciwRm0emx9PYcJygFfBW4xP/cb6ZL3AZTKr9M 3TAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551623; x=1698156423; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=kpqiNl6nWKO0UOPqQYIlSVPXI0w+ofIJB9DvrO8WE+w=; b=WYvLEDuTG0koLiXbDuw9al6MVql3O5q9eJ8WTCJjsh0WDW1lYrTaSS6cHPE+i0c3eP WxsfD23p4kgpkXOjclIg3xk5OM6+ObkNdPPsmt3gi6z+sa8TIsFD5T+u65CJHgzWUnHX P5PgsVIiBR0A1mA6bqGRfyLLq43LFmp21YFDZNoo5+3LH625UQdu+L/9OUD6jR4p6klf +rzRD63hZo1Go53Y3vXomlTu4iyIGdkkydCOIL2zj0Cjp9uHtCkB0Dxiwfsk5JBs/hoZ /4Jm6QXf50u9c1D3DW94KFIsXXlbxEdXGMYHjPqiykEo0dqJRqJndUQ4OeTTq168gMHr Ln3g== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YztZv38Ceph1q2QorRcaYsdZCRQ2T9JoAtLDdAWO7V3/APToXnq M5+X4xTlK5+941/CRxcOfDk= X-Google-Smtp-Source: AGHT+IHjL5S/dCCbr7h9EJlty/8S20JDFsVf/iWBMV1LIYLaytnEd0QJ4nINjNekUD41PmP9LGDGCA== X-Received: by 2002:a05:6402:1a52:b0:530:8fdb:39c8 with SMTP id bf18-20020a0564021a5200b005308fdb39c8mr1831211edb.15.1697551622630; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6402:4487:b0:530:eb75:8932 with SMTP id er7-20020a056402448700b00530eb758932ls192787edb.2.-pod-prod-00-eu; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) X-Received: by 2002:a17:907:7203:b0:9aa:1794:945b with SMTP id dr3-20020a170907720300b009aa1794945bmr1961636ejc.22.1697551621152; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551621; cv=none; d=google.com; s=arc-20160816; b=Ae+Ctpwb1cB/RjZQH2Ch5R8MdZYgLgF4imPThZ6wotgPIktLKKpij9CX++CwaA4fxR dG3/9oRNGg1fNBTWR+f56pwqZKleqIdHJqAKMi0tZjkXM33b7HbDiKT5R4U5BDnSt1yb QA4Qn680L4f7n3GxI52M0JGvpVyP2uFpVJl8wWso6A4bG6c8vTp008JzlDsCLUTbVuI5 rcTPrPjmzcqKQPsWy1FG2hgW1hM8ipynfVCCYDs1DrXKLF21BBilK88z5KoDrpXwPHPp +hpwrWMHs8EsyLkW23M3GHKhGAk30RR3rJnUveioTTaZrO4yv1LNA4Dvv0IRF5R//zIK b3GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=uL210sGOm4WPqM3TfCtmtOur3IknzwwwxuBACe7IQcc=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=DVf97Fh/pUTDy3MQb+1n99cjeCb5MeN61gDCTG/Dhob6LbfEvSREc/VDoFiySihJPZ ktyW88nTbeQdDjzfOFmYarbfE+FNgqilzEn5bXOK6bOZtqn8nu3f8h/WpbbJDTn3jWj5 muBYVOXkPmAJNW5NwMEjaCH9u19BU9ctmNcSFfT84lTMXM2e5MQdWb7HU9MCkD/9UXfx +PDC1Zw/tXU5v//MXMJuYgF0aDm7nW2xHwgALN8QYXcoKS23713ZSxxgs2prgRFeO/KM GQfPNetXExyy+nZXqlmXTqunHFIRLzaDv1m17BrBAi3F9Y9tBhTkFEVhUcCpnSS+cArR yO+w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.10]) by gmr-mx.google.com with ESMTPS id dy3-20020a05640231e300b0053ea9bd0510si80113edb.0.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) client-ip=212.227.17.10; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MUooJ-1r1vgj2br7-00QkB4; Tue, 17 Oct 2023 16:07:00 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 06/11] IPC: check if variable is set in SET_SWUPDATE_VARS Date: Tue, 17 Oct 2023 16:06:52 +0200 Message-Id: <20231017140657.95860-7-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:sAygiQIvdceBDwhLdLwrl9U+kFvjKm4j5I8re061F1oL5FFk2q8 quwXFy8eKzycXyQtkq/hCH+j6d74HhblvASVagwSW6sJn90Qr350sXzSWsG24mqZ/eLFmUS 2T6B7KlywDwz1Qs+4uPRzMk7nid6HzAFtGf1qM3iFCa6ZDzLwSzM/KfS4BGUB0cIC4lwExR cM+WpYLbM4KwfK3iMv1aw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:M/N3nTE1EX0=;iMbexJvwpCBGIbYL7JrJkkFL9lJ z5oT7zJ7xW9EQNb/He/ZpDIdbR+f2g6/DGXsGQEtQoLJGnYX4X+U+GBEzOfBxiNIe3HwVNkO8 evavolmSx1bKnwJVO6/wf1ks/ksivRaJjj0xCu/X1UpMxCwjPHDtbGtRRa+cWcAOxLKbLHcHD GmBvKtSRFizXmt68qYeUxxJsxU5a4TMqfkp23jN7TN07QjjcTcDCm/EP14EVwHy7CyuWkK2tq RTT/rPHlhBJ5TfiGemh/acFT0pMNq8FPQ58KcNLYVkc2DEm2bfENL0pQuTVVSqHZeO+M1BDMy qZ1WIxbQarwdYDfIphBCUTrc0YWc/fwMMr9yUW6rxtxewLXK4NcccUzdLGkb6VV8fu4EkE1nZ 37FOR8FBUYrhlboww1EWoBaaxgEijOfdAupRboS2NHlIA0ZDPNOmnSuab0Ykz0AfHmM+jJSGe eAsKToSwXUgiM2hICgccAOzx4bo2PgBwGqkXpSvRUu/nSIwvzd3nni0UU3ynHVUEp0L30iFcF tMdX+pUZAMNJrxTPDvYHf4ulzdzPYJ+SXGcZN0s0vFdKjy/XK6J0Cax1S16ad2vvFLvakteip s3lSvbvee49nCZOW5m5tL6z7H3eVE9o0ljhmt7P/LScD/B4/4btfHM8YE8PP2NmMR+kEJ9JDr Uu/7gK/HItAMkLJ/Hz6zbx0rhhaHNPyxvi7nTINwVFw2GAs4bQcoCkVwevTsrIqVdOZoHbUpq YgMGrbIHPrJA0w07GD6Qjdbv/m4I2cY8yfDDD0cnLXKNqvlmB6OkRZh+uKFVjaIbESKax3Pyv 95UVyj8IK+H09eUOAcHjpUrLfpy6JrFcc7ORUl4zUnd0E69GsLvLgX4N8IYJDSRy+abAu3PuW aCkVo7t7I5xiuEA== X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: , Check if the passed string is empty instead of check the buffer, that is always valid. In last case, an empty string is passed and the variable is set to "" instead to be removed. Signed-off-by: Stefano Babic --- core/network_thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/network_thread.c b/core/network_thread.c index 6b349784..49e165df 100644 --- a/core/network_thread.c +++ b/core/network_thread.c @@ -694,7 +694,7 @@ void *network_thread (void *data) break; case SET_SWUPDATE_VARS: msg.type = swupdate_vars_set(msg.data.vars.varname, - msg.data.vars.varvalue, + strlen(msg.data.vars.varvalue) ? msg.data.vars.varvalue : NULL, msg.data.vars.varnamespace) == 0 ? ACK : NACK; break; case GET_SWUPDATE_VARS: From patchwork Tue Oct 17 14:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850249 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=JUVEIUJt; dkim-atps=neutral Authentication-Results: legolas.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+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wlc70X2z20Vq for ; Wed, 18 Oct 2023 01:07:08 +1100 (AEDT) Received: by mail-lj1-x238.google.com with SMTP id 38308e7fff4ca-2c51d0f97e3sf23542651fa.0 for ; Tue, 17 Oct 2023 07:07:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551623; cv=pass; d=google.com; s=arc-20160816; b=hidJnols5fVT0Wx00fv2pMN2C1RSEOZVkMB6RlI97mIfwEHiB/S1CtBvDWD0tXB8/j hId2/hB6KhAZ+EQA8L56qa5cvUAxcf5wbivMuvuNLn92qTPW+ptivEnQcHajS/Ov42O3 FUZOFxeolzKDLhlNABjk9t7NkusvouTR39q/mJT7HMOQ0ZdAwgNzmI9nI5oi2LxdU9JG 1N1HSIU9xWSYF1LTOTXvKIU/23b7XnsBq3bBZE9PNelMqSZ06Iz7Q7a8DMcwxH4MbqGQ k4DWHXKQaCluxt7aYA9+fjC8AlUlBREnCuVGvT5/eKK8isW6XVrbB60vIgUE9tyD9goy IW0A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=IqARoZMCKW5UFMVQHkNckPh3V7IQ+22jXi0m3Oc71e8=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=ve+yozApl188ZNDVq3RBS0tEqCA0cysQbvfPDf+E1cYTXbAsRwYyNK9PoWIBriK4vG Y7YD/0udtNhOKHcB25jWXCTtXY/UY0GySIMIxSzvdd/ypHu2VXzr3uCOiYR9Pmon7MfL y/fNML3p4mVINkIQnmfRGSWb87bHYeBtdvgX9o7NmMSWtbNsr52DJncbz7/QyiSVXuJB rrezV0dmbdikKCeONSALJRDwl+UO3hI1sbqcDJmx9JcJpmXmbnEgvlFUtsKxElsBChVO gl2ECg6e+c8r/9w8GptYnP8UqmOVt4cR7b/9ZXGbYeZUgXW1x5cj+FOiPMGgbHxvPw6h kEsQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.24 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551623; x=1698156423; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=IqARoZMCKW5UFMVQHkNckPh3V7IQ+22jXi0m3Oc71e8=; b=JUVEIUJt93pl7Yc5sAIl4V7am4xMyha4TfXy9JtF9+nJR83JN3TPe1VuIszX7LMaBn eBAtnjHg9NBrSEY/HrLlvfvsdyxwYpuKM8y4+Y18TegtYqv545KgXZNrsp9yC9qVIuQa 2UbmeNizXhS64asB3oDoK5KjRIhwQkin52xWGdM8b6L8j7dQ8cnE7V0YRpXFel1lkmKI 3kYZuE51B5j20VS5ZhYmoNV6Hw2DgIPkKJvD4iuQGUdIfG7tbxbSN0CgivDcgQvMu8En TU54dfjnc+52bFU77OSyDrYCDnVEUJb922RS0Jq99V3AqNF1DZZAb7qQsK2W6eG9bI4d xdNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551623; x=1698156423; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=IqARoZMCKW5UFMVQHkNckPh3V7IQ+22jXi0m3Oc71e8=; b=EHih5dV+Ep8H34HKn2lawphWXGWdQSKL4K7Mhu5KRU6MNInhdNXprBHxcGKlR7u1rR eeXmt8dCBKFiQ4tPMBLzT8L9ejcIqDrvREmsAGI1282IvtQirdB0OXTnXPSxPUN245a+ +4EKfnXIpeC7e+s4jmhpvfIjkO2t6t9HXvk2XLDCKtJCak51uERbteZLSS+5WVhEbKlz ERaZ4mqOkV/LbE95zM4yktaSdQdVNiosCHb4zPtFwbACH8FLEj/rpDcYxgHPydnNOvrh kloHKQVAoTCwSL0Og8oDY5OL5aWSFNaPapGkQQbEqVTOD6nZlAia3rrJG/2nWLgAeqUv cnWQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YxSP9MTBETIhUO9yqUvUMk5fWkeFgljdnTt0Uej3nNoxArwcfaL MT62ihWvMMMrKQxz1eUNoa8= X-Google-Smtp-Source: AGHT+IEkGzSHZQh6Tlix+qwEGyh+3tk1NfTNi5ZXnfVyNElMlltYiKYMgy2y1Eg/RRXyC2e/C7SFjQ== X-Received: by 2002:a05:651c:3ca:b0:2c4:fe0a:dc3a with SMTP id f10-20020a05651c03ca00b002c4fe0adc3amr1700028ljp.47.1697551623010; Tue, 17 Oct 2023 07:07:03 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:720a:0:b0:2be:574a:3b1b with SMTP id n10-20020a2e720a000000b002be574a3b1bls1719310ljc.0.-pod-prod-05-eu; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) X-Received: by 2002:a2e:bc1f:0:b0:2c5:2eaa:5397 with SMTP id b31-20020a2ebc1f000000b002c52eaa5397mr2066702ljf.11.1697551621292; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551621; cv=none; d=google.com; s=arc-20160816; b=DhBSwuA/SGAjushpxkFfSl+ZSq+erra9xIyZpNYmmn3VJURhH/uTL4QiZf1ugKJX17 uB6kqH6yMIRvC3PcYEl+eKrcpnSQe7roiddFfrVad9uN6Si4v9fA8z3qiZ2EyZWVCHlY LnKYg5Yab3mdaQAfNU9dhbZEE4vr1Stj3ATwfcBxMvDnB6C67DKrYTgGN/urxPk85VtY A8mWNgSnx3FfjZztmMf9mABzhVJjCdLP7SFVlPxZ+TRsfdDMSfud4Qq+qYCBgdsgsKzY mvM9d/83BsIRsX5SQixYFt7uKwHhjsBgTbCgcSKnNaDDWO8VA+MbRgmOzj+aVe2P5+m6 tljQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=LVkifU/7rmT3QNTOn6X874yfD8yHmZQeFmj2esgTwiY=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=CQlXN7k6arPQQ3ABILTHX5MHc/DxR5Vsa/Jsxv7hzMqXot1pGohoGfPp3qtZ8scPji rYo3i0nW5Sl6Sw3ug10z15GwBqFw1ZRLR66DK94qWH5i25hxfyh+lvzR5bTaCMRWnTOS gBs76gDtqLPh8qW8j2li/P/c5X0/7PF3l59+/WF85U6eQqur5H30+t4wUK3fu6PVSz3G p7QO9lam7wzc4ga5yfYBIeWGAlObMhjq6wnFQGApp+aGppq5ukV2MjRxZIZFGtiiuLLD m/pfvJQRAZcW7x/AyeiHq5liuy2XIRHJatUzMxsaJyrWg6TRdEYcRnVBM+BJE73tv0ZX A8pQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.24 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.24]) by gmr-mx.google.com with ESMTPS id bh25-20020a05600c3d1900b00407c8777ecasi54026wmb.0.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.24 as permitted sender) client-ip=212.227.17.24; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MSKly-1qzSqi3NLE-00Sg7b; Tue, 17 Oct 2023 16:07:00 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 07/11] Enum for cause field in progress messages Date: Tue, 17 Oct 2023 16:06:53 +0200 Message-Id: <20231017140657.95860-8-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:/y4cvIi/UHilhY3LcV8fPERo+lG7xzi2clfMfc+qW8aPKc2OmaU mwOVnwCe5bmIn5N9KXatPuoyKo8GxCqhUcEysTZoaGMXx+Rpf6iX7f3zO3YS4S8h/IJhgxi RNurI3bT9RW6H5/2S5QkxSaxXY5cIFeiTl9yu7toMrO+BAASHcxi0Ll764VovGMVds6+Af3 HDi5SPiaFLU1p/JvqjULA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:ncC04t0qVrM=;uNf8LmbLNoZ81ZaMlAif+hBGW6k swt07DsbxVUym1gYev8tSPX8GW4b3t44ZNYfe9pn7c08mz423QHENHpVKqDC4IljNWH9mg8q8 c4Xg8Z1sIfX6/JvN0OTHnBHrAQCNswESiPxKnDrGgNp1pqAoZ4QIjpG0WIn8tUdDSz74/a3tG 3ti38EkrDOX2YDuU9gUbLBLmks3LyEWsHhR8OvjX3I+2lz1JQq6SnM/Ozl2wMtvz/RCCusQ2G 2kqTpNjtb39AFUMPrY4SURQctt3k6EKDFG8186FsUJmtogJKb7F/2w/r4ODWZddFf0xE53Fi8 HgvA/zcO3TnUj14f5H3xSPi9pUfemebjv/z0cxbq2Dl2566HmGNoazH4LoIdVbmlBt1BtB8l9 l6GLeJ/IBOdY0Uu6HrvbCSGjVVM2fhxeMBZ6RcheCvfYwZvZxAI9HKAfcefoZc/eEWNS2nGsr DmZks/qg6Iz7vDkedUiIbP19WJnoFzEpa/TTK0YDETWh5E2qSTXC4haKzW28NyNXvbcs80fC7 d3D2YdRjaUNgvZGJ5gUvavc4g6Dynag4y1sv7tdK+ROwqf+h7G1UU1Zshu4QcuhuZrCo/ozex pwJHfUPOoIjRM9lFoAtlC+/enszmmlDhPNAKQOHm2FVbBhGaxUvfA4GIXs4p3wpPFXriJoJ/5 csI8sjHAcBdWC80qLHIjQ5tZgjgFC7XhzKnZHKgvc/Q7w+QDMvc7NV/huqUD1XgtB3AtfgJ62 0nrbxz/0XnMc7cHDzB/J0s96P34mbXedhOPG71VWMxVEuPxczdh4x5XOVR4tfulJtnwVI6CWl ihfDl1Py5t0crbhWgA+SN2FNs34GRA49Gc32SjoOC/azTZlJnYrTYWYktG4jsVPnknTKUAfHt 3Xh47G5DHm6fvDg== X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.24 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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 cause field is unused up now and just zeroed. Add an enum to support info of specific type and replace occurencies where zero is forced. The first introduced cause is CAUSE_REBOOT_MODE to infor if the update requires a reboot or it is a on the fly update. Signed-off-by: Stefano Babic --- core/parser.c | 2 +- include/progress_ipc.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/parser.c b/core/parser.c index 50d9957b..28005597 100644 --- a/core/parser.c +++ b/core/parser.c @@ -265,7 +265,7 @@ int parse(struct swupdate_cfg *sw, const char *descfile) if (asprintf(&versioninfo, "{\"VERSION\" : \"%s\"}", sw->version) == ENOMEM_ASPRINTF) ERROR("OOM sending version info"); else { - swupdate_progress_info(RUN, 0, versioninfo); + swupdate_progress_info(RUN, NONE, versioninfo); free(versioninfo); } diff --git a/include/progress_ipc.h b/include/progress_ipc.h index e00a081f..c1ff78b0 100644 --- a/include/progress_ipc.h +++ b/include/progress_ipc.h @@ -16,6 +16,11 @@ extern "C" { #define PRINFOSIZE 2048 + typedef enum progress_cause { + CAUSE_NONE, + CAUSE_REBOOT_MODE, +} progress_cause_t; + extern char* SOCKET_PROGRESS_PATH; /* From patchwork Tue Oct 17 14:06:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850246 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=hJl3Vieo; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::53e; helo=mail-ed1-x53e.google.com; envelope-from=swupdate+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-ed1-x53e.google.com (mail-ed1-x53e.google.com [IPv6:2a00:1450:4864:20::53e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wlZ2T2hz23kK for ; Wed, 18 Oct 2023 01:07:06 +1100 (AEDT) Received: by mail-ed1-x53e.google.com with SMTP id 4fb4d7f45d1cf-53e305a5a1bsf3544905a12.1 for ; Tue, 17 Oct 2023 07:07:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551623; cv=pass; d=google.com; s=arc-20160816; b=MNlV/22+xXFo2KoycFJK4iNKo+Q9YwcOxB32Wt8ZmWXlK6ESS+IjW7Qdc6jypjP/e9 +x3pVKmGagqP9FrRgiBQwUypGeJwOdO1+o8hLX2zIc6Plqdy0OHeRbC0uB7IC9qhj4io uBYxCvjzVBj45ALafNmZiWRtXpNJeNB8xObhUWu/yoPebwShafEyXksj3e7MqEZ9r/Fy okIXcIi0NvZhh8Xn7DiqKCMRiMJ3dAFslHtbrwe6vmEHdbV0BSdFJyFaHXSHLAcbHLys JpdlYHeyJT/2SBFtsK/ulf4S9iz+MKQtux2ghlsr8xCUMfyLHZMaDHrSZh/iT+b255Fc XYXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=ICH7qW2H2GJobXd44e6ZOxJ1BmnZ/uF4peyGM3yPw5Q=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=QzL1zlln6dLYeI6xI2wiYuOui8YPuPKwQ9N+/653k9SASSsmugfsD/jyW72WRFx2RC RqjSdmI/Leo+YSVyE3srW3u9QuR9qgTMmocKycJw2uiHNoFssWFJyWPgxbFxBDAlcdN1 pB5jLLk0DbhcMT9enUsaTeXcHwAfeyf30X4iXxMxMXpbz3d66idl4V/O3XkFA+Cxd9P7 1UOEVj1rotA2ziC6YkToMwKbxE5ob19JSvDEJnV2QODNAU3kXQNh8uGIfVYk8NonGZHM Y65FLAtm8DUcbGQHxnG24cQkiEXJyFJxtEIY9rLvMgqmRJo9YgYCyhEFTB8kzxCncUut McIw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551623; x=1698156423; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=ICH7qW2H2GJobXd44e6ZOxJ1BmnZ/uF4peyGM3yPw5Q=; b=hJl3VieoshTwmMNXMAj8ky/mkElbHz/MIGce1fndI7WYDWWCYHhsFM37U3K7+Q2p2h WZcTAlSa39nKQhfFomZQWt/LBig7WtLmKekgCbJf6O+Uu26GwrOUhnicSaurzot5/cEk 7PUZ/aYmBELuAwJl+KCRfCPHO4V9hemHKfwv7chGbvHoZnqOgHi9IVOZLqAyzaiRGPsf nlWxiVV+cNQmBBT2vLp2CaU/JCJvIyvV7OGRNfm2pHSY3QIJL+6f+v22pz4ae2+Wi8YY 2X4mcn73BmhOU7+9hZsljVM/j/NsPfsPQEUXxd0KsPC67/Ws+xuVEeaYdmUcbDyIE4vs 2D1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551623; x=1698156423; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=ICH7qW2H2GJobXd44e6ZOxJ1BmnZ/uF4peyGM3yPw5Q=; b=tweqstOGuk5SlUJlhpoOXtcXGUopbbSo2mzaCpM8E5k4CmBdmpKP4mPcdpriMTfgAI U7AcTtfzRoi6Do8AeojNAyJpyqPIChr6M4KGxC6gNAooKRz0LRC4Dwgi0lkawe8av2O7 GB/Q34wO0Ufn6MUMD4uL058LQyc5TCiwJ78ABdodVjGsmcpP28UD29SiDLYLXeK0gW/k hNOuDSDdVgixCmDugtPUaiqjnrmMCUB+gZBhz7ZwDQ7XofuZuJPohCNorFJsdNHk0CGC ct9MDAP9TwEcFy7vrPKhDtTslDVlIpdALNG59tB/gHFR/02+cAITFyMuS75sCcUIls04 61nw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0Yy3cbtxgqLuQlH23k7EGuWC5n711cGpsA6Kbkg4u0qCJlLnrHbW 4EDGdurGNXGbojyPEN0sasU= X-Google-Smtp-Source: AGHT+IGC4ECzUiwW2+uj1dkIQU4zp6sM1iYijeVsYHdnJVwDU6jgIl9W5uO5kN8c3FWPCAWFLNC4jw== X-Received: by 2002:a05:6402:40ce:b0:53d:d8ad:4d46 with SMTP id z14-20020a05640240ce00b0053dd8ad4d46mr2390692edb.36.1697551623138; Tue, 17 Oct 2023 07:07:03 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6402:5d1:b0:52f:3b2b:a285 with SMTP id n17-20020a05640205d100b0052f3b2ba285ls152019edx.0.-pod-prod-03-eu; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) X-Received: by 2002:a05:6402:510d:b0:53e:467c:33f8 with SMTP id m13-20020a056402510d00b0053e467c33f8mr2338686edd.20.1697551621721; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551621; cv=none; d=google.com; s=arc-20160816; b=oItifjyAKAwGw0wFvTnLWvhGJcrwv7CB7Qd9w8PB9mLEu7i+czmlvrEg9Lhu87DvQN ojRIqA+tLfsxhxINGiBIquU6+lJOSObOHlsXdOfdgU2HNTfLiBYXtwJ9aYJ8ryfkArlu t6mHuHvR5mmEwiWjCWSG1l7ueEjhWsSId41sOdz2gdkPHvx8AfRs2ho2BJrPophmCa9e qMHGZhRL8omciSQpXTalspFG+GpATBeM2qMMgNtHl2KNYWlLpXejqtmqPSN+FMLIltkf 3sFfK3sPPyuqe7Z1W0VN/5QfV857uzhgM6Z6oZX5EecJoUUDhgLjF4q/TVVFR4qnKbvU gGLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=D7zIGLFsL9BcCNv9/fG5bos4dMQ7J4Swrm7BV9BoLUU=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=RwqQIHb04+GNcGgW6mZ8fcvlMKLSEpOOYCGNr3CqSlszOyyX5tEDLHWXJoHvIBhcno 7TlbFSPUo+UnI0WrXWb2tnCoTriTm5us2ZOuvnhkqRefUasHivYQ+NfxKvmVHC0kizqy f+x7nTTlP6IYhlEwa7j7IxolXQxKJtNyuNwHyCkKfjHv5IzZsNC+xuOXRE/sZy5b859v 4EdPEjwl1jqSuRpOqjar9zPlG0NkfrRtpno9W1jTP7XQPSwlaENuqdxnUYhtIW8kduE/ C3ERVoGoXo1NAD1siq5ap7FFRUY9HFay7n5n1UsUjUF9O1ug66+ZPx90cxZZM5lj1pMZ qyvg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.73]) by gmr-mx.google.com with ESMTPS id l17-20020aa7d951000000b0053e90546ff6si72387eds.1.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) client-ip=217.72.192.73; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MIMT4-1qnGYS3xMC-00EK7n; Tue, 17 Oct 2023 16:07:01 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 08/11] Reset action_id after usage Date: Tue, 17 Oct 2023 16:06:54 +0200 Message-Id: <20231017140657.95860-9-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:18iOe9BucUjPpREdWFf5TeOeh2+u7YtbiW0bnTzJYKwucL39OZf L/p7d7pQ3WPiSVDsadCGwQeAdh9uXkKBIbTZ90OlHt2oGVY5H9+8qZDmR+JlCc6WEKMa1J+ i+4/xhKakqCE+SRSHOpX+R9fQH5J+38adEScQMDeKU1cbhAT7Om19+Ucudua+f715pmARDw x/kusP/7HQKsy/jLjkJHw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:uPCLLpj7n4w=;6VDpoHp9zF76d7wuLFoJ7YRGj0c nEwbKHJaL6YYWzop+wNwJgpw0M54eb5ynJ8h72ZKODlsIP4VFTzdOC0R7Gcr7jvekr+f2Aeba 9JG77NiUmWPqbGeuP8pe/GSh0s7AXAXWXq9arecYsSNEkbj+wTFONDFzU1S1hoW4PBB/eDfM5 sIT9zY+Um9ebhZEB0M79hTSSK00Rk6S1dRWqUme200cUagbBgbPhyo5Nt18uvVEBRI7CefESI SIfWtRkFKF3gLeXUnAFsttwyi3Gn9u8SF8fp1Jrp+zrVZ5aZMX0RgIPDJXg8AdZ2KXZozGLlF jtWipxDf6RHs3pM31Jd8PksC7QtUdBr8Rv+Eoe0tppCV+Uyul19YeOsc0otox7DQymtTAp/GR Mw8wAFYbDuvOmcc81M5CiUrzYsP8xaPnPHaB+X0esvQi4/mYHG5engDDg6/yNlxW+TwJtr3dK CP+q4rYfTi1Ix1X6zrsqWS3iUB58+JKznJasc4j2qH3EuxXfIXD65p9u6FEhZ33UUna1P4wWw md5zweTLZua7DV914j9o6N3GyL1lj5zSANB+aZfAuDfWZcQBpxWgH2HMZGcKEK6y7OD4bxng8 qOqi4p9EpSm9LE49jk+GzndQo0BfFLc7wlpmHvsnS3ET733w0w0vE+3MiilqCtMHVOG9zMwHh 0QZ3g29sB5JANwI6bVxKV/qSECs9xs3cTzo0Zgf4l4twO/kBzIqrvOdIWqxWz1cRY+0n2Avor j3fDXLWfarwtXt0lbOlkyZakrak8UQblzbo390pGKpCrO8veQgJMrR0me2PY2/B+qwLREYFvf BFVwUFhXIRsRvgN4Sp7klo4MjIl+n9yPjLvLwJgt+1HcQpo6pi3fWKMu7AZY2WVFKpFhSY8wu v1spteW+VMJfjWA== X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: , When a feedback is successfully sent, the action_id must be removed. This avoid that the feedback can be sent again with wrong action_id if SWUpdate is restarted (or if the boot resumes after a power cut). Signed-off-by: Stefano Babic --- suricatta/server_hawkbit.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index 9b71987c..572ee1e3 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -868,8 +868,14 @@ static void get_action_id_from_env(int *action_id) */ char *action_str = swupdate_vars_get("action_id", NULL); if (action_str) { - *action_id = ustrtoull(action_str, NULL, 10); - TRACE("Stored action_id from previous run: %d", *action_id); + int tmp = ustrtoull(action_str, NULL, 10); + /* + * action_id = 0 is invalid, then check it + */ + if (tmp > 0) { + *action_id = tmp; + TRACE("Retrieve action_id from previous run: %d", *action_id); + } free(action_str); } } @@ -937,6 +943,11 @@ server_op_res_t server_handle_initial_state(update_state_t stateovrrd) if (result != SERVER_UPDATE_AVAILABLE) return result; + /* + * Everything fine, reset action_id if any + */ + swupdate_vars_set("action_id", NULL, NULL); + /* NOTE (Re-)setting STATE_KEY=STATE_OK == '0' instead of deleting it * as it may be required for the switchback/recovery U-Boot logics. */ From patchwork Tue Oct 17 14:06:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850252 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=xB/oWK0c; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13d; helo=mail-lf1-x13d.google.com; envelope-from=swupdate+bncbaabbb5kxkuqmgqettsszlq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lf1-x13d.google.com (mail-lf1-x13d.google.com [IPv6:2a00:1450:4864:20::13d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wld1qsWz23k9 for ; Wed, 18 Oct 2023 01:07:08 +1100 (AEDT) Received: by mail-lf1-x13d.google.com with SMTP id 2adb3069b0e04-50318e9067esf5402746e87.0 for ; Tue, 17 Oct 2023 07:07:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551624; cv=pass; d=google.com; s=arc-20160816; b=TtZWz4NseMTpkqRROJwKNKftiTu2aj8AZ5dOe1qemVSi/T2Obv4LEAALPkPTJ7E1Fa T1cxGwx0Gm15zt7nACFQ4gG9dbn5EtugPoD6JlgfSxVLEVN+N2dBTQ1FAwuxugG3YpBV SAMmGuXCbAWBOD3Ht7EZHH8qDH62cJJKBhK2iq1Gv2g9oMys962zyAYa8O4BEfnYy4A5 0jQZAqsXwbwdECadDi8NCyYU1Kp2pTt9pqLxXNaC/nbf+thADEtkE/y55gy2C063RMhb aGO+lynP/Ljq8Uu6fBIWbQVLoeqnCveGbpF9MJEDkAJ49nT07YzUbQGuyLH0YaANTf9B R+0Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=Kfc00G6A+mf7+P56qIUhnadLloBqLliHwCtqClXfRSk=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=JzXup/QcblBqRIxN38ANS2ZEptzsGwSVB1SFWN1lNq8pwPicBzVMaYeRJZWIYin1ye hDluHBS5jU2Z2UblQfbp0FkiIx6Ae+/k5l+Zc9PpX7zM2i+eRIVgBNCbxK2MiL8GOR/g rN6IKg4vbIYEnq0ZjfMUaez28C0ELhgY+6VxjXdXfdTEtBNOJbC727geivo2EvFBWm/Q Smc3uK4dIQmERr+i3kSNoONByF98Z/DIw/f9BsbtjVMr41jQ0fq+ZMYF9awW0WVX6Zh7 IBP4ApyBY/HfM5sujNugd+SPX1I3Ub4VyHAQDt4hx/GL9Ju4sUAAm99QLDwT5qec24gT zU/g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551624; x=1698156424; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=Kfc00G6A+mf7+P56qIUhnadLloBqLliHwCtqClXfRSk=; b=xB/oWK0cJorVwa+iLnl7rQ2gTMF9RpyfIpD1w9YXhDeGpXI/Fgfe2fYj9BTO9v5wD1 /q8X9NQ+FOu4jlCn49nUTIqYFfcGugpYJVYDMEu6115Nw9IAFpQbrnoQ5Th11GMdYpE8 Vv2h05jCRWB9/aewuAqyEkuyLz04y027SCjYgsXjm19IzkimQP4OX8BAKHSIc9smNaAF 4D4PwO9BaMLXw9aJYzzTcVFEknCoGCcv9Xs6VEJSlYrxMykG3OKnF/DQQAZ12MnCPgvm 9oDYcfpBYrYgFNKyI2VrMyRjHi7MEcKcfkm8ZkBZx5vkF7biIHQN6F3F8Oc3FihJ1cMr dRng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551624; x=1698156424; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=Kfc00G6A+mf7+P56qIUhnadLloBqLliHwCtqClXfRSk=; b=KPktReASR/OQo9eUa4O91rT5Y+dnbi1npq6bxDOP2zSxD/sPYV+zryuU7pkMTEp2Ah qDom5vtA4njG2oLkZHLpE7EYxzWtYq3J/nHuwKYJwUYZoGBlgvzJkudK+HbYuAi+aJTQ vyUK+bbOYMiljZwAywaScVbEI3bPkt00OjJonCAknkqAxYQNRBl75mzbaer1cul1nuH5 T0GWlPwzLrRMMDwys5G8RmcDrxvq0POVaAmPbz7vo/6Vjkch2t5KSpKc4rwO/8ckhTG8 JBM5/4NmYqU38GQXhD5rA6BUTjS/k2eEZpRvLTomBrbNxQwUDqSY4H+OqUZfpjI8gP5J Qv2w== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0Yx+Zc3XUqIFzIOfKyQrrqCXVHhwssWpS2T5V/Ade3E4gSHMfV8/ lL1KR4PXPTIqXtsRVfTMTM0= X-Google-Smtp-Source: AGHT+IGExJkRKyy2FV61Jj13aY2QzaDFr7bkkBBTGT81gdOBuinNSxfL9RJOxSZtNwo03ekSJBB/eQ== X-Received: by 2002:ac2:48ab:0:b0:507:a908:4a93 with SMTP id u11-20020ac248ab000000b00507a9084a93mr1813099lfg.61.1697551623786; Tue, 17 Oct 2023 07:07:03 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6512:3d0c:b0:507:999e:6d6a with SMTP id d12-20020a0565123d0c00b00507999e6d6als274065lfv.2.-pod-prod-06-eu; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) X-Received: by 2002:a05:651c:2cf:b0:2c2:9e5c:2c82 with SMTP id f15-20020a05651c02cf00b002c29e5c2c82mr1638127ljo.46.1697551621860; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551621; cv=none; d=google.com; s=arc-20160816; b=PxFGemK3dcOqrSUID/K8s5tlRyLSUlipXTTG9LNQOGh8a+R6jNBsV35Sq9dy2gcdhO e4t02HA4vuUoAFcrg1OfkRDP0zX/4eXejR+A3M+Ezx6C18voGYXotPa6QiL2v9O7RgGF +nPgnagbwt5SqqIiQrvcI3E+UHN0VIV2UzTk7kAo+TPg71bsZLOtHSaOvDGmhhIbxJdh U6X8rkVe0RDUOUUXcVrp/8vwZlu6nrPLtJw7VVKO6Pf3ciBPxXk0tLz80QVZxwlitUjk hdDUjS8FyxGfVVDpcBnM91euw1TKAI19IFKy2W6mQJE9gNJPrPQwEM7MXhG4eD7JEwAO o1/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=EipCcx2MMEQLUULCtH/gmz6fG7i+zyUrvHhNbEY3FKc=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=an8Nw4pV1JImKQDT1oFbJyCbSbZeUfKbbGNZWkclHq2MFT9JYM6otRTODPIEdxh2dN /DrZjjOBdjw88NPGhzxWUblGPHyiu2sJMOKaziyhHGyTR8cH2ic/v+C9NSX0Gpoezzzt SOfxvKr8r9FdPTNQXPORfQQd5E0iC5OKv/dy9RhcpQ/bJnmSptUqj6GQUC4wn+C6bgK4 pFEh+TMWmQ954pgsFGn39prEqMEiaze/jkAOYdjjxd96GLB+sy4sKFEFma34HKUREd78 CsdgG20+XRU/FG2oZJqaAPQGrXinKXrM+wZ3DjcBsEWjKbR+vGAeVsYR5VPO8ecvvUzj 3Yxw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.10]) by gmr-mx.google.com with ESMTPS id h19-20020a2e9013000000b002c29b97d5f2si62164ljg.1.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) client-ip=212.227.17.10; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MxUjv-1rlwkO0KQz-00xwH0; Tue, 17 Oct 2023 16:07:01 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 09/11] Send information to backend in case of on the fly updates Date: Tue, 17 Oct 2023 16:06:55 +0200 Message-Id: <20231017140657.95860-10-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:wVY46siuVJIIolRLGGCzKHzoVQpcC/DcBLpqRg1u5jcrliIiths WuaMs3WZ4SfHntIasajLB86J4cxohf9LXt+683ButDn7CsHVOMtX9JqDVAds6CL8Ry6E0w1 qX7YW+SPl/BEyiBbYNGVYLFs+JNsOoUdMBbzkJdEq9J413QjaElMww/qCnUuQevDOAGWqWt 6IXFhegZaXoP9ghx7cvuQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:0Azkji0MGoE=;Fpu2jZB1lXeh5EEkhwKQQWfZlCY XZO/LXadEfvrn7pLqn1rQ19gXnub7eK9ORKRmU8tAkMN3vy53JPv8+JjqlRcaCZqp1CKGbl/5 SucaE3WWoe6yec5S6iUtBWZlpPgOM0ToWito1TZMq5vPYkY7AvmlfSTtfz4aKYXqewgYk5NjU YgTcsCRap6MWj6CXkE32/WgMddZ/NFsFVWcDFYe81gqAep/W0wEXf78wvKIucDHN916HYICTy 6MX0k5HK4G+9pB/3rufsr8fUokye0kdqQhiHYZ4TFZeCAd7nT/hpw94Ig74aGcALHjEjph5e9 j20npbOoKz3IDXLjpdH3+6OmRtaRxbR1Qv5uVaJe1qPfF2nl3W9yao1TupL7sN5SclueQTebm bP4Mf3ksycZZdvY4617PqSjslEN25nG89y/XlkO27bmTrhCk3Xn0XBE/PQ9VkovtQvgqQanUp ilSAS2I3c7xwEMQEB6J4fsh5yk5AuRKxH76O6zyg2sSB9wTKFhZ4pgxCNaByInovYuqEyVuR/ 3SNKLA/fCEUBc1apvfRjBBi7+7HnWeLchPzObZh5ZoPjuHLUkmBQUdu8oqx+PQKocW1qtt77H SfIDojbTOrPKdUVauc3d11HDZ1aiwYagGsJ2yAGl19o5O7PNWzSMsQQ4UG6WhCTy67uznbpts zejI8fE/01HEPWG2KF3yJUNkudkHJOGGuVgjx/aPbBUCiUeNhRJlF1IOnxPQRiEorBZZKfboT +ohqQZreWNEae4aA1fxw7YUi0FpQ6HA4zFUTI46gPNUAauKDsl945gm/MoW2BeCTdRocgaOqt GrztO+lj/G8BWf4tV0TWHnhLjh1ZtXTuUvE/m0ZMwMQ7S7ww1I81AhoeXHOZ4e7m5nsMfsxSY k8DbDXUIXmAgWhg== X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.10 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: , Not all updates require a reboot. In many cases, some parts of the system are updated and a reboot is not necessary (on the fly update). However, communication with the backend stops because software was already installed successfully and to close the transaction, SWUpdate had to be restarted. To better support on on-the-fly updates, a new attribute "no-reboot" is added. This is just to inform all processes registered with the progress interface that a reboot at the end of the update is not necessary. SWUpdate registers this attribute, and sends via IPC a message to the suricatta module (currently, only Hawkbit is supported) to inform that the update was successfully executed and the transaction can be closed. After that, the suricatta module exits from the wait process and it is able to receive further updates, too. Signed-off-by: Stefano Babic --- core/stream_interface.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/swupdate.h | 1 + parser/parser.c | 13 +++++++++++++ 3 files changed, 55 insertions(+) diff --git a/core/stream_interface.c b/core/stream_interface.c index d9afa4af..0b783291 100644 --- a/core/stream_interface.c +++ b/core/stream_interface.c @@ -660,6 +660,15 @@ void *network_initializer(void *data) update_transaction_state(software, STATE_IN_PROGRESS); notify(RUN, RECOVERY_NO_ERROR, INFOLEVEL, "Installation in progress"); + + /* + * if this update is signalled to be without reboot (On the Fly), + * send a notification via progress for processes responsible for booting + */ + if (!software->reboot_required) { + swupdate_progress_info(RUN, CAUSE_REBOOT_MODE , "{ \"reboot-mode\" : \"no-reboot\"}"); + } + ret = install_images(software); if (ret != 0) { update_transaction_state(software, STATE_FAILED); @@ -704,6 +713,38 @@ void *network_initializer(void *data) pthread_mutex_unlock(&stream_mutex); TRACE("Main thread sleep again !"); notify(IDLE, RECOVERY_NO_ERROR, INFOLEVEL, "Waiting for requests..."); + + /* + * Last step, if no restart is required, + * SWUpdate can send automatically the feedback. + * They are running on separate processes and should first + * know that the update is completed. + * It seems safe enough to wait uncoditionally for some + * time, enough to let all SWUpdate's processes to be scheduled, + * before sending the IPC message + */ + if (req->source == SOURCE_SURICATTA && + /*simple check without JSON */ strstr(req->info, "hawkbit") && + !software->reboot_required) { + ipc_message msg; + size_t size = sizeof(msg.data.procmsg.buf); + char *buf = msg.data.procmsg.buf; + memset(&msg, 0, sizeof(msg)); + msg.magic = IPC_MAGIC; + msg.data.procmsg.source = SOURCE_SURICATTA; + msg.data.procmsg.cmd = CMD_ACTIVATION; + msg.type = SWUPDATE_SUBPROCESS; + snprintf(buf, size, "{ \"status\" : \"%s\", \"finished\" : \"%s\" ,\"execution\" : \"%s\" ,\"details\" : [ ]}", + "1", + inst.last_install == SUCCESS ? "success" : "failure", + "closed" + ); + sleep(2); + TRACE("SEND CONCLUSION TO HAWKBIT"); + ipc_send_cmd(&msg); + } + + } pthread_exit((void *)0); diff --git a/include/swupdate.h b/include/swupdate.h index 8f768a72..c1f86b36 100644 --- a/include/swupdate.h +++ b/include/swupdate.h @@ -70,6 +70,7 @@ struct swupdate_cfg { bool no_reinstalling; bool no_transaction_marker; bool no_state_marker; + bool reboot_required; bool check_max_version; int verbose; int loglevel; diff --git a/parser/parser.c b/parser/parser.c index cbb11962..46642a4d 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -214,6 +214,19 @@ static bool get_common_fields(parsertype p, void *cfg, struct swupdate_cfg *swcf } } + /* + * As default, reboot is initiated + */ + swcfg->reboot_required = true; + if((setting = find_node(p, cfg, "reboot", swcfg)) != NULL) { + get_field(p, setting, NULL, &swcfg->reboot_required); + } + + TRACE("rebot_required %d", swcfg->reboot_required); + + /* + * Check if SWU should be cached + */ if ((setting = find_node(p, cfg, "output", swcfg)) != NULL) { if (!strlen(swcfg->output)) { TRACE("Output file set but not enabled with -o, ignored"); From patchwork Tue Oct 17 14:06:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850251 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=D4DhthAU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::237; helo=mail-lj1-x237.google.com; envelope-from=swupdate+bncbaabbbvkxkuqmgqe4r2pgji@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x237.google.com (mail-lj1-x237.google.com [IPv6:2a00:1450:4864:20::237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wld14ghz20d4 for ; Wed, 18 Oct 2023 01:07:08 +1100 (AEDT) Received: by mail-lj1-x237.google.com with SMTP id 38308e7fff4ca-2c503af866dsf44701481fa.2 for ; Tue, 17 Oct 2023 07:07:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551623; cv=pass; d=google.com; s=arc-20160816; b=xxm3ZrQBd1Fkkl0d9pCzKIqr4BPgzk9fxBbveWgm5/Fox7ftLxLSdxkPJjjna3LpkK D5BRMny9uYn2udt8LHshJbXCg9y269IEyNsh45/5nhlmdYqYfKP27hxwxLEacxvWeF8i /X73NNj17NcX1rYIeXcLaI+ixN2Ir1jmrgJnsMNiRt3ChA5SZQCOhn7MzZeR8kqYEswY 9c6DjuZnSvKxDmorOwItVbOAC9b0pziCX6HGlPiZ9C5Ap/eHZSeci3viEr3v8TtuzFeZ KBYiDtgESxuG83L94TzjAuS1nbhrBr7W9FkhJ4NU//URrCysAVRJwLxn5p3HNWyhtROy DO1w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=3JjR1STRYX3VwWsmnGmBeL1oHO3PmgekwnfyyhjiaS8=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=u6EIIX/GKr70Tg79KaoL6DzXbNt/jhmfwO4o3NqNco51Txfyk2lqYAUALzWmARZUez uJCar4bkgnOQeVbEn+Em+7umvb7GD4DvukqLAiPvsRGPM9/Ub8vifScxayoGEgH8h/Hg +l1A7zMNgnzhJNsbdXRntWh1KqAtdi0hJ6nmv06jGAnpWK47IGaV0HVvzpABvrghVc3S pc4qpUONleH93/BhinH/AhDEfuggtSI0CiMJ/mOG2mqa5x7KZuG2IBT5WWWmrWKFWwbd deJHb7web8K6yjV5idEydnt1qBnPpNlXxNj9y7Q29NfWni18B0D4lmr/z0G+hyAveccy qgUQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551623; x=1698156423; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=3JjR1STRYX3VwWsmnGmBeL1oHO3PmgekwnfyyhjiaS8=; b=D4DhthAUYXmdYiIRVh9dgo/v2A4tQncEGfwX70QIvWPTNSQcQ/RLRuxbcIHzGRIauW L48MzahmEYjq1h5BfLc7y7Gj/NFyq+qsCXV6DDx7VS0wGRTkYPrNL4FWsCgRIcpFLS9J 7unTVVlLO9J0X4Y5xPxwL8f6PP4lxID+cQ3k5Jh9PqDUH12DOVUbtvutKDjjpyS34vLx kYq3pp6+iCZ8kNnYH1y16tEKRrfnG3Vv+LzQ7aJc/1Nd6I5HsO1WpV8GSq/mzNWEvvPi VxKVtvi+n7EJq6jcXLr1qtD1K356BYNy1XyqS2PrXOISi2pXnw4e9GXjQA8x+z7LjbK6 ZKGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551623; x=1698156423; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=3JjR1STRYX3VwWsmnGmBeL1oHO3PmgekwnfyyhjiaS8=; b=hqAiYSXju2jbppACLOoSeHKn76vNJkLkLkgUqKPcydZRAq8LtmmtU/06fE4EmFNxjd 56f4arI4l9AwdH/75unSKdi1dcL6mh9LShSTzflPI83wrBPrjoVba+KLwt/1R3xclD15 qRP1M9Ia5x08T5Xka4MlCqd29isKlyXP/2Me9QTD2BgjG/yCK7mxpl2XpzitbYRKeoOK iMeJUFT/B/JzzZasjncngX40Gv0ycf1Ivt78hKcAmVKw/3amB2GL2Lsc3TfgkebSpBsr /eHguZGHGclQ2cpqtpRVY7ureVsDQLdqfgZ0W7tP65fc2GT5VpRtOeGX65Cgkknqe7uT C2AA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YwLZW+jBhEf1AVrKJTKOtY4P/PZTO1NjlKhNrYT+YleBOrMQg4N QVmsOD52MYh7UXaHoeR4crk= X-Google-Smtp-Source: AGHT+IE6IGgokhDO49Wap7uSMsQYoQa+SCYlRDrRAn33PvdB8n3FDxz7YkaPQXdO2Bl9ByVD5GlkDA== X-Received: by 2002:a2e:b52a:0:b0:2c5:1ad0:c318 with SMTP id z10-20020a2eb52a000000b002c51ad0c318mr1576592ljm.44.1697551623312; Tue, 17 Oct 2023 07:07:03 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:720a:0:b0:2be:574a:3b1b with SMTP id n10-20020a2e720a000000b002be574a3b1bls1719313ljc.0.-pod-prod-05-eu; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) X-Received: by 2002:a2e:b8cd:0:b0:2c5:72e:6ff3 with SMTP id s13-20020a2eb8cd000000b002c5072e6ff3mr1827599ljp.37.1697551621662; Tue, 17 Oct 2023 07:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551621; cv=none; d=google.com; s=arc-20160816; b=PYRU3BqAzKLQCgJ/Mpq5Nf2+u4fv99JVfVA4S2GMkzFztGK6JeCL4fBIyUNzQunrTM kuScEDcmeZV3qOP0YO2S1UAVQg4eQFh7q9/2tTrYNyiF5Rkp6evq63uvrTmVPj050Yoe g6ueYKe1nVguYM6b6yz31Yu3TPazMOqKbOOPGskF3lrjFf1yecvUvGW8psDHXqogQ/On z645RnaMmgD3UOtBQwDvs46HbUi8O4Tl7JE1/4xr6x1/dnbJ1/QQhUfjtwL0F1+BZdS5 lZEiKYTsqUFJlNenuPzYVehbDbw02OL0aBkOHIPRJmukNM48IKsTh+8usVIIcejdtrea biSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=PgJgyjkWqXLzINcmPtFcw01R75P9u+yKE2B2voHn80I=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=Nhdx1x08NYkAGdCBazyoK5tZ2TEPMaYBmIqcAQ6vF5eR0dqh9otHy+/osI/VvqU80t omfWNKGjS5s4cBypSDgvGNdsuPy2DcSx+5Dn8A8vrnuNatRru8TwJQ5PcjFTPu2UpuiE VQvOr7/zhx9ZVK/kP+NsJHrVeU7a+JrcUFiA3ux9nbW8js6oAxSd54WmtKxsm9WZIuiI 0qweGHcZHSk8ZaPFg2DCCuDzXQK9uZAtS915MDgcw7QOV2TPaQXdmfva+GvkuTSl/dvE L7xFmGlBcKa/Q7e67n8rjri3PVd4QyeadlvU0OQyYiyyYqsZ04C/v/5fa+kBA99XySKp ebLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.73]) by gmr-mx.google.com with ESMTPS id t11-20020a1c770b000000b0040476a42269si62357wmi.2.2023.10.17.07.07.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) client-ip=217.72.192.73; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MLz7f-1rAh760tgv-00Hykg; Tue, 17 Oct 2023 16:07:01 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 10/11] swupdate-progress: parse if reboot is disabled Date: Tue, 17 Oct 2023 16:06:56 +0200 Message-Id: <20231017140657.95860-11-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:lLU4yaQPXzbgtRyGQC/NhDfTIvM600pnYyM267KT3D32b/XShQ7 iuFl9jjCMFoKvUW/YCNe3pGRyimieLvUDPIwSpqaRiAQf8H49l6eS6z2FDl3eqW70+7KmGa 8WKtXZmzIJKoB8nuvjt8GtXSqYlD8qCoWPrUKhFeQZeggFWB2oA0/zA96HeXpDb3J7ucZ50 bOMWXk+tMPxrSJJK8OvuQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:39HmcdVks+E=;2F5PCGCfC/sQzX+1SzLpv8AKqCq 0CCqYiN0JYre7AHlt/yrYjET8N599OxhbjRh8+AOI+9RzY4mLraV8808Mo+Jxrd5FVoCMO9du r3GziUgnLCRlWmRZP1Blo/r/bJgdWCPX2OqV3D68PLC7exQxT6DzwSd+Z6ytaXGuXRwT4h9YT zJAERIDghITnos3AzuAFkWhuFycjA94YmiOapRoJvyEqzmvPSEe8vaPYfit9BF5aMMB57n3Nk eObSbcd3GMrylSsvpIHtMWwdotUeqb/j3NojPqSws1TgwUrOKNqOjOnsFFJdRXaN10rcpEdo3 khhL+nM4CupwDBgwoWsnXU4CwFvYKQ5mSHYnIHTR74DTet3q93I695q2A8QC9XHFaY4WahHNS IjqvHzRtXH2KmUCK2YqjaNhirDwj6CgGaZJvjHy4KY+e6Ym8zNeRhVauYyxLCtYLFAKvZqdgb 248HYg6tPqV21EoMdwjpreyoBoy72JAJryncUf20BVcQ4nOahtzkn9m7gdAO3c6cHz8TcNkgj DrReglFjufOjrAcViJ0Khp7/3jXdRP+Tc/IsLw6wvbizTAgb6G8LOuKXK2nNFKYz3/YAKksIj /mSxDEyKaSqVIhHrVTW2dab4rH80tW9UgVJRN8PvQmjtqbsu0FnPYGfs4usWYkjgYxQIA0TWn BxPhni2aeZic/Ku8z2+ORoziEHQhfd+pPrmQBueeXEA4QtRIqu9SXUIdMDFBtvmYDg6ffneHX G3rozRn2vyCE3rzYj5lo7nnscxPHVv7gzaVOURp75BcadVwtgi6vfbGa9lVctK6tw+1Mqy9gu u45hnkMdcAyjbWGcOnTTG0zOQcLayFCLgqx2slWrQknFBT6/CgyOZRbtwt+kZ0D7QrIFnhTc9 Fo3eUgQSl7+RT5wCPM4F/AMLBhlnV29hCIGQ= X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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 attribute (boolean) "reboot" can be set in sw-description to disable a reboot for a single update. This information is just sent via the progress interface into the info message. Check if "no-reboot" is present and disable a reboot for the running update. Signed-off-by: Stefano Babic --- tools/swupdate-progress.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/tools/swupdate-progress.c b/tools/swupdate-progress.c index cba497a7..48a44481 100644 --- a/tools/swupdate-progress.c +++ b/tools/swupdate-progress.c @@ -233,6 +233,7 @@ int main(int argc, char **argv) int c; char *script = NULL; bool wait_update = true; + bool disable_reboot = false; /* Process options with getopt */ while ((c = getopt_long(argc, argv, "cwprhs:e:q", @@ -321,7 +322,11 @@ int main(int argc, char **argv) fprintf(stdout, "LOCAL\n\n"); break; } + /* + * Reset per update variables + */ curstep = 0; + disable_reboot = false; wait_update = false; } } @@ -330,11 +335,30 @@ int main(int argc, char **argv) * Be sure that string in message are Null terminated */ if (msg.infolen > 0) { + char *reboot_mode; + int n, cause; + if (msg.infolen >= sizeof(msg.info) - 1) { msg.infolen = sizeof(msg.info) - 1; } msg.info[msg.infolen] = '\0'; - fprintf(stdout, "INFO : %s\r", msg.info); + fprintf(stdout, "INFO : %s\n", msg.info); + + /* + * Check for no-reboot mode + * Just do a simple parsing for now. If more messages + * will be added, JSON lib should be linked. + */ + n = sscanf(msg.info, "{\"%d\": { \"reboot-mode\" : \"%m[-a-z]\"}}", + &cause, &reboot_mode); + if (n == 2) { + if (cause == CAUSE_REBOOT_MODE) { + if (!strcmp(reboot_mode, "no-reboot")) { + disable_reboot = true; + } + } + free(reboot_mode); + } } msg.cur_image[sizeof(msg.cur_image) - 1] = '\0'; @@ -391,7 +415,7 @@ int main(int argc, char **argv) if (psplash_ok) psplash_progress(psplash_pipe_path, &msg); psplash_ok = 0; - if ((msg.status == SUCCESS) && (msg.cur_step > 0) && opt_r) { + if ((msg.status == SUCCESS) && (msg.cur_step > 0) && opt_r && !disable_reboot) { reboot_device(); } #else @@ -420,7 +444,7 @@ int main(int argc, char **argv) if (psplash_ok) psplash_progress(psplash_pipe_path, &msg); psplash_ok = 0; - if (opt_r && strcasestr(msg.info, "firmware")) { + if (opt_r && !disable_reboot && strcasestr(msg.info, "firmware")) { reboot_device(); break; } From patchwork Tue Oct 17 14:06:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1850250 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=mSjADs+H; dkim-atps=neutral Authentication-Results: legolas.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+bncbaabbb5kxkuqmgqettsszlq@googlegroups.com; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S8wld0DNYz20cb for ; Wed, 18 Oct 2023 01:07:08 +1100 (AEDT) Received: by mail-lj1-x238.google.com with SMTP id 38308e7fff4ca-2c520e0a9a7sf22012631fa.3 for ; Tue, 17 Oct 2023 07:07:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697551624; cv=pass; d=google.com; s=arc-20160816; b=sqmgS60kt8LlWK+gCDF7BS51XopHnQeMCMNYa9BIA3oYHC60ULhgBbo8R7o2RVWg6i +1/4CTAIY1FaAA6FiCGM1eOHWH6YqVNQamYD6HzW2V4IiSzjDq1TXgYdniAuNZajVcFu KneWCZm1SwWc6n2HoD5RC2nQhyxR+kIW65nEqcuXdV5IJhtphE0SfUPBfe8N/VMiahtK Q6eYOY/39Pjb1hh6iTc2gp+UjgBFqOhL1lU5/kJo+pm04fiTCbhWVGoHvgkJJ+lGZTy2 NNqrAsPba6hS52OfC1WZW0Ce5SDIIeSvb8Q/XxqfrTzBnGuTNRQwSh6AvTYI9hZsfGuf XHyw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=7/B7wWd9eUBf+kMoJ0NJxP5NrFMRD2V+zXmC0OqXvSY=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=GYJUYh2uwKw1BaVpwOPznUIddDduMD8XfVl7Y+93HWol2xBNJntsr8CFXoAV8JvvEv +BGqIg6LJLXSsGxohaQ79F/ZTzb4GaIMvzzDrveUi9IJ3lcocq8dfKXvnoiJvBcpVFmh GyyOcr3z++iLhEZIeRDqXuuCdb5jJtWQh5YSERbsWR47/NIUwvF1xA7WFnmHQPp4YDHV ubdZ5ozDQEhuZGP58SGSiXyd85wQIIAGdgmMO7AGOQU15EtbnzELF43lQlBRGsIbndu6 ZlWNuF/h6Dv12pS9SN9Mhdt++ZyqkTF5jLXZC/SbD6aaFpLe7sI38HQ4EDme2tR3fpAn SH6Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1697551624; x=1698156424; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=7/B7wWd9eUBf+kMoJ0NJxP5NrFMRD2V+zXmC0OqXvSY=; b=mSjADs+H8Js0t9FfTCqViZZQo2f5NczLLgxoXUZBVZZXEnFLSaaoRykWiTl0ziK84V XaQH+Mo2J/rJGbUGEI5py2ZHv1qCHO0boJhPuE85GZK9TFUi6xRvObMhUMbms+EH9FKe vEy2tTQQWBCyV6O3abRMx3RISCWwFR5kAv2/nFTw7Bx5eSNxGyefLkKQQynTNNCXNbPU ZjJrISZ7nNnD38gEIfsGJO8fjS4rdxiq17R3VVKmRjvodjuT9U1ZGQrt+W2miLZmSCba IfhUIEOOwTQv0cqeyvshhzB6o8j8ZCCCzAJIMwOXoBxhlHNEbLFB4MxfQgstFrIneyKP f1dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697551624; x=1698156424; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=7/B7wWd9eUBf+kMoJ0NJxP5NrFMRD2V+zXmC0OqXvSY=; b=VWSvPXY5PbYKNKShf0YnPgwUgwXzPb2w+mwHIlxktNKDTUEoAVgI+yfE+JcAPX88EA 4O1S0q9HIalRVoBets1eR1cLFn/Cchi84alFQIVEahQDkBEheX78kddNJfMKXZ7YmERc BZbSYVVpsTWwGlw4w58Bk/A0vPOrMZpm5yLAXGxz0PICujS1wYT1DnmvJGryepjGhXBA PdIoXT6s7PSfjyf02AiS2lX9EbNVj2uDijMavrKC2/4Pw1m2ThalcMuXjAIx/ymv17bi +0G/V/lNe4eL9MjvtZyELgW2MzWCvHp1IKCDf6r2tXlKd/rDV8xg5iz+Rl2b02RcawhB MTtw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0Yw3ksF/kaWn9N6BTkisSwpBIGvwFQCOnXVwFI63iK2I7zgq2NSp 3R3vMCZuWmabWuUfQT5zaFs= X-Google-Smtp-Source: AGHT+IHaU9g6mS5pY4mX8saAmOeac8507hIovXWr+LAqqQ8QSN2L0SyW5uPrh1iiLm+rd0wTtqABdA== X-Received: by 2002:a2e:b893:0:b0:2c5:924:e8b1 with SMTP id r19-20020a2eb893000000b002c50924e8b1mr1926970ljp.19.1697551624037; Tue, 17 Oct 2023 07:07:04 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:8e32:0:b0:2bf:f55d:1df9 with SMTP id r18-20020a2e8e32000000b002bff55d1df9ls1708502ljk.1.-pod-prod-05-eu; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) X-Received: by 2002:a2e:b893:0:b0:2c5:924:e8b1 with SMTP id r19-20020a2eb893000000b002c50924e8b1mr1926874ljp.19.1697551622188; Tue, 17 Oct 2023 07:07:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697551622; cv=none; d=google.com; s=arc-20160816; b=LfBmrPJ5WshcSnl+U17igJJI5j1FxXNRIC1ix+Yje21uvKPBRJGY/5Hsr2IvpVV6g2 XuE+a5q3qtgmFQ7qVXGrro5PdnHx1gz6Tq3NFgCR1ln7Cob7toIPhPXrAByo1NtdEQf+ 9md2RE2KgS6xhW8fMbuF1NlJ5cLJ2rcb6AeviE47jCKRr64eT/LfOv0WBsEO7JEx/kQY QnV8N6ForsU9kkkizqlhSejuRMcO/a7F5XgmrwpBZoAk3WkHsunPJOF/v0tZHfApFe0w Urg1w6jvlmqsTGldaJZxDp8zIbOru4SwNExTlwRP07IbtwACi9fET6SvhBMU8vk3gljp Mhbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=hmj+1bnnr8sfgFNiD6nz4sdl680C6F5npFanOGRsMDw=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=t6O0GHXxZZZxO82X9kgikjteuKJ/3XGCh+FQsCKkAgFCSk4NRjrHRMH6Id/uU6uVE1 22Mk7GnwCAEkuyQLFabZVzcBA1IEDk+SVpP1EFKwXUjp6bxsjXv40+lvAC0xwjdnL0L4 euAKjIdPgp9b+IMdU7sZAuDJTqy8m7BvLr7UL/5owEUf97hkyApuGFjQNSvDxJmFAR8Z H1tSb/JFMRugqF6T2vl9qa3lqcU71I6Nv8at8hcriotNpAliHEAN0M+Zv+FE9db1f/2n HGKrVUnRmMbtgDSBWY7URpSxa5Df52YaHvmoIqbN7fMxv/s8wIKDWVQa64dI5k4HESv/ lx1g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.73]) by gmr-mx.google.com with ESMTPS id y15-20020a05651c154f00b002c17e2e5fb9si65344ljp.5.2023.10.17.07.07.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:07:02 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) client-ip=217.72.192.73; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue108 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MJmCV-1r8VG01WeX-00KBg6; Tue, 17 Oct 2023 16:07:01 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2 11/11] doc: document the "reboot" attribute Date: Tue, 17 Oct 2023 16:06:57 +0200 Message-Id: <20231017140657.95860-12-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017140657.95860-1-stefano.babic@swupdate.org> References: <20231017140657.95860-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:vlViLnWPddfzRkb45UKz0LqmAb/cKILc0WIxKnJnfu/oIx69B0b QZYyLA/R4CuKx+nb7RLZPwhn7c3rI0ekSelohmbUv8s9OQemPUkL6I27P4XQ0oVCzpNAZln 1G2q3Oi7d3Mk1CtR7PlruIphdu6/runKiirufuv1+QLBJGLN1dPMtETaeSIknBkZ7pJuSFK 8LhPRkJl/A5qSou3lpyKw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:O2zw6nuIIKM=;w8cE4Od57ViMwIcuSVmyAGDAsBl 8T/i74GGtbeurWbo/KDj57tMEcc6IagNoNPJENC0z5tF2xvZfDxVD/+dk6aCcpeai077N8C4/ NHw9+e2g6SJrqDv2bXJXQMqvLtYXqXPKjIyxfUdpJW4WbH/LD6vizfh4A4yUx10ZCmL8R6Fzz JtofDbbFpeZTkpfRaRwuQpjO/imGR+HSdU4/Eba9Oj2+1Ry0ST+WrzZvQaPA8EdqCQqaE609L ZtPP6ErqTcLTHzaGRdm2wTK8D69NRmP6ZK51lJUFi9zKjJexUsO61W+6BWpo6Qs3nYSHMYWmW L5QDRFNOBv/t1WeSVrcPi+FDxsIUqkDzn/bUwFirZifYLV7xAK8zVz3ZHQJqW9kgY3z9+u5oe aDne4L3TSzi+Dq192w2qz3iZxfF/pMzUTciobS+mLcv6OOUrCZ7LPOmC9rSLTL1YVjREUp31k RLL4iNMRl5dXLWv0gcfL1mVkdzIOYf3ACD5MryzuDaLritmL7nmWYQHExuMuUI0NvC85FWEZg VLZXpRbM8wIy2qxbKlGgSqQ0zcDvuw3/POSaeFwCyzQnoitzj7/ythtCX/v+eMnYAjCU9mCZx NfFfHw7Qw3taaQ8Pbut8ayptIWoJD7PSUr/7YOn9P+lSEDLlsnKBBJN207g2uxvlZvruVz7dU Qsz0KQV6GGyw5b0bX6iGF+ptl6rXZNGS0AUhwq/DQvQWO9FGzcU+b0W9/XcJ5njGrBejoMQhv y4un1siKqz49Tkw3IGvP9hPUxzhzifGv9PkRcyPiUIvG0VWEWMgp+Nhn5FkfAHsLfNzEgfmMa 2Q6iEte1TIXAmGAulClf0PDf3kf/K3Hu4Voub+iq6rW2kT920uzoxAVOL2Lvj/Gd/jW+R6PFS lFd/pcMrT+DYZSBpeaHdPP/c9j/FjWdPLaB8= X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.73 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: Stefano Babic --- doc/source/sw-description.rst | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/source/sw-description.rst b/doc/source/sw-description.rst index 3b910295..79e80625 100644 --- a/doc/source/sw-description.rst +++ b/doc/source/sw-description.rst @@ -884,6 +884,33 @@ environment variable "ustate" (default) to `STATE_INSTALLED=1` or globally via the `-m` option to SWUpdate or per `sw-description` via the boolean switch "bootloader_state_marker". +reboot flag +----------- + +It is possible to signal that a reboot for a specific update is not required. +This information is evaluated by SWUpdate just to inform a backend about the +transaction result. If a postinstall script (icommand line parameter -p) is +passed at the startup to perform a reboot, it will be executed anyway because +SWUpdate cannot know the nature of this script. + +SWUpdate sends this information to the progress interface and it is duty of the +listeners to interprete the information. The attribute is a boolean: + +:: + + reboot = false; + +Attribute belongs to the general section, where also version belongs. It is +not required to activate the flag with `reboot = true` because it is the +default behavior, so just disabling makes sense. + +The tool `swupdate-progress` interprets the flag: if it was started with +reboot support (-r parameter), it checks if a "no-reboot" message is received +and disables to reboot the device for this specific update. When the transaction +completes, the reboot feature is activated again in case a new update will require to +reboot the device. This allows to have on the fly updates, where not the whole +software is updated and a reboot is not required. + bootloader ---------- @@ -1394,6 +1421,9 @@ There are 4 main sections inside sw-description: | description | string | | user-friendly description of the | | | | | swupdate archive (any string) | +-------------+----------+------------+---------------------------------------+ + | reboot | bool | | allows to disable reboot for the | + | | | | current running update | + +-------------+----------+------------+---------------------------------------+ | install-if\ | bool | images | flag | | -different | | files | if set, name and version are | | | | | compared with the entries in |