From patchwork Wed Oct 25 05:51:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 1854751 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=eqip2kjm; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23c; helo=mail-lj1-x23c.google.com; envelope-from=swupdate+bncbcyiz4m3xakrbmg24kuqmgqeekifxty@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x23c.google.com (mail-lj1-x23c.google.com [IPv6:2a00:1450:4864:20::23c]) (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 4SFdPd6jvGz23jV for ; Wed, 25 Oct 2023 16:52:53 +1100 (AEDT) Received: by mail-lj1-x23c.google.com with SMTP id 38308e7fff4ca-2c51d0f97e3sf52157071fa.0 for ; Tue, 24 Oct 2023 22:52:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698213170; cv=pass; d=google.com; s=arc-20160816; b=QOgxZxERg0wgJYulf7Dw854WQx+h6K2hsk/cx56aumP+kiH0xKI8TCHWYMg8eTL6x5 5E3Rnrg5Fu8bvyWtD8ut60pZ3CAuhcmqR4RoOXFZiS724kFBBe6aopmChilyuXvjPYvZ nlYXSCYFTs3QCTiapLlxqaX2W8ZI2KykLm0xM+hBNsrl/nuHKuql1Tt4+qghg1OjBi8S fouycADJelDD0a1rbfY4Dw7xFir5a/Vnc6Fwaj+UlkmEnWK3fvDkD14ZWp+PPGymHjm4 MAOITZPUi+jxcjEBJWjyVbi03UpDbRE63AjVEwFWvtpusYjgT2qbqXMbzKPS9uoVR3Je Wn+Q== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iGw6kGjIojFZGvhY3p6otS9yWX+kJezqI0uM/89n0uI=; fh=Fe26/m7M5kmu9ltRFajrGooO2hzxCkNjn8NnSlWFfLA=; b=PS9Xq+kpKAGukGCMvzi6bzrVu3uEpbpaQWI3tevAkLnxwjfn7Ym+kdM9tl6QK6LFUs p9c49cLwJj4agNiroGoVCDgCOMS8olwyosaAmsL9dhCqGmHKR+boo006w1BbctvUXA5C jeIJGgo9kz/yAEe99soCG6EuJcRQi+gVDtxnInY0ZWpNfeChF7cqSpU5a3RiFgcGsm8i VoEAz9dBLuiOpc7eYrshV/T1se9vvSm830IY8kpjdgSJF2taCRScABtaZXM4Ogb/x078 znU705kyNeoaqQphH15jiD2jb8iJ8E2nv4nudzpwXstmACeJRpzOWqq9konorR7UbdAD IImg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nuz9QVEC; spf=pass (google.com: domain of fm-72506-2023102505524622c14454c9db4ab4f5-p7nxic@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-2023102505524622c14454c9db4ab4f5-p7NxIC@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1698213170; x=1698817970; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=iGw6kGjIojFZGvhY3p6otS9yWX+kJezqI0uM/89n0uI=; b=eqip2kjmWaYNKari3IZeWmUnwOGoHGLg5zK5vTKFMuHHD0Nndt6jrLrjLZCSRmmoMq VWuQNRojKw7Ris6TBqmWdxJ49vG2oJz+n6YMWupRPcS6q42ZyQeC6iE1T5b8H4iILZMH sgAWsbyD4IcEPMalRPheNi718HAaoljMpJjrvVrVBizSk1twYAiGCRRJca2NwVmPwrsf s/Qj0x4CqhZnMZ25lGrK1ta/Imo0PsDco1i/4fxjbWdiqLtyghaY8upX8jS3M9GnWmnR D4BUQKfQtjTI8ilXembKXWrY0QUmCUA2R6Jc4S9kM3bBYr4DO/fB8OacrQ6zg//ebjYu v6SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698213170; x=1698817970; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=iGw6kGjIojFZGvhY3p6otS9yWX+kJezqI0uM/89n0uI=; b=QsD1twY8XZQ9sV3c9xgGaQFoJcHVW6FbDKD/8C+rE51sX1EaHVjT2KCzIm5AFLLh9K Zrs48TJQWmCzQJvlGefpuk8zbelAfJefL9rwm5jCY8g8Tq/Y4Ccm2Tht5R3Kul8syoPW teYt+vJItNJUBk2HVfk+eCq6/wt1hW7ylfsiTazJWdfUVDysVyVdtnFdLqH1h2CZ6qYA eXX4BcgXWSjaQqKjk9Lu+0/Rks/pSo+EndepZpfqvZluYZZs//YPujwyvF7N7oGvWpVC GTxJs+w9Z68a1xDUTwwnQeYulCdMr4ISWJPdpnDZ/1Ljv7Woem6dZ8JltdB5AP31Tqpd KBMg== X-Gm-Message-State: AOJu0YykCva9k7ieCpc66QS1ReJrKxeavrcBxq4XhniKLq3PCYUwJQ5k c/KRzdpZTgip/twEIUxSHo4= X-Google-Smtp-Source: AGHT+IHFxeFpZbk27KCpwqKQzdlSF2V7BbmVQwumaiNGH+dlQ0MZxVuMMZWpvQf6mKB6Xc8IeX74dA== X-Received: by 2002:a2e:a4b7:0:b0:2c5:5926:de4c with SMTP id g23-20020a2ea4b7000000b002c55926de4cmr8880911ljm.32.1698213168866; Tue, 24 Oct 2023 22:52:48 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:be03:0:b0:2be:574a:3b1b with SMTP id z3-20020a2ebe03000000b002be574a3b1bls910889ljq.0.-pod-prod-05-eu; Tue, 24 Oct 2023 22:52:46 -0700 (PDT) X-Received: by 2002:a2e:8619:0:b0:2c5:1989:ce1c with SMTP id a25-20020a2e8619000000b002c51989ce1cmr9294544lji.26.1698213166531; Tue, 24 Oct 2023 22:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698213166; cv=none; d=google.com; s=arc-20160816; b=zlpOFf2rm9JNaJXxYP8NTouM6ttaKZQpDwXf3u1NS7bfhGPqJ7JSvYCEzpYuTELJO4 BgRgSVRjQNICS+zbjocL2gFmFNKeauQlj4sLhxlA9rIbSycCr/RjUkWkHb6aQb4iGQea A7Wutj7//hhKCjKJHRut4iIC7YvalGEo1NIuLof6iGpiGH0q5Hj3IQBuGRyGvdahBeFh LPtQ701UXhQkxyK5pgcw3S43s8DRWrVT0k4WQhRi5wT+ASC6Fypz8wC2pVofwMEdUsIZ MKccg87VY91suJM43iPsfVKT0mAG2plMRgODLPUMyhvoPyfPJ3CbJopq95yEVvbhnqEx PWPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=XB7WPRsLxG8c4b+dc4bAFbYPEGC6r/Jev7lpDndeOBY=; fh=Fe26/m7M5kmu9ltRFajrGooO2hzxCkNjn8NnSlWFfLA=; b=T8wQgCPHX+Ex8WAq4YGjgDM9obPNv90HQJ5PMoi5rXyyf927UVcb5mlbnDuluoesKQ QmRVtc6An5RRstfgDIbJn2XrwIK4O59j8bbE7USIPqA2eKhDleufx+zocF0HPWa8S/SN Y/UXloIVGbEZKbPoJQl8zYxHb7GAfFCxIC8JLBrB0VLbjNy8ZHUczrIqMMeXxNSmSeXN du9533oSVntDzwvY2QpL/vyZVIBaXbKB7EtzZpoillUEeKWhBoePGqAoFWNQiaJxkDYv /IMUPFhiTGFwrrWaC8lDOwpb0iglj4ESBsZXJMvncZUOlQ05pbeab5hiLh9EmOwWfp7+ 5XGA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nuz9QVEC; spf=pass (google.com: domain of fm-72506-2023102505524622c14454c9db4ab4f5-p7nxic@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-2023102505524622c14454c9db4ab4f5-p7NxIC@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id z2-20020adfe542000000b0032c8861a1d1si512763wrm.4.2023.10.24.22.52.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2023 22:52:46 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-2023102505524622c14454c9db4ab4f5-p7nxic@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2023102505524622c14454c9db4ab4f5 for ; Wed, 25 Oct 2023 07:52:46 +0200 X-Patchwork-Original-From: "'Felix Moessbauer' via swupdate" From: Felix Moessbauer To: swupdate@googlegroups.com Cc: quirin.gylstorff@siemens.com, christian.storm@siemens.com, stefano.babic@swupdate.org, Felix Moessbauer Subject: [swupdate] [PATCH v2 6/7] ipc: create sockets in RUNTIME_DIRECTORY Date: Wed, 25 Oct 2023 13:51:41 +0800 Message-Id: <20231025055142.54505-7-felix.moessbauer@siemens.com> In-Reply-To: <20231025055142.54505-1-felix.moessbauer@siemens.com> References: <20231025055142.54505-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nuz9QVEC; spf=pass (google.com: domain of fm-72506-2023102505524622c14454c9db4ab4f5-p7nxic@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-2023102505524622c14454c9db4ab4f5-p7NxIC@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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 RUNTIME_DIRECTORY variable is set by systemd (when setting RuntimeDirectory=) and points to a systemd managed folder where sockets shall be created. In case this variable is set, we create the IPC sockets there. If it is not set, continue with the existing logic. Signed-off-by: Felix Moessbauer --- ipc/network_ipc.c | 12 +++++++----- ipc/progress_ipc.c | 13 ++++++++----- tools/swupdate-progress.c | 3 +++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ipc/network_ipc.c b/ipc/network_ipc.c index 0876c88..e2fff78 100644 --- a/ipc/network_ipc.c +++ b/ipc/network_ipc.c @@ -27,11 +27,13 @@ char* SOCKET_CTRL_PATH = NULL; char *get_ctrl_socket(void) { if (!SOCKET_CTRL_PATH || !strlen(SOCKET_CTRL_PATH)) { - const char *tmpdir = getenv("TMPDIR"); - if (!tmpdir) - tmpdir = "/tmp"; - - if (asprintf(&SOCKET_CTRL_PATH, "%s/%s", tmpdir, SOCKET_CTRL_DEFAULT) == -1) + const char *socketdir = getenv("RUNTIME_DIRECTORY"); + if(!socketdir){ + socketdir = getenv("TMPDIR"); + } + if (!socketdir) + socketdir = "/tmp"; + if (asprintf(&SOCKET_CTRL_PATH, "%s/%s", socketdir, SOCKET_CTRL_DEFAULT) == -1) return (char *)"/tmp/"SOCKET_CTRL_DEFAULT; } diff --git a/ipc/progress_ipc.c b/ipc/progress_ipc.c index 745dc44..5738bf6 100644 --- a/ipc/progress_ipc.c +++ b/ipc/progress_ipc.c @@ -26,11 +26,14 @@ char *SOCKET_PROGRESS_PATH = NULL; char *get_prog_socket(void) { if (!SOCKET_PROGRESS_PATH || !strlen(SOCKET_PROGRESS_PATH)) { - const char *tmpdir = getenv("TMPDIR"); - if (!tmpdir) - tmpdir = "/tmp"; - - if (asprintf(&SOCKET_PROGRESS_PATH, "%s/%s", tmpdir, SOCKET_PROGRESS_DEFAULT) == -1) + const char *socketdir = getenv("RUNTIME_DIRECTORY"); + if(!socketdir){ + socketdir = getenv("TMPDIR"); + } + if(!socketdir){ + socketdir = "/tmp"; + } + if (asprintf(&SOCKET_PROGRESS_PATH, "%s/%s", socketdir, SOCKET_PROGRESS_DEFAULT) == -1) return (char *)"/tmp/"SOCKET_PROGRESS_DEFAULT; } diff --git a/tools/swupdate-progress.c b/tools/swupdate-progress.c index 48a4448..a91b252 100644 --- a/tools/swupdate-progress.c +++ b/tools/swupdate-progress.c @@ -273,6 +273,9 @@ int main(int argc, char **argv) if (opt_p) { rundir = getenv("PSPLASH_FIFO_DIR"); + if(!rundir){ + rundir = getenv("RUNTIME_DIRECTORY"); + } if (!rundir) rundir = "/run"; snprintf(psplash_pipe_path, sizeof(psplash_pipe_path), "%s/psplash_fifo", rundir);