From nobody Fri Feb 28 02:50:08 2025 X-Original-To: dev-commits-src-main@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 4Z3t3h3LNSz5MtFd; Fri, 28 Feb 2025 02:50:08 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3t3h1Xw4z3LV7; Fri, 28 Feb 2025 02:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740711008; 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=7Yi8XjPj5eBqp8gnWBCBk9M6XK0R6TY3c1C35Qi6jf0=; b=Q937tzeOPM3rR3FTzsE60Iibox18w2N2IqNu1xRlecVySybyPq69SgYTYEKuD9pG3o6nMw wKNcI0+XLoJfpxmugU1tHydCSPPGVY1tZVEoHQkCnZvueqAXulSX37+O8q/2YZ+geXGF+x SnahBIi4v1PfHP8/qnTs4sG8hs6HkwXR7tIjA/izG+HLDI3qSwAoN7AaEFzjMcerQBItXp Sgb+13rMADOQcUSgAE4LSriIJYsrxRJhchLIr5JVTcFZDgNpphY6Jxbyu+XynnHjiVZqNQ PuhxwIctdbN3G0JjlakdGN2nA/jdoo+KG8RjtHjG0lpU9u8R5YLsdkVw2rh+JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740711008; a=rsa-sha256; cv=none; b=bKT8cZMbjh02urd+N1yJ72NJOx+K1C6v7UfPmFKVx3iCgYfEusofRNuAM2WS0Ne3i8rl5F akSPWW345k5mzP0/G4HIKLmTPDQiJSG3WHROjGpgbXDvecjryHZEFEwRZ0FmU2hFMDqlNZ ZGQQGSGN/7DBzuZy+GQL8K0ZPTvJUQWTAkdzXsyie8HMuw9CG74oBjwtFcB+p9ixz7WGDI ByE54X/Tr7N1vdbp6w3ZY+j+qhXMfiPkuX01jexLCXTORau9qkkGIHNy8iYrSPeUItU9fQ hzGfzm/i7upywmGdWoFu7O+emtvem1lKowK9ZQsC/fpKVhvn+Z/ENfU4szh3qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740711008; 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=7Yi8XjPj5eBqp8gnWBCBk9M6XK0R6TY3c1C35Qi6jf0=; b=fwkIQUgb5rtAgAmBoJbwHG/UTDFTp9KSy8N+lRVTjWjrZND6LTd7udwPy+j2tmrDNKkNsr AUbU+FNoZB+Ydb5POMaqgkVHksVhAtjUCaGiJ+/9ALfXLHSOgTUETSK6Elg7mDo8Kghl8P 4H/GJiZBcDXTZhDG8sUXAWFSE25RxDLPnqm4D8p3nlgMOIZc7iiGlbPiuwE+WQgnJCtjjE LZo98Kg4C1SsO7RlfScjD/rEcEioAUdvSEFSsWI557cxFugOn9Y0AMT/2aBqq9JmeFt4p/ VOpqY5qK2cEcfkS2VRGFrXB3c3UX+n0gzn5USUViZHoHsgiMLNQD19t+0btTfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z3t3h14g6z18Q9; Fri, 28 Feb 2025 02:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51S2o8fY024720; Fri, 28 Feb 2025 02:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51S2o885024715; Fri, 28 Feb 2025 02:50:08 GMT (envelope-from git) Date: Fri, 28 Feb 2025 02:50:08 GMT Message-Id: <202502280250.51S2o885024715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: db80116da404 - main - wlanwds: add pidfile support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db80116da404c90e6f0d69350554291f866e8ebb Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=db80116da404c90e6f0d69350554291f866e8ebb commit db80116da404c90e6f0d69350554291f866e8ebb Author: Adrian Chadd AuthorDate: 2025-02-13 18:33:12 +0000 Commit: Adrian Chadd CommitDate: 2025-02-28 02:49:49 +0000 wlanwds: add pidfile support Add pidfile support based on "man pidfile". Differential Revision: https://reviews.freebsd.org/D48997 --- tools/tools/net80211/wlanwds/Makefile | 2 ++ tools/tools/net80211/wlanwds/wlanwds.c | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tools/tools/net80211/wlanwds/Makefile b/tools/tools/net80211/wlanwds/Makefile index 1e993cc07c21..293ddb75f9b4 100644 --- a/tools/tools/net80211/wlanwds/Makefile +++ b/tools/tools/net80211/wlanwds/Makefile @@ -2,4 +2,6 @@ PROG= wlanwds BINDIR= /usr/local/bin MAN= +LIBADD= util + .include diff --git a/tools/tools/net80211/wlanwds/wlanwds.c b/tools/tools/net80211/wlanwds/wlanwds.c index e64b05658740..f6364c3ce4da 100644 --- a/tools/tools/net80211/wlanwds/wlanwds.c +++ b/tools/tools/net80211/wlanwds/wlanwds.c @@ -68,6 +68,7 @@ #include #include #include +#include #define IEEE80211_ADDR_EQ(a1,a2) (memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0) #define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN) @@ -107,9 +108,11 @@ main(int argc, char *argv[]) { const char *progname = argv[0]; const char *pidfile = NULL; + struct pidfh *pfh = NULL; int s, c, logmask, bg = 1; char msg[2048]; int log_stderr = 0; + pid_t otherpid; logmask = LOG_UPTO(LOG_INFO); while ((c = getopt(argc, argv, "efjP:s:tv")) != -1) @@ -148,6 +151,17 @@ main(int argc, char *argv[]) ifnets = argv; nifnets = argc; + if (pidfile != NULL) { + pfh = pidfile_open(pidfile, 0600, &otherpid); + if (pfh == NULL) { + if (errno == EEXIST) + errx(EXIT_FAILURE, "Daemon already running; pid: %jd.", + (intmax_t)otherpid); + + warn("Cannot open or create pidfile"); + } + } + s = socket(PF_ROUTE, SOCK_RAW, 0); if (s < 0) err(EX_OSERR, "socket"); @@ -157,8 +171,12 @@ main(int argc, char *argv[]) scanforvaps(s); /* XXX what directory to work in? */ - if (bg && daemon(0, 0) < 0) + if (bg && daemon(0, 0) < 0) { + pidfile_remove(pfh); err(EX_OSERR, "daemon"); + } + + pidfile_write(pfh); openlog("wlanwds", log_stderr | LOG_PID | LOG_CONS, LOG_DAEMON); setlogmask(logmask); @@ -167,6 +185,8 @@ main(int argc, char *argv[]) ssize_t n = read(s, msg, sizeof(msg)); handle_rtmsg((struct rt_msghdr *)msg, n); } + + pidfile_remove(pfh); return 0; }