From nobody Fri Nov 13 02:37:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jQhJ74Y8Lz6y7fh for ; Fri, 13 Nov 2026 02:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQhJ72RQJz4vW5 for ; Fri, 13 Nov 2026 02:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794537479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIhcyd+NJcnE4XVjOum5iTJRtfIBINwpBJVWbteVChM=; b=HP/hxm3qgRnjfyZgnBxlWBNMOIEzFla+foTmOnza1mErNci9hl2JLHcF1AJrIg/wSBiW97 wHKm7ZS0aOIFTLCYjJJPbdIXsIPZRDt3C2t0oUAmAgKEZe/g5am8Umcnc2P0FovLDg6LC7 WH4RdjPhG2cOUW4kKTCZJP/iP/S6AFAYxjh0LyfYN6SKLnCFHcwDjSoZwwdFiDT5qhRdBO u5LORBLJzHYDVXBsGf5lhKwLXVjnR4nwguCUXNvDmxijZnutU8VwkMV1STcATjGx228Srw PUgaYiHSb7P62pCGMOjDeAMRt3sLYJv9QnwBmXiCXyYgIcdY6n6fLpmlSkACaw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794537479; b=Kq4hX24GMQP32k7BQhvZ6sXPIzgTCvI9KhGGMIjzO20CpNU9tPca2+M12LmxgtaN8Kx5T8 N7vDRyNWV1qYdvEfNtwh5LpY16aORo/eMucJnevm0G3PRpkKP/ME/yswNPy/5KnlhiUQjg CwARF6uXWTV92hdWYpbzOwDGTYTsgrIyi7QyOp0cDgWzVgddoEomQoVrsXmIAaxUxlKYgP URWuk6pi0EJSM1k3rU5qO2WwaaVa3Oh49+Vek5FZk4LijESwFQmXcIxHcQHVGIAPd/KJJL WGI5DHDcYmy8DdGPKR6QzT0KpG4GA3FxWx2GDu49pNKexsl/3nW7+dx3Ew2WtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794537479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIhcyd+NJcnE4XVjOum5iTJRtfIBINwpBJVWbteVChM=; b=Q1hJuTytzKOLD+m4cNwvOdYbHYNP/LoMGPcushkJyrxV9P2nwbrJ8Qg5lIcOYGSj0Y1lIx /IYlCyr8FLvK6/unrEz6VlSGqfD6kdPSa9CoLJY/jmQbzL2EusNrPsvEIHD49mqkYggpNC SiCz+/YAez3nIhHy2Y/o5G2xEri9xUE+XAu2X3pUnbf7Txc+fRBxlks4lkOfjE2xqP36N8 4Iv7Qkp/QKN6dyyXs7DEn1shI+I5EY7OKXUD8Sr0W+XMaoikooytErMEkmc/8W7tIUvubC 924oou3Ks36I1Oud1umii1e43JHmg74nsBq+e17q2W8QFlarnIWMALk+YCUUzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQhJ71qj3zDvB for ; Fri, 13 Nov 2026 02:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22113 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 02:37:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 039ec3ca1bec - main - devd: define _PATH_DEVD_SOCKET in List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 039ec3ca1becc794c21e31ea6d5acef3fe053544 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 02:37:59 +0000 Message-Id: <6af67807.22113.abfe196@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=039ec3ca1becc794c21e31ea6d5acef3fe053544 commit 039ec3ca1becc794c21e31ea6d5acef3fe053544 Author: Gleb Smirnoff AuthorDate: 2026-11-13 02:37:10 +0000 Commit: Gleb Smirnoff CommitDate: 2026-11-13 02:37:10 +0000 devd: define _PATH_DEVD_SOCKET in Sweep through consumers and use the define. Reviewed by: kfv, imp Differential Revision: https://reviews.freebsd.org/D61344 --- include/paths.h | 1 + lib/libdevdctl/consumer.cc | 3 ++- lib/libusb/libusb10_hotplug.c | 4 ++-- sbin/devd/devd.cc | 3 +-- sbin/devd/tests/client_test.c | 3 ++- usr.sbin/moused/moused/moused.c | 3 ++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/paths.h b/include/paths.h index 9157c17524c7..eadc20a933d7 100644 --- a/include/paths.h +++ b/include/paths.h @@ -52,6 +52,7 @@ #define _PATH_CSHELL "/bin/csh" #define _PATH_CSMAPPER "/usr/share/i18n/csmapper" #define _PATH_DEFTAPE "/dev/sa0" +#define _PATH_DEVD_SOCKET "/var/run/devd.seqpacket.pipe" #define _PATH_DEVGPIOC "/dev/gpioc" #define _PATH_DEVNULL "/dev/null" #define _PATH_DEVPOWER "/dev/power" diff --git a/lib/libdevdctl/consumer.cc b/lib/libdevdctl/consumer.cc index 2d5e7ebf549b..b020fc402067 100644 --- a/lib/libdevdctl/consumer.cc +++ b/lib/libdevdctl/consumer.cc @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -68,7 +69,7 @@ namespace DevdCtl /*============================= Class Definitions ============================*/ /*----------------------------- DevdCtl::Consumer ----------------------------*/ //- Consumer Static Private Data ----------------------------------------------- -const char Consumer::s_devdSockPath[] = "/var/run/devd.seqpacket.pipe"; +const char Consumer::s_devdSockPath[] = _PATH_DEVD_SOCKET; //- Consumer Public Methods ---------------------------------------------------- Consumer::Consumer(Event::BuildMethod *defBuilder, diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index f03c1b48b8dc..db1b3fed84e3 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -29,6 +29,7 @@ #else #include #include +#include #include #include #include @@ -54,7 +55,6 @@ #include "libusb.h" #include "libusb10.h" -#define DEVDPIPE "/var/run/devd.seqpacket.pipe" #define DEVCTL_MAXBUF 1024 typedef enum { @@ -94,7 +94,7 @@ devd_init(libusb_context *ctx) return (false); devd_addr.sun_family = PF_LOCAL; - strlcpy(devd_addr.sun_path, DEVDPIPE, sizeof(devd_addr.sun_path)); + strlcpy(devd_addr.sun_path, _PATH_DEVD_SOCKET, sizeof(devd_addr.sun_path)); if (connect(ctx->devd_pipe, (struct sockaddr *)&devd_addr, sizeof(devd_addr)) == -1) { close(ctx->devd_pipe); diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index cff50d2f8d80..02be99ea7c97 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -100,7 +100,6 @@ #include "devd.hh" /* C++ class definitions */ #define STREAMPIPE "/var/run/devd.pipe" -#define SEQPACKETPIPE "/var/run/devd.seqpacket.pipe" #define CF "/etc/devd.conf" #define SYSCTL "hw.bus.devctl_queue" @@ -1049,7 +1048,7 @@ event_loop(void) if (fd == -1) err(1, "Can't open devctl device %s", PATH_DEVCTL); stream_fd = create_socket(STREAMPIPE, SOCK_STREAM); - seqpacket_fd = create_socket(SEQPACKETPIPE, SOCK_SEQPACKET); + seqpacket_fd = create_socket(_PATH_DEVD_SOCKET, SOCK_SEQPACKET); accepting = 1; max_fd = max(fd, max(stream_fd, seqpacket_fd)) + 1; while (!romeo_must_die) { diff --git a/sbin/devd/tests/client_test.c b/sbin/devd/tests/client_test.c index fdac3c98b3c6..f92d40dc9892 100644 --- a/sbin/devd/tests/client_test.c +++ b/sbin/devd/tests/client_test.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -97,7 +98,7 @@ ATF_TC_BODY(seqpacket, tc) bool got_create_event = false; bool got_destroy_event = false; - s = common_setup(SOCK_SEQPACKET, "/var/run/devd.seqpacket.pipe"); + s = common_setup(SOCK_SEQPACKET, _PATH_DEVD_SOCKET); /* * Loop until both events are detected on _different_ reads * There may be extra events due to unrelated system activity diff --git a/usr.sbin/moused/moused/moused.c b/usr.sbin/moused/moused/moused.c index 7de6832a1eb8..4a44ed00f088 100644 --- a/usr.sbin/moused/moused/moused.c +++ b/usr.sbin/moused/moused/moused.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -1169,7 +1170,7 @@ connect_devd(void) { static const struct sockaddr_un sa = { .sun_family = AF_UNIX, - .sun_path = "/var/run/devd.seqpacket.pipe", + .sun_path = _PATH_DEVD_SOCKET, }; struct kevent kev; int fd;