From patchwork Sat Apr 23 14:25:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 42451 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F6FE27BBEC; Sat, 10 Sep 2022 19:32:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9FE4B27BBE9 for ; Sat, 10 Sep 2022 19:32:13 +0100 (BST) Received: from localhost ([::1]:56852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oX5H2-0007gU-QH for patchwork@mira.cbaines.net; Sat, 10 Sep 2022 14:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oX5Gt-0007g9-4x for guix-patches@gnu.org; Sat, 10 Sep 2022 14:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oX5Gs-0006P2-Oo for guix-patches@gnu.org; Sat, 10 Sep 2022 14:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oX5Gs-0001J5-Ky for guix-patches@gnu.org; Sat, 10 Sep 2022 14:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54986] [PATCH v3 1/2] services: shepherd: Add support for socket activation endpoints. References: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> In-Reply-To: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Sep 2022 18:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54986 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54986@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxime Devos Received: via spool by 54986-submit@debbugs.gnu.org id=B54986.16628347155003 (code B ref 54986); Sat, 10 Sep 2022 18:32:02 +0000 Received: (at 54986) by debbugs.gnu.org; 10 Sep 2022 18:31:55 +0000 Received: from localhost ([127.0.0.1]:40389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX5Gk-0001Ic-KL for submit@debbugs.gnu.org; Sat, 10 Sep 2022 14:31:55 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:45969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oX5Gf-0001IB-RI for 54986@debbugs.gnu.org; Sat, 10 Sep 2022 14:31:52 -0400 Received: by mail-ej1-f65.google.com with SMTP id dv25so11233364ejb.12 for <54986@debbugs.gnu.org>; Sat, 10 Sep 2022 11:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:from:to:cc:subject:date; bh=XiO8gnCxHDejLQac9nO0WN6awpRFU9cTHmARLqGWpd8=; b=Qi6MnxjeLSUTJBuYtC1FdpXYaxLalK8GuQhrIc2flhpONbfOcm4in5mDBTGJ7Jc8Bd LHrJ9Xs0nb+KCwhR3Xf0+MYdajoNG3iYu8j2/AMeOLtHFWzMEeDSemPecJuMtcD767fM ughs1mTyLt4V7wESpPV0ITfaFt2vl8f69UOFvgdcoI7tXhJg/l799273AVgeAJ2p8Xb4 DBrL1AVVlwEKM31fge77Q1rGCOqNqpPzSwkLB76fS2mIs7APoocxmjJtNO4Xwc7K0SE/ CnyEmQ3jzzAJLTy9CjS89aWbokmjjCgvTvlcclg7DfSeihAm4bqIYxoTDtg7o/kErk8T FEHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:x-gm-message-state:from:to:cc:subject:date; bh=XiO8gnCxHDejLQac9nO0WN6awpRFU9cTHmARLqGWpd8=; b=jvcxsWZS/X368oqFFbmirLEODcWStM3XaLz7rIufgkHmvJWQUKYtX/FmE8QjaWmOYN LXybkMeuh6Po7nOWEEQsytiyM+EuDE+/NYtOXXKRZGwniNwRNJ5FTj8nlIpzwvXYuYLQ mSQANV+waC0XeBUVLQtGvveMsCU4t7/gV5WI8fegXszKeEqjkeDexdriykN2vWqb8E4k 5C21JXGI1lO5ii5VnHBjjyBI8SQ6xMtPKYkkTClReOS6dm8WBBkfy1nuc4LqXXK6QiAu Ov1GHWYznf/HT94fgWHDF4wCZHFxrKI4Xwb4lD57IfKUk3PfwF+u1qlr4L6izdgllm29 XW1g== X-Gm-Message-State: ACgBeo0C2h11RgBbJPJtvSxI/yGH91HQeMdu3A3DStRMFF+MnFF9jxic V1GjRhtM7MJIMGk4uLCTgLGVoPwBDbw= X-Google-Smtp-Source: AA6agR6cXne7/me6EJ70I5JNckty9Nm7Jy+gtlGSVwZm4Gvapezi6HIWSMwAEEiAmBNSAk8ss+oDmQ== X-Received: by 2002:a17:907:b03:b0:770:872d:d7e9 with SMTP id h3-20020a1709070b0300b00770872dd7e9mr12456175ejl.272.1662834703058; Sat, 10 Sep 2022 11:31:43 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id v12-20020a056402348c00b0043bbb3535d6sm2599993edc.66.2022.09.10.11.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 11:31:42 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 23 Apr 2022 16:25:55 +0200 Message-ID: <684304748f200de9493550d079d59dc8cfe2b002.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/shepherd.scm (): New record type. (shepherd-endpoint->sexp): New variable. * doc/guix.texi (Shepherd Services): Document it. --- doc/guix.texi | 32 ++++++++++++++++++++ gnu/services/shepherd.scm | 64 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index c21235f28d..30cc3b6d45 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -39332,6 +39332,38 @@ This, as you can see, is a fairly sophisticated way to say hello. info on actions. @end deftp +@deftp {Data Type} shepherd-endpoint +This data type represents an endpoint for inetd-style and systemd-style +services. Its fields reflect the arguments to shepherd's +@code{endpoint} procedure. + +@table @code +@item address +The socket address to bind via shepherd and forward to the service. + +@item name +A ``descriptive'' name to forward to the service along with the socket. + +@item style +The socket style to use. +@xref{Network Sockets and Communication,,, guile, GNU Guile Reference +Manual}. + +@item backlog +The maximum length of the queue for pending connections. + +@item socket-owner +The user ID owning the socket. + +@item socket-group +The group ID owning the socket. + +@item socket-directory-permissions +The UNIX permissions to set for the directory the socket resides in. + +@end table +@end deftp + @defvr {Scheme Variable} shepherd-root-service-type The service type for the Shepherd ``root service''---i.e., PID@tie{}1. diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 4fd4b2a497..f0d204ff3a 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -66,6 +66,17 @@ (define-module (gnu services shepherd) shepherd-action-documentation shepherd-action-procedure + shepherd-endpoint + shepherd-endpoint? + shepherd-endpoint-address + shepherd-endpoint-name + shepherd-endpoint-style + shepherd-endpoint-backlog + shepherd-endpoint-socket-owner + shepherd-endpoint-socket-group + shepherd-endpoint-socket-directory-permissions + shepherd-endpoint->sexp + %default-modules shepherd-service-file @@ -183,6 +194,59 @@ (define %default-modules ((guix build utils) #:hide (delete)) (guix build syscalls))) +(define-record-type* + shepherd-endpoint make-shepherd-endpoint + shepherd-endpoint? + (address shepherd-endpoint-address) ; sockaddr + (name shepherd-endpoint-name ; string | #f + (default #f)) + (style shepherd-endpoint-style ; int | #f + (default #f)) + (backlog shepherd-endpoint-backlog ; int | #f + (default #f)) + (socket-owner shepherd-endpoint-socket-owner ; uid | #f + (default #f)) + (socket-group shepherd-endpoint-socket-group ; gid | #f + (default #f)) + (socket-directory-permissions + shepherd-endpoint-socket-directory-permissions ; chmod pattern (int) | #f + (default #f))) + +(define (shepherd-endpoint->sexp endpoint) + (match endpoint + (($ address + name style backlog socket-owner socket-group + socket-directory-permissions) + `(endpoint + ,(match (sockaddr:fam address) + ((? (cute = <> AF_INET) _) + `((@ (guile) make-socket-addr) + AF_INET + ,(sockaddr:addr address) + ,(sockaddr:port address))) + ((? (cute = <> AF_INET6) _) + `((@ (guile) make-socket-addr) + AF_INET6 + ,(sockaddr:addr address) + ,(sockaddr:port address) + ,(sockaddr:flowinfo address) + ,(sockaddr:scopeid address))) + ((? (cute = <> AF_UNIX) _) + `((@ (guile) make-socket-addr) + AF_UNIX + ,(sockaddr:path address)))) + ,@(fold + (match-lambda* + (((key value) seed) + (if value (cons* key value seed) seed))) + '() + `((#:name ,name) + (#:style ,style) + (#:backlog ,backlog) + (#:socket-owner ,socket-owner) + (#:socket-group ,socket-group) + (#:socket-directory-permissions ,socket-directory-permissions))))))) + (define-record-type* shepherd-service make-shepherd-service shepherd-service?