From nobody Thu Sep 28 15:52:32 2023 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 4RxJ006WpGz4tyQn; Thu, 28 Sep 2023 15:52:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RxJ0063Zbz4Kks; Thu, 28 Sep 2023 15:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695916352; 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=3Nng9Zi6Ccq7rfXY4VgrThQSiT2KonyjrvYmW1mXYOg=; b=RjTn/JkSpjbfgW51EOKqLVWcJ78leYI01JObAYBpgd2uXm8eI6a16MHbkm0Bb3Uy1fPxag ToD8jFDQaovJpvPglDmJAuxWced5f9Gs46u8Q/Nsq4kqC+5S8br1ghxriUOQdIjhtkI1sx DUxSrRa5tlIgJ54PFaNqFOBxIihZQRlrCUOTuPPTzQE7xU9bDeiTgaATXW5qhbZQvNPMnR QZSRlAfq/pcxK/R3lhQfa0OqPo6pc/3k2uK1v9BzCQUHlxVzlmvZXW/jBd9GIu2BSLgWis rFBXjHbXRxLLCfe9SQeI6Hz6YaA2mU+fFgCsaMJklWn0yVB/TD63q+XkTVUchA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695916352; a=rsa-sha256; cv=none; b=Hjs/rsvh6a2fKvqsPLoV1VoE9x+Xp7kvD9KsTvPhpUkElR6r5pBmdE6blsAdpiqQEGiYQw FsymzBtESQJF8JcUoO0u6tpAPEZDNt1kvJt/EykXGKTtlrlIj7gBKPpb7r/sFNWm0lVYBJ MKdopSjybYUZ5enEJgMdYcIlLyVEihYwFklIXdrpk+1ayq/6EU2U+ZB4TfWFuZtLbiBBJ3 gX0pSXU9lDcBaJsXkMP+W9Ll4Sryf5go8hLahxU5qETQDl0FEg6izRS4hRWaZ0kTHiCUqR yvJqjbckCvWLYj2ORzfF/ncf8uVBCyroFnrxkTkEKqbnFB4nLJ/8hdVZhTgoNQ== 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=1695916352; 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=3Nng9Zi6Ccq7rfXY4VgrThQSiT2KonyjrvYmW1mXYOg=; b=F82+VRcwqbg9L4vzuNX5IyRw4ehMosz5oBXOGWCqP6IcmI76M0MpBVUGwPGZ8IRbdAtj5s /KsZMLQyD1fusKengaDG+LElkGfl8c7Bo3l45T3fkSNOdKsaT8Z2pzUBeUWZ8Qqrg7Wpoz PTcn++uXUpFoq7oSzFTi+WgiIJiUfOqJFX2ZlocHoWS5/Lvve6ggpG6Wg8OKuyK3am/kvi fJ+0ggfD+M9iK4SLpj0chWWEglKufwanztEIWvOfi/UP7qaZHrfUy2sEGYJ8rg2jnPPCpy LTvKBta4ByMpqi6W3O1YJT1Sb9MVwjUJ3aPiEM07dl3pCctzwvfp2WXREmzxJQ== 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 4RxJ004y4QzCNf; Thu, 28 Sep 2023 15:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38SFqWV2021941; Thu, 28 Sep 2023 15:52:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SFqWG1021938; Thu, 28 Sep 2023 15:52:32 GMT (envelope-from git) Date: Thu, 28 Sep 2023 15:52:32 GMT Message-Id: <202309281552.38SFqWG1021938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 599db1e026c7 - main - syslogd: Simplify filed structure 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 599db1e026c7bd375cd9cead34994a88fdea1761 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=599db1e026c7bd375cd9cead34994a88fdea1761 commit 599db1e026c7bd375cd9cead34994a88fdea1761 Author: Jake Freeland AuthorDate: 2023-09-01 02:50:08 +0000 Commit: Mark Johnston CommitDate: 2023-09-28 15:51:53 +0000 syslogd: Simplify filed structure Rearrange fields and add some comments. Reviewed by: markj MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41368 --- usr.sbin/syslogd/syslogd.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 22ba9deaa5d8..9498b900ed9b 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -271,52 +271,56 @@ enum f_type { * We require f_file to be valid if f_type is F_FILE, F_CONSOLE, F_TTY * or if f_type is F_PIPE and f_pid > 0. */ - struct filed { - STAILQ_ENTRY(filed) next; /* next in linked list */ enum f_type f_type; - int f_file; /* file descriptor */ - time_t f_time; /* time this was last written */ - char *f_host; /* host from which to recd. */ + + /* Used for filtering. */ + char *f_host; /* host from which to recd. */ + char *f_program; /* program this applies to */ + struct prop_filter *f_prop_filter; /* property-based filter */ u_char f_pmask[LOG_NFACILITIES+1]; /* priority mask */ u_char f_pcmp[LOG_NFACILITIES+1]; /* compare priority */ #define PRI_LT 0x1 #define PRI_EQ 0x2 #define PRI_GT 0x4 - char *f_program; /* program this applies to */ - struct prop_filter *f_prop_filter; /* property-based filter */ + + /* Logging destinations. */ + int f_file; /* file descriptor */ + int f_flags; /* file-specific flags */ +#define FFLAG_SYNC 0x01 +#define FFLAG_NEEDSYNC 0x02 union { - char f_uname[MAXUNAMES][MAXLOGNAME]; + char f_uname[MAXUNAMES][MAXLOGNAME]; /* F_WALL, F_USERS */ + char f_fname[MAXPATHLEN]; /* F_FILE, F_CONSOLE, F_TTY */ struct { char f_hname[MAXHOSTNAMELEN]; struct addrinfo *f_addr; - - } f_forw; /* forwarding address */ - char f_fname[MAXPATHLEN]; + } f_forw; /* F_FORW */ struct { char f_pname[MAXPATHLEN]; pid_t f_pid; - } f_pipe; + } f_pipe; /* F_PIPE */ } f_un; #define fu_uname f_un.f_uname +#define fu_fname f_un.f_fname #define fu_forw_hname f_un.f_forw.f_hname #define fu_forw_addr f_un.f_forw.f_addr -#define fu_fname f_un.f_fname #define fu_pipe_pname f_un.f_pipe.f_pname #define fu_pipe_pid f_un.f_pipe.f_pid + + /* Book-keeping. */ char f_prevline[MAXSVLINE]; /* last message logged */ + time_t f_time; /* time this was last written */ struct logtime f_lasttime; /* time of last occurrence */ int f_prevpri; /* pri of f_prevline */ size_t f_prevlen; /* length of f_prevline */ int f_prevcount; /* repetition cnt of prevline */ u_int f_repeatcount; /* number of "repeated" msgs */ - int f_flags; /* file-specific flags */ -#define FFLAG_SYNC 0x01 -#define FFLAG_NEEDSYNC 0x02 + STAILQ_ENTRY(filed) next; /* next in linked list */ }; static STAILQ_HEAD(, filed) fhead = STAILQ_HEAD_INITIALIZER(fhead); /* Log files that we write to */ -static struct filed consfile; /* Console */ +static struct filed consfile; /* Console */ /*