From patchwork Mon Jan 29 13:09:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1892248 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=HqFu0GgK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::43d; helo=mail-pf1-x43d.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbdgh32wqmgqecv7uu7y@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-pf1-x43d.google.com (mail-pf1-x43d.google.com [IPv6:2607:f8b0:4864:20::43d]) (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 4TNpYD3HGrz23fN for ; Tue, 30 Jan 2024 00:09:36 +1100 (AEDT) Received: by mail-pf1-x43d.google.com with SMTP id d2e1a72fcca58-6dde06c6ab0sf2290548b3a.1 for ; Mon, 29 Jan 2024 05:09:36 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1706533773; cv=pass; d=google.com; s=arc-20160816; b=QI6sr+By9gUWr8/HA0l1oCRYJYV/l6svnXEYo/v//7AmFJdBtd3Olol+Kkd6by2Oq7 U7ingyckMUoon7Rh1z30IuM9rrTGTJngHpCfiYrqC2s/72YM5DJ2R0lu3Z3Z648M9vtj PgUYQSPdAJnn2LtPJM/gb25pOyWBwl08FqhJSUi6tgwMvF4QsT/8lnmweOz+6HOBOzIa D7SLWW+dpV0YGjuBQIbu0V4/XDg62QDuPjV3kIYBNq4L+JKV6h4aCtqDSRLDTc9E5y1I dEgXsmClSLO0p+Or1+OMc/tsGt0oB3DOz+IS5WGMWYDLvRrhCY8LIRGE9XlJEdaESm44 J6MQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:content-id :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:to:from:dkim-signature; bh=s5ATEg34LYmpfV4ODRjiaBRVdXWNGdKoDwK/t1ez9AU=; fh=ZnR/GV7fAozRX3tpIO3vp/Jbul8ISZhdVjghlw9eWq0=; b=DyTm9Ev8r3Z4DpF9vKCgTdrDEh9MWZvbR51Fqn2p+QL1wNS+VVkvhGsEukaOPu7Kzt xk/eUOnAT8S5gNdTz+f/jgUR2SRdW5p+WJQkTZyLuTUWg1V8FOhV1nEnPrdwJAFtjx4X IZP7RoUuM1EXHnucEgJgPMzZOO8P9548RLj8Ds6P7bVMfYX9EmOGOjczTZaLfWD8BLZu kvfbVZjy8DxVBMTjH4SZ5jo7lZeb55iWgyB9g/mNDNnX/Zlx/grwYmJmRInEn8EJYMLE MqUqyroTneGlvcWoX682w5+NQiGahwkiqdHj0nCHn1jmB9j6j5291ovhng3UFVHkfc5Y iHlw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JfLE9f7F; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f403:2611::600 as permitted sender) smtp.mailfrom=christian.storm@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=1706533773; x=1707138573; 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:mime-version :content-id:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s5ATEg34LYmpfV4ODRjiaBRVdXWNGdKoDwK/t1ez9AU=; b=HqFu0GgK924rKaXOtkUt/U6gAerXzd5B8lvTbvVShX+FxHene2JnY4/kr+FGIAuzWW 8/2Lf+HNqHo4xk4XtZ6ooDwUK8S3149GSIGB0KoCkO5n+26J1BHQqPkzYlgLS0pHNtDV jpzSKjKNnb9KxUeexD4535DhBJMFC0TmHtTosWr5T/hQpR6H4sH66l8fXkU3dtB+aKvt 3L0l7tAGhfxgJ6+ZtNwFYu5tvhrbDR+lIXKq0H7SqCvpVA9LCSEHhMrrqOZFMIPv2346 DGLru85zPKpHnJdz12/aHe+4h61BrqLuxedreN4XFDU0Dr1tTCzkeqT6GVKOsnodCt0q 6yGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706533773; x=1707138573; 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:mime-version :content-id:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=s5ATEg34LYmpfV4ODRjiaBRVdXWNGdKoDwK/t1ez9AU=; b=Tr2IfHDTfKEpP61QAMHej5bsT/ZgeHjTXLNOm/oUL8jU6OVxYrsjm2k209jdIQNj4S RCAjUoJrzYjirGR3X+ph6od7ocv1fAGRk76m///75M4jzJGTD+nUWz10qHV0KHQOOtdP OuGsMRMNbEGjQiK/c6Hh6EUc3/tYYedlcYvhg5gtGT+9Wc5XHlAw3/XXltiIa6YefxJ2 Cq0+uQqm26e0BlcEsItF30+ARkvTk88sKtrxqsWi+b2NGL3Ri2yrDg+7GY3/z8fBc+iw CZOepzE0wdqeO7dmOuXYahXx3PXkpYxX/vgTqLlIp2BrxrX9qGS+ouPruDhpgAbTJP3p m7Qg== X-Gm-Message-State: AOJu0YwdaZhuXL484edNQuEH+8mFvfUJItrvMe1APn1iTIWLPPv4SgSm MQa2RToGh4h9tiiNi9FDpJ+CqJ2tUArUi7zAKrT880hMUlIEoQyw X-Google-Smtp-Source: AGHT+IGCthTQdr23VSLG4xhEPM1PDUgAHYy5rFj8/KqPfDTmQF3bccLhtpNDjS1/OoI354oUQrbFyQ== X-Received: by 2002:a05:6a20:4c27:b0:19c:8d73:7212 with SMTP id fm39-20020a056a204c2700b0019c8d737212mr2001564pzb.13.1706533773452; Mon, 29 Jan 2024 05:09:33 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:90a:cb8d:b0:290:5f5f:57d6 with SMTP id a13-20020a17090acb8d00b002905f5f57d6ls947797pju.2.-pod-prod-07-us; Mon, 29 Jan 2024 05:09:32 -0800 (PST) X-Received: by 2002:a17:90a:b10b:b0:294:4637:7ed with SMTP id z11-20020a17090ab10b00b00294463707edmr1836531pjq.40.1706533771514; Mon, 29 Jan 2024 05:09:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706533771; cv=pass; d=google.com; s=arc-20160816; b=XZrwGL2ATFOBRDA6jPPeybkNYqClHe0dH6JSXtD+OYatyVy6dfN8gSBPDRCAraBPxY CDRzD1lJhILseLy2Z/mHmijxfTJT8Bc3PNG6JSWhdP+S0b85YCqlTkX2QefQbBg1eU4T aFINlYtRLVoYMzo/6v6UjvRS+9noDmS4bPfP+lxF0iuRB7OwbSBFycnlZorU6ePGA822 SBb22peGLJM4/MCM5nXnjYy9FDHGtRucPGtnPYeKEhW5tURH973cxp26LRFzXoFXNv+i TvoYY+hek+lY//SJ3tsxS2i+Ads/X3LJR6KvR8zFuLzjNrRgcaFT7NT4nO0XiZY/sCxf Qvhw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-id:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :to:from:dkim-signature; bh=6ndC6ZG2sxAvHt7mHJnDOAy8hLsTJzcMdekf4vbIyV4=; fh=ZnR/GV7fAozRX3tpIO3vp/Jbul8ISZhdVjghlw9eWq0=; b=dpMx5OC+eI+YY7+xjlI4mA2onrwuq4Ay44ViB5rTtUzVut71fZuRBrfIqK4BDEJvF/ 7uiXyFynoLZGG+p09cpLGjkjJGgEIJOqb4Deli9TWGamg+RZqGBwJThKfKgd8jqDj4nX LfwdDK3rMUejd2ID8D8fKIzGiB1ibv29KkmPp/aIzqW/NKxxrJLObmYP/F01Xj0xyQ1O /bmO4cK1SyMzeGsjOZ6xboaA6G9ezNn1j2+N9JKZdREzNELLNk+n1AVyihkIxZ/PRRRJ LBU/8OV6gMp7CGD7TemUFkI0u67uZgn2Lx32ObNqXrHVygytE8gYmpv9CcaDyvVzNRGI vm9g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JfLE9f7F; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f403:2611::600 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on20600.outbound.protection.outlook.com. [2a01:111:f403:2611::600]) by gmr-mx.google.com with ESMTPS id b24-20020a17090ae39800b00290f20b9d06si542734pjz.0.2024.01.29.05.09.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2024 05:09:31 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f403:2611::600 as permitted sender) client-ip=2a01:111:f403:2611::600; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gKIvQfe18bQVdK8zJP2rurSgUQSWzXEcpMvCVfwWV/zM9c/hky1L3qs8Esc8DPyaYrBLs9P3/fOM5nCgOdM3flVrJklKGbqgIr94Bh8pAKdhcq3u+s7FvIuzriHrkWEtcLHTGCamCLmOzf5lFJi7F/zalUYOs8Gs5aWggxjJRYWHAylm+M1jVEyQ3ZGnmROpMeoPfSeArddIuYFooGNyTX17eELgAL/3xHwPiRDrudxG8GzbR4b3Qi5fzKxlVGs8BrieTWxF+3QJ1P9kXsZbsOlbVkqghfCFj0nFGOX1dzxUs62yDz3QL0vYfaYMcQHBJLWGfCsQBrseLoeDrA0T9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6ndC6ZG2sxAvHt7mHJnDOAy8hLsTJzcMdekf4vbIyV4=; b=bdrN2tV7ALhPhG0KdCs2VAWXbTjciYwibICzMbSRN8vO8YajDux2L2DrX2T4GF/CAE8/Kg0zAnUnPjn/BeMhbTmm7emEtx0KLGK2mZ+5jCnVi+kbKnVqv7fzgUN3XL3rw9/EtbeoXDWRxFEpm69uzUOabgIYHC0I20jqIn0LuCDVg81u2ZYVBNl6wnceuQZDUyx9Hkwn2+NuHxfOlTcVKY4iWGHzlkjLt5DnTe4BQDQwhAGQIaoJtUFa2Y3ZNVFtEFmwV0mYs1NxMiR4mP1+6xlGMP2b9RrFRZZw99It0Urbg5Jj+ejFbScO5xLK0KOkVS5UHhGcwnOqFZxcMpBYUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:333::17) by AM8PR10MB4001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1e1::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Mon, 29 Jan 2024 13:09:28 +0000 Received: from DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM ([fe80::3145:d77a:1976:e89b]) by DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM ([fe80::3145:d77a:1976:e89b%7]) with mapi id 15.20.7228.029; Mon, 29 Jan 2024 13:09:28 +0000 X-Patchwork-Original-From: "'Storm, Christian' via swupdate" From: "Storm, Christian" To: swupdate Subject: [swupdate] [PATCH 1/2] FreeBSD: Rework notifier socket location Thread-Topic: [PATCH 1/2] FreeBSD: Rework notifier socket location Thread-Index: AQHaUrRjb7vXwm0J30efbe6ZzMrGlw== Date: Mon, 29 Jan 2024 13:09:28 +0000 Message-ID: <8003F0C8-503D-492E-8FEE-8280649FBB6A@siemens.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DB9PR10MB5404:EE_|AM8PR10MB4001:EE_ x-ms-office365-filtering-correlation-id: 175b1d2a-4eaf-4c7d-d295-08dc20cb8627 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hYGiCSoA4eoTK5SAumERk3XWOWkkwregArEwQMXm6TUc54wbIvttTh5KIASrP+eKpL3FZxkcgPfbYhmvj6Q0ITQ3dO1OAU/k40Uf9jlZiNcIQUVZjhC7q/0a9n3sQx0lDZpKcq0qNF5fjg2wboBj7u0xjgmNhX9XoAgp0R96432ZJOC0lZwsKuTZ+q58z9xJRJi6nneEpdfdKce/MrnAqkkWLjBjQYE3EO59/DgVxIFj4TD7osA1H4g+rdnpJPxRMdv5ODYz7jz4Dm+6IzXGzbCNNq+8PVxF/6zJr0UFizVkW6/jj/4oGzz18LvSKT2wU/1DIdBG3xMwG+bCANoYu8OBbQgVxEYIWMe34246qSCqAh9EV0KbMuA0kB8R9wdRa3S1m3Et7F89roUoQQhviy+BCuG9Hp0+qP+PfMajUg8PIcGjYQAqRf/o98b5pv5myLZORZMiGbVX44AUSNwLv87WWrcQRU5ClUwLVpAptz8s2c7fqIni+lTCYdAhrWv02YT2/zGXC5qeAVkzRyJ8Ybl4aAriPTCgHE0mpYuvyEUeMbjIwJfeR8GCq3bDxlr4Mt8aXDYZrzIYyoTrBlIhVTtoESNPh0WVngHTfGZWpV2/IF5YEx5K2ze59bNuf0FsBLCYXUnRpFRHkF4dFDwYMQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(396003)(136003)(376002)(366004)(39860400002)(346002)(230922051799003)(1800799012)(186009)(64100799003)(451199024)(316002)(6916009)(83380400001)(76116006)(86362001)(66476007)(64756008)(66556008)(66446008)(66946007)(478600001)(6486002)(71200400001)(38100700002)(2616005)(6512007)(26005)(8676002)(8936002)(122000001)(6506007)(82960400001)(5660300002)(33656002)(2906002)(38070700009)(41300700001)(36756003)(45980500001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 2eJFileQvz28lE2rbW2jAkvNuXdFgWTyrnYYT8/SZ65pUJMcQN61ZSja4x23tp1qWyc7DD6+9qRbR3Amx6GmfUd6BpfFLGVW1SsthdGMRqCXda2IQJltbAKUkJfT6G9wUUScbtwrYfvhNyeIFmyv7ElBZzzF7KCjzAxNKrIvbEC+XeBEbe692cTe5RtO9mlx/xCEMvKryNJaXJnWxaJtRHB8lErQoRNaWELofmV6YCrVKiWUrSC5fqYtbynALKSUsmEb+91RZjtGHmuj2KcempJFdXNZv4OHsrcR9U2K2W5ndvVtbE+LHW6TKojQVnomUEiCL2vGu2pIE5fPJ/s7oTl4wY7JMzeBT592wIfSEtg0ytU67K1sEYu8yHf5XMEPmBBPtYCsP9gQgCrlvlusTvuqyVjZhg6426TaGh3x7rYUFpNLNrikqIQSR71Mr2pznN5fEONV35Kz8w9c9U+b17sVvR0FW9oN2zRLuWtqpNV/CP1qmGcC84lfyA4/Q7gyXUvyCma8WWXbBi9UVTsyWOfuE2DcFGHi097GcCqGgrY4aCJAjmIPZqRqxIwA8rQW7aop5BKGF+olzNDngBTHjWCpA0+ao+vrw0zM2wCGZiFswQrQNp5sYD/1bbVlUL+xBVtwIFjy3g4mAZ6ZkNj48tEcd4f8pAvP5gEm5zaJnLDfKVMDCwzVr4VhbMWnenbvCIeoDs2kX9Cg6IjNGgYtIjBRrWpAhwvwI4Y954Sj8udlaqPiJotpv4h+QgXbelYhZzbjWTdDs1X9R8SKQG9cgU9uvbAJgVKx+DRhnfkxs1epiXnH59G9ikDJWFQ5AfLjh4QOMC+xPTeBQvleVyCjsAnsnE+npSL4jQNoE5jf9S0QSQHbcjvBTGkXWn6cZG3lOMyXa14EKGdyA9n7BWce5u1aoe85+JCS/xUh66ZJ5q2bx2VVswfmC3FKbiT07mzP4KqKFvZU9ZE3eNQFmfVeEO2hsQnxq7fdGoFN3x9RTJCzgeLXVgUav6HGE4W6vEmw51XlYzNj8np/T32QI0zroI+aW0nxajcgc8Fwy5bxvhYMJXyTFqU5jVYjIhQKXTrzLn313+UiGXjtndkLwZ3WxzS9AAF8/7gTk2S/8iURxxLIOBqeV0loDwqpWRYCtRk0y2tFm5+Pn9gsKnWJibFFdj4BJDsqTAkio6FBQyCD4yFaTW0MV6bRS5nxP4KVfYmfPhKmKKj/fIMOp3qcp8Ut4/Hh4fCAqieO+dLzF1sbjvDww8HegMksSfbRvPguga7LLop0x9q3fR+6wMFowBBnfocKZOGafsxssDuqxpsbMfPFdAb87PJyx+3sD1ZZymghc8RCjdgQzsi3V2hMGsy1pazVxZ4NnVAyeZr8tE0HbP1VIC/9kHMjPtDZMyZOkydYLsNHz7zcCbptOYtj8mGuX8s0IUvd6Jc0bzZ7Od/xWjmY3TnZJUEiL9dkowAv1rxTXez+qqbvN8TURI2yd/2wCCK8o7dlkNY6noGNB7ZC4upQTp3BZTe7QCqRP3/b+IELiRrQM2WBy5lkheg7IWi9RbxzL1pYhfIoYT3EGGCPFZPd1A8jqvTFHx9aDCbStYzfW3sMC/zl9MynwHB0R7v2zVO1bAz41ZYNHyVSYGFdjj4= Content-ID: <2336074DE0A7C4418522895684DF2CA8@EURPRD10.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 175b1d2a-4eaf-4c7d-d295-08dc20cb8627 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2024 13:09:28.0854 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: mUBmDMmdVf8rqMI5T39B74LzAmiBNilRiC08B9cmnIriWD91VB4hMI00/8NLQXHekeK5P25kwyFdgR6OHIjpNO02xTcaMpz6QmFl41oRFow= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR10MB4001 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JfLE9f7F; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f403:2611::600 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: "Storm, Christian" Reply-To: "Storm, Christian" 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: , Remove FreeBSD-specific KConfig CONFIG_SOCKET_NOTIFIER_DIRECTORY in favor of using $RUNTIME_DIRECTORY, $TMPDIR, pr /tmp, in this order, as done for the other sockets. Note that although $RUNTIME_DIRECTORY is not native to FreeBSD, it's considered for consistency with Linux integrations. Signed-off-by: Christian Storm --- Kconfig | 8 ------- core/notifier.c | 58 +++++++++++++++++++++++++++++-------------------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/Kconfig b/Kconfig index cb346e12..341f062d 100644 --- a/Kconfig +++ b/Kconfig @@ -223,14 +223,6 @@ config SOCKET_PROGRESS_PATH help Path to the socket progress information is sent to. -config SOCKET_NOTIFIER_DIRECTORY - string "SWUpdate notifier socket directory" - depends on HAVE_FREEBSD - default "/tmp/" - help - Path to SWUpdate's notifier sockets on FreeBSD as - Linux-like abstract sockets are not available. - endmenu config MTD diff --git a/core/notifier.c b/core/notifier.c index 7fd7eca8..967822e1 100644 --- a/core/notifier.c +++ b/core/notifier.c @@ -373,22 +373,14 @@ static void progress_notifier (RECOVERY_STATUS status, int event, int level, con #if defined(__FreeBSD__) static char* socket_path = NULL; -static void unlink_socket(void) +static void unlink_notifier_socket(void) { - if (socket_path) { - unlink(socket_path); + if (socket_path != NULL) { + (void)unlink(socket_path); free(socket_path); + socket_path = NULL; } } - -static void setup_socket_cleanup(struct sockaddr_un *addr) -{ - socket_path = strndup(addr->sun_path, sizeof(addr->sun_path)); - if (atexit(unlink_socket) != 0) { - TRACE("Cannot setup socket cleanup on exit, %s won't be unlinked.", socket_path); - } - unlink(socket_path); -} #endif /* @@ -408,10 +400,21 @@ static void addr_init(struct sockaddr_un *addr, const char *path) /* * Use filesystem-backed sockets on FreeBSD although this interface * is internal as there are no Linux-like abstract sockets. + * + * Note: $RUNTIME_DIRECTORY is not native to FreeBSD but for + * consistency with Linux and containment, try to use it. */ - strncpy(addr->sun_path, CONFIG_SOCKET_NOTIFIER_DIRECTORY, sizeof(addr->sun_path)); - strncat(addr->sun_path, path, - sizeof(addr->sun_path)-strlen(CONFIG_SOCKET_NOTIFIER_DIRECTORY)); + const char *socketdir = getenv("RUNTIME_DIRECTORY"); + if(!socketdir){ + socketdir = getenv("TMPDIR"); + } + if (!socketdir) { + socketdir = "/tmp"; + } + if (snprintf(addr->sun_path, sizeof(addr->sun_path), "%s/%s", socketdir, path) < 0) { + fprintf(stderr, "Error creating notifier socket, exiting."); + exit(2); + } #else ERROR("Undetected OS, probably sockets won't function as expected."); #endif @@ -441,10 +444,6 @@ static void *notifier_thread (void __attribute__ ((__unused__)) *data) fprintf(stderr, "Could not set %d as cloexec: %s", serverfd, strerror(errno)); } -#if defined(__FreeBSD__) - setup_socket_cleanup(¬ify_server); -#endif - int len_socket_name = strlen(¬ify_server.sun_path[1]); do { @@ -459,7 +458,9 @@ static void *notifier_thread (void __attribute__ ((__unused__)) *data) */ notify_server.sun_path[len_socket_name + 1] = '0' + attempt; } else { - fprintf(stderr, "Error binding notifier socket: %s, exiting.\n", strerror(errno)); + fprintf(stderr, + "Error binding notifier socket %s: %s, exiting.\n", + (char *)¬ify_server.sun_path[0], strerror(errno)); close(serverfd); exit(2); } @@ -467,6 +468,13 @@ static void *notifier_thread (void __attribute__ ((__unused__)) *data) break; } while (1); +#if defined(__FreeBSD__) + socket_path = strndup(¬ify_server.sun_path[0], sizeof(notify_server.sun_path)); + if (atexit(unlink_notifier_socket) != 0) { + TRACE("Cannot setup socket cleanup on exit, %s won't be unlinked.", socket_path); + } +#endif + thread_ready(); do { len = recvfrom(serverfd, &msg, sizeof(msg), 0, NULL, NULL); @@ -516,9 +524,6 @@ void notify_init(void) char buf[60]; snprintf(buf, sizeof(buf), "Notify%d", pid); addr_init(¬ify_client, buf); -#if defined(__FreeBSD__) - setup_socket_cleanup(¬ify_client); -#endif notifyfd = socket(AF_UNIX, SOCK_DGRAM, 0); if (notifyfd < 0) { @@ -537,6 +542,13 @@ void notify_init(void) close(notifyfd); return; } +#if defined(__FreeBSD__) + /* + * Note: atexit(unlink_socket) "callback" is inherited from parent, + * reuse it, but with this child's socket_path. + */ + socket_path = strndup(¬ify_client.sun_path[0], sizeof(notify_client.sun_path)); +#endif } else { /* * If this is the main process, start setting the name of the